gmoccapy: {MIN, MAX, DEFAULT}_ANGULAR_JOG_VEL from qt_istat

Author: hansu

src/emc/usr_intf/gmoccapy/getiniinfo.py

@@ -244,30 +244,6 @@ def get_max_jog_vel(self):
             LOG.warning("No MAX_LINEAR_VELOCITY entry found in [TRAJ] of INI file. Using default value of 600 units / min.")
         return temp * 60
 
-    def get_default_ang_jog_vel(self):
-        # get default angular jog velocity
-        temp = self.inifile.getreal("DISPLAY", "DEFAULT_ANGULAR_VELOCITY")
-        if not temp:
-            temp = 360.0
-            LOG.warning("No DEFAULT_ANGULAR_VELOCITY entry found in [DISPLAY] of INI file. Using default value of 360 degree / min.")
-        return temp
-
-    def get_max_ang_jog_vel(self):
-        # get max angular velocity
-        temp = self.inifile.getreal("DISPLAY", "MAX_ANGULAR_VELOCITY")
-        if not temp:
-            temp = 3600.0
-            LOG.warning("No MAX_ANGULAR_VELOCITY entry found in [DISPLAY] of INI file. Using default value of 3600 degree / min.")
-        return temp
-
-    def get_min_ang_jog_vel(self):
-        # get min angular velocity
-        temp = self.inifile.getreal("DISPLAY", "MIN_ANGULAR_VELOCITY")
-        if not temp:
-            temp = 0.1
-            LOG.warning("No MIN_ANGULAR_VELOCITY entry found in [DISPLAY] of INI file. Using default value of 0.1 degree / min.")
-        return temp
-
     def get_embedded_tabs(self):
         # Check INI file for embed commands
         # NAME is used as the tab label if a notebook is used

src/emc/usr_intf/gmoccapy/gmoccapy.py

@@ -1778,9 +1778,9 @@ def _init_preferences(self):
         if not "a" in self.axis_list and not "b" in self.axis_list and not "c" in self.axis_list:
             self.widgets.spc_ang_jog_vel.hide()
         else:
-            self.widgets.spc_ang_jog_vel.set_property("min", self.get_ini_info.get_min_ang_jog_vel())
-            self.widgets.spc_ang_jog_vel.set_property("max", self.get_ini_info.get_max_ang_jog_vel())
-            self.widgets.spc_ang_jog_vel.set_value(self.get_ini_info.get_default_ang_jog_vel())
+            self.widgets.spc_ang_jog_vel.set_property("min", self.INI.MIN_ANGULAR_JOG_VEL)
+            self.widgets.spc_ang_jog_vel.set_property("max", self.INI.MAX_ANGULAR_JOG_VEL)
+            self.widgets.spc_ang_jog_vel.set_value(self.INI.DEFAULT_ANGULAR_JOG_VEL)
 
         font = self.prefs.getpref("gcodeview_font", "monospace 10", str)
         font_desc = Pango.FontDescription.from_string(font)