Merge pull request #2461 from hansu/gmoccapy-3-4-3

Gmoccapy 3.4.3
LinuxCNC · May 23, 2023 · 56883b9 · 56883b9
2 parents 4db32a4 + ea395ac
commit 56883b9
Show file tree

Hide file tree

Showing 25 changed files with 2,786 additions and 3,098 deletions.
diff --git a/configs/sim/gmoccapy/6_axis.ini b/configs/sim/gmoccapy/6_axis.ini
@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

diff --git a/configs/sim/gmoccapy/7_axis.ini b/configs/sim/gmoccapy/7_axis.ini
@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

diff --git a/configs/sim/gmoccapy/7_axis_tool.ini b/configs/sim/gmoccapy/7_axis_tool.ini
@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini
@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

diff --git a/configs/sim/gmoccapy/9_axis.ini b/configs/sim/gmoccapy/9_axis.ini
@@ -19,7 +19,6 @@ MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE =  0.5
 
 DEFAULT_SPINDLE_SPEED = 500
-MAX_RAPID_OVERRIDE = 1.2
 
 # list of selectable jog increments
 INCREMENTS = 1.000 mm, 0.100 mm, 0.010 mm, 0.001 mm ,1.2345 in

diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
@@ -28,7 +28,6 @@ CYCLE_TIME =            100
 MAX_FEED_OVERRIDE =     1.5
 MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE = .5
-MAX_RAPID_OVERRIDE = 1.5
 
 # Max and default jog speeds in units per second
 MAX_LINEAR_VELOCITY =   166

diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
@@ -12,7 +12,7 @@ DEBUG = 0
 [DISPLAY]
 DISPLAY = gmoccapy
 
-EMBED_TAB_NAME = Pyngcgui
+EMBED_TAB_NAME = NGC-GUI
 EMBED_TAB_COMMAND = gladevcp -x {XID} pyngcgui.ui
 EMBED_TAB_LOCATION = ntb_user_tabs
 

diff --git a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
@@ -30,7 +30,6 @@ CYCLE_TIME =            100
 
 # Highest value that will be allowed for feed override, 1.0 = 100%
 MAX_FEED_OVERRIDE =     1.5
-MAX_RAPID_OVERRIDE =    1.2
 MAX_SPINDLE_OVERRIDE =  1.2
 MIN_SPINDLE_OVERRIDE = .5
 

diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini b/configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini
@@ -15,7 +15,6 @@ INTRO_GRAPHIC = linuxcnc.gif
 INTRO_TIME = 5
 MIN_SPINDLE_OVERRIDE = 0.25
 MAX_SPINDLE_OVERRIDE = 1.5
-MAX_RAPID_OVERRIDE = 1.2
 
 EMBED_TAB_NAME = Joints Meter DRO
 EMBED_TAB_LOCATION = ntb_preview

diff --git a/configs/sim/gmoccapy/pyngcgui.ui b/configs/sim/gmoccapy/pyngcgui.ui
@@ -9,8 +9,6 @@
       <object class="PyNgcGui" id="pyngcgui1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
         <property name="use_keyboard">False</property>
         <property name="debug">False</property>
         <property name="verbose">False</property>

diff --git a/docs/src/gui/gmoccapy.adoc b/docs/src/gui/gmoccapy.adoc
@@ -318,6 +318,7 @@ All you have to take care of, is that you include for every tab or side panel th
 ** *box_custom_2*             (will introduce your glade file left of cooling_frame)
 ** *box_custom_3*             (will introduce your glade file left of spindle_frame)
 ** *box_custom_4*             (will introduce your glade file right of spindle_frame)
+** *box_dro_side*             (will introduce your glade file right of the DRO)
 
 [NOTE]
 See also the included sample INI files to see the differences.
@@ -1129,7 +1130,9 @@ You have three options:
 * _Start as window_  - If you select start as window the spinboxes to set the position and size will get active.
   One time set, the GUI will start every time on the place and with the size selected.
   Nevertheless the user can change the size and position using the mouse, but that will not have any influence on the settings.
-* _hide the cursor_ - Does allow to hide the cursor, what is very useful if you use a touch screen.
+* _Window decorated_ - Allows the title bar to be hidden. (default: title bar visible)
+* _hide cursor_ - Does allow to hide the cursor, what is very useful if you use a touch screen.
+* _hide tooltips_ - Does gide the tool tips.
 
 .Keyboard
 

diff --git a/docs/src/gui/images/gmoccapy_3_axis.png b/docs/src/gui/images/gmoccapy_3_axis.png
diff --git a/docs/src/gui/images/gmoccapy_3_axis_mid.png b/docs/src/gui/images/gmoccapy_3_axis_mid.png
diff --git a/docs/src/gui/images/gmoccapy_5_axis.png b/docs/src/gui/images/gmoccapy_5_axis.png
diff --git a/docs/src/gui/images/gmoccapy_5_axis_mid.png b/docs/src/gui/images/gmoccapy_5_axis_mid.png
diff --git a/docs/src/gui/images/gmoccapy_settings_advanced.png b/docs/src/gui/images/gmoccapy_settings_advanced.png
diff --git a/docs/src/gui/images/gmoccapy_settings_appearance.png b/docs/src/gui/images/gmoccapy_settings_appearance.png
diff --git a/docs/src/gui/images/gmoccapy_settings_hardware.png b/docs/src/gui/images/gmoccapy_settings_hardware.png
diff --git a/share/gmoccapy/icons/classic/48x48/actions/spindle_stop.png b/share/gmoccapy/icons/classic/48x48/actions/spindle_stop.png
diff --git a/share/gmoccapy/icons/classic/48x48/actions/spindle_stop_on.png b/share/gmoccapy/icons/classic/48x48/actions/spindle_stop_on.png
diff --git a/src/emc/usr_intf/gmoccapy/dialogs.py b/src/emc/usr_intf/gmoccapy/dialogs.py
@@ -90,7 +90,6 @@ def entry_dialog(self, caller, data = None, header = _("Enter value") , label =
         calc.entry.connect("activate", lambda w : dialog.emit("response", Gtk.ResponseType.ACCEPT))
         dialog.parse_geometry("460x400")
         dialog.set_decorated(True)
-        self.emit("play_sound", "alert")
         if integer: # The user is only allowed to enter integer values, we hide some button
             calc.integer_entry_only(True)
             calc.num_pad_only(True)            
@@ -245,7 +244,6 @@ def on_enter_button(widget, obj, calc):
 
         restart_dialog.parse_geometry("410x400+0+0")
         restart_dialog.show_all()
-        self.emit("play_sound", "alert")
         result = restart_dialog.run()
         restart_dialog.destroy()
         if result == Gtk.ResponseType.REJECT:

diff --git a/src/emc/usr_intf/gmoccapy/getiniinfo.py b/src/emc/usr_intf/gmoccapy/getiniinfo.py
@@ -304,13 +304,6 @@ def get_max_feed_override(self):
             LOG.warning("No MAX_FEED_OVERRIDE entry found in [DISPLAY] of INI file")
         return float(temp)
 
-    def get_max_rapid_override(self):
-        temp = self.inifile.find("DISPLAY", "MAX_RAPID_OVERRIDE")
-        if not temp:
-            temp = 1.0
-            LOG.warning("No MAX_RAPID_OVERRIDE entry found in [DISPLAY] of INI file. Default settings 100 % applied!")
-        return float(temp)
-
     def get_embedded_tabs(self):
         # Check INI file for embed commands
         # NAME is used as the tab label if a notebook is used