gladevcp -switch to common/hal_glib

also actual use core subclass of hal_glib

Author: c-morley

lib/python/gladevcp/combi_dro.py

@@ -29,7 +29,7 @@
 import sys
 import math
 import linuxcnc
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 import re
 
 # constants

lib/python/gladevcp/core.py

@@ -9,7 +9,7 @@
 import hal
 import traceback
 
-from hal_glib import GStat
+from common.hal_glib import GStat
 from common.iniinfo import _IStat as IStatParent
 
 # Set up logging
@@ -41,7 +41,6 @@ class Status(GStat):
         'toolfile-stale': (GObject.SignalFlags.RUN_FIRST, GObject.TYPE_NONE, (GObject.TYPE_PYOBJECT,)),
     }
     TEMPARARY_MESSAGE = 255 # remove in the future
-    TEMPORARY_MESSAGE = 255
     OPERATOR_ERROR = linuxcnc.OPERATOR_ERROR
     OPERATOR_TEXT = linuxcnc.OPERATOR_TEXT
     NML_ERROR = linuxcnc.NML_ERROR
@@ -58,11 +57,8 @@ def __init__(self):
         # only initialize once for all instances
         if self.__class__._instanceNum >= 1:
             return
-        GObject.Object.__init__(self)
         self.__class__._instanceNum += 1
-        super(GStat, self).__init__()
-        #self.current_jog_rate = INI.DEFAULT_LINEAR_JOG_VEL
-        #self.angular_jog_velocity = INI.DEFAULT_ANGULAR_JOG_VEL
+        super(Status, self).__init__()
 
 ################################################################
 # Lcnc_Action class

lib/python/gladevcp/drowidget.py

@@ -28,7 +28,7 @@
 from gi.repository import GLib
 
 import linuxcnc
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 
 # Set up logging
 from common import logger

lib/python/gladevcp/hal_actions.py

@@ -25,7 +25,7 @@
 
 from .hal_widgets import _HalWidgetBase
 import linuxcnc
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 import hal
 
 from gladevcp.core import Info, Action
@@ -180,8 +180,7 @@ def on_toggled(self, w):
 class EMC_Stat(GStat, _EMC_ActionBase):
     __gtype_name__ = 'EMC_Stat'
     def __init__(self):
-        stat = self.linuxcnc_static.get()[1]
-        GStat.__init__(self, stat)
+        super(GStat, self).__init__()
 
     def _hal_init(self):
         pass

lib/python/gladevcp/hal_filechooser.py

@@ -25,7 +25,7 @@
 
 from .hal_widgets import _HalWidgetBase
 import linuxcnc
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 
 _ = lambda x: x
 

lib/python/gladevcp/hal_gremlin.py

@@ -41,7 +41,7 @@
     from hal_actions import _EMC_ActionBase
 else:
     from .hal_actions import _EMC_ActionBase
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 
 def get_linuxcnc_ini_file():
     """find LinuxCNC INI file with pgrep"""

lib/python/gladevcp/hal_mdihistory.py

@@ -31,7 +31,7 @@
     from .hal_actions import _EMC_ActionBase, ensure_mode
 
 import linuxcnc
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 from gladevcp.core import Info
 
 GSTAT = GStat()

lib/python/gladevcp/hal_sourceview.py

@@ -17,7 +17,7 @@
 
 # Norberts comments
 # self.gstat ist nirgends festgelegt, auch wenn GStat importiert wurde
-
+# self.gstat comes from _EMC_ActionBase
 
 
 import os, time
@@ -34,7 +34,6 @@
 
 from .hal_widgets import _HalWidgetBase
 import linuxcnc
-from hal_glib import GStat
 from .hal_actions import _EMC_ActionBase, _EMC_Action
 from .hal_filechooser import _EMC_FileChooser
 

lib/python/gladevcp/macro_widget.py

@@ -24,7 +24,7 @@
 from gi.repository import GObject
 
 import linuxcnc
-from hal_glib import GStat
+from gladevcp.core import Status as GStat
 
 if __name__ == "__main__":
     from hal_actions import _EMC_ActionBase, ensure_mode

lib/python/gladevcp/makepins.py

@@ -28,7 +28,7 @@
 
 from .hal_widgets import _HalWidgetBase
 from .led import HAL_LED
-from hal_glib import GComponent
+from common.hal_glib import GComponent
 
 from gladevcp.gladebuilder import widget_name