Merge branch '2.9'

LinuxCNC · Aug 8, 2023 · 8b39390 · 8b39390
2 parents 924419e + 7066b79
commit 8b39390
Show file tree

Hide file tree

Showing 15 changed files with 160 additions and 95 deletions.
diff --git a/configs/sim/gmoccapy/README b/configs/sim/gmoccapy/README
@@ -1,4 +1,4 @@
-A touch screen unser interface for mills, lathes and plasma cutters.
+A touch screen user interface for mills, lathes and plasma cutters.
 Based of the design of moccagui, a GUI coded in FreePascal.
 GMOCCAPY is using Python instead.
 

diff --git a/docs/man/an-old-fixed.tmac b/docs/man/an-old-fixed.tmac
@@ -687,7 +687,7 @@
 .\" Set each rendering parameter only if its -[dr] option or man.local
 .\" did not.
 .
-.\" continous rendering (one long page)
+.\" continuous rendering (one long page)
 .if !r cR \{\
 .  ie n \
 .    nr cR 1

diff --git a/docs/man/man9/hostmot2.9 b/docs/man/man9/hostmot2.9
@@ -732,7 +732,7 @@ The first three pins are the high side drivers, the second three are their compl
 The enable bit is intended to control the servo amplifier.
 The input bit is a fault bit, typically wired to over-current detection.
 When set the PWM generator is disabled.  The three phase duty-cycles are individually controllable from \-Scale to +Scale.
-Note that 0 corresponds to a 50% duty cycle and this is the inialization value.
+Note that 0 corresponds to a 50% duty cycle and this is the initialization value.
 
 Pins:
 

diff --git a/docs/src/gui/gscreen.adoc b/docs/src/gui/gscreen.adoc
@@ -330,7 +330,7 @@ self.update_filepath(self, obj, path):
 ----
 
 When LinuxCNC loads a new file, Gstat will send a callback message to the function 'update_filepath'.
-In this example we update a label with that path name (assuming there is a label nammed 'my_path_label') in the GLADE file.
+In this example we update a label with that path name (assuming there is a label named 'my_path_label') in the GLADE file.
 
 === Jogging Keys
 

diff --git a/lib/python/qtvcp/lib/ripper/gcode_ripper.py b/lib/python/qtvcp/lib/ripper/gcode_ripper.py
@@ -753,7 +753,7 @@ def createWidgets(self):
         self.WriteRoundButton = Button(self.master,text="Stock Rounding",
                                       command=self.STOCK_Round_Window)
 
-        ## Define "Export" mode input feilds here
+        ## Define "Export" mode input fields here
         self.Label_Gcode_Export_Properties = Label(self.master,text="Export Properties:",\
                                            anchor=W)
 

diff --git a/lib/python/qtvcp/widgets/action_button.py b/lib/python/qtvcp/widgets/action_button.py
@@ -507,11 +507,15 @@ def action(self, state=None):
         elif self.tool_offset_dialog:
             STATUS.emit('dialog-request', {'NAME':'TOOLOFFSET', 'ID':'_%s_'% self.objectName()})
         elif self.zero_axis:
-            j = "XYZABCUVW"
-            try:
-                axis = j[self.joint]
-            except IndexError:
-                LOG.error("can't zero origin for specified joint {}".format(self.joint))
+            axis = self.axis
+            if axis == '':
+                # TODO remove this 2.9 workaround in the future
+                LOG.warning("{} should use axis property not joint".format(self.objectName()))
+                j = "XYZABCUVW"
+                try:
+                    axis = j[self.joint]
+                except IndexError:
+                    LOG.error("can't zero origin for specified joint {}".format(self.joint))
             ACTION.SET_AXIS_ORIGIN(axis, 0)
         elif self.zero_g5x:
             ACTION.ZERO_G5X_OFFSET(0)

diff --git a/lib/python/qtvcp/widgets/widget_baseclass.py b/lib/python/qtvcp/widgets/widget_baseclass.py
@@ -89,7 +89,7 @@ def get_full_pinname(self, pin):
 
 # we do this so we can manipulate all instances based on this.
 # we wish to embed variables.
-# This class gets get instatiated in qt_makegui.py
+# This class gets get instantiated in qt_makegui.py
 class _HalWidgetBase(_HalWidgetBase_):
     _instance = None
     _instanceNum = 0

diff --git a/share/qtvcp/screens/qt_cnc/qt_cnc.ui b/share/qtvcp/screens/qt_cnc/qt_cnc.ui
@@ -140,6 +140,9 @@ font: 75 18pt &quot;Courier 10 Pitch&quot;;</string>
      <property name="joint_number" stdset="0">
       <number>2</number>
      </property>
+     <property name="axis_letter" stdset="0">
+      <string>Z</string>
+     </property>
     </widget>
     <widget class="ActionButton" name="actionbutton_2">
      <property name="geometry">
@@ -162,6 +165,9 @@ font: 75 18pt &quot;Courier 10 Pitch&quot;;</string>
      <property name="joint_number" stdset="0">
       <number>1</number>
      </property>
+     <property name="axis_letter" stdset="0">
+      <string>Y</string>
+     </property>
     </widget>
     <widget class="ActionButton" name="actionbutton_3">
      <property name="geometry">
@@ -187,6 +193,9 @@ font: 75 18pt &quot;Courier 10 Pitch&quot;;</string>
      <property name="joint_number" stdset="0">
       <number>0</number>
      </property>
+     <property name="axis_letter" stdset="0">
+      <string>X</string>
+     </property>
     </widget>
    </widget>
    <widget class="QLabel" name="label_13">
@@ -572,13 +581,13 @@ font: 75 18pt &quot;Courier 10 Pitch&quot;;</string>
      <double>0.300000000000000</double>
     </property>
     <property name="circle_diameter" stdset="0">
-     <double>10.000000000000000</double>
+     <number>10</number>
     </property>
     <property name="right_edge_offset" stdset="0">
-     <double>3.000000000000001</double>
+     <number>3</number>
     </property>
     <property name="top_edge_offset" stdset="0">
-     <double>3.000000000000001</double>
+     <number>3</number>
     </property>
     <property name="corner_radius" stdset="0">
      <double>4.000000000000000</double>
@@ -774,13 +783,13 @@ p, li { white-space: pre-wrap; }
      <double>0.300000000000000</double>
     </property>
     <property name="circle_diameter" stdset="0">
-     <double>10.000000000000000</double>
+     <number>10</number>
     </property>
     <property name="right_edge_offset" stdset="0">
-     <double>3.000000000000000</double>
+     <number>3</number>
     </property>
     <property name="top_edge_offset" stdset="0">
-     <double>3.000000000000000</double>
+     <number>3</number>
     </property>
     <property name="corner_radius" stdset="0">
      <double>4.000000000000000</double>
@@ -976,13 +985,13 @@ p, li { white-space: pre-wrap; }
      <double>0.300000000000000</double>
     </property>
     <property name="circle_diameter" stdset="0">
-     <double>10.000000000000000</double>
+     <number>10</number>
     </property>
     <property name="right_edge_offset" stdset="0">
-     <double>3.000000000000000</double>
+     <number>3</number>
     </property>
     <property name="top_edge_offset" stdset="0">
-     <double>3.000000000000000</double>
+     <number>3</number>
     </property>
     <property name="corner_radius" stdset="0">
      <double>4.000000000000000</double>
@@ -2560,9 +2569,6 @@ file</string>
      <property name="is_limits_overridden_status" stdset="0">
       <bool>true</bool>
      </property>
-     <property name="is_limits_overridden_status" stdset="0">
-      <bool>true</bool>
-     </property>
     </widget>
     <widget class="ActionButton" name="button_estop">
      <property name="geometry">
@@ -2621,10 +2627,10 @@ file</string>
       <double>0.300000000000000</double>
      </property>
      <property name="circle_diameter" stdset="0">
-      <double>15.000000000000000</double>
+      <number>15</number>
      </property>
      <property name="right_edge_offset" stdset="0">
-      <double>2.000000000000000</double>
+      <number>2</number>
      </property>
      <property name="corner_radius" stdset="0">
       <double>3.000000000000000</double>
@@ -2822,10 +2828,10 @@ file</string>
       <double>0.300000000000000</double>
      </property>
      <property name="circle_diameter" stdset="0">
-      <double>15.000000000000000</double>
+      <number>15</number>
      </property>
      <property name="right_edge_offset" stdset="0">
-      <double>2.000000000000000</double>
+      <number>2</number>
      </property>
      <property name="corner_radius" stdset="0">
       <double>3.000000000000000</double>
@@ -3536,13 +3542,13 @@ View</string>
       <double>0.300000000000000</double>
      </property>
      <property name="circle_diameter" stdset="0">
-      <double>10.000000000000000</double>
+      <number>10</number>
      </property>
      <property name="right_edge_offset" stdset="0">
-      <double>0.000000000000000</double>
+      <number>0</number>
      </property>
      <property name="top_edge_offset" stdset="0">
-      <double>0.000000000000000</double>
+      <number>0</number>
      </property>
      <property name="corner_radius" stdset="0">
       <double>5.000000000000000</double>
@@ -4457,36 +4463,43 @@ font: 75 18pt &quot;Noto Sans&quot;;</string>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>GCodeGraphics</class>
+   <class>IndicatedPushButton</class>
+   <extends>QPushButton</extends>
+   <header>qtvcp.widgets.simple_widgets</header>
+  </customwidget>
+  <customwidget>
+   <class>LED</class>
    <extends>QWidget</extends>
-   <header>qtvcp.widgets.gcode_graphics</header>
-   <container>1</container>
+   <header>qtvcp.widgets.led_widget</header>
   </customwidget>
   <customwidget>
-   <class>MDILine</class>
-   <extends>QLineEdit</extends>
-   <header>qtvcp.widgets.mdi_line</header>
+   <class>StateEnableGridLayout</class>
+   <extends>QWidget</extends>
+   <header>qtvcp.widgets.container_widgets</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>StateLabel</class>
-   <extends>QLabel</extends>
-   <header>qtvcp.widgets.state_label</header>
+   <class>GCodeGraphics</class>
+   <extends>QWidget</extends>
+   <header>qtvcp.widgets.gcode_graphics</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
-   <class>LED</class>
-   <extends>QWidget</extends>
-   <header>qtvcp.widgets.led_widget</header>
+   <class>DROLabel</class>
+   <extends>QLabel</extends>
+   <header>qtvcp.widgets.dro_widget</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
-   <class>StateLED</class>
-   <extends>LED</extends>
-   <header>qtvcp.widgets.state_led</header>
+   <class>MDILine</class>
+   <extends>QLineEdit</extends>
+   <header>qtvcp.widgets.mdi_line</header>
+   <container>1</container>
   </customwidget>
   <customwidget>
-   <class>StateEnableGridLayout</class>
+   <class>GcodeEditor</class>
    <extends>QWidget</extends>
-   <header>qtvcp.widgets.container_widgets</header>
+   <header>qtvcp.widgets.gcode_editor</header>
    <container>1</container>
   </customwidget>
   <customwidget>
@@ -4496,53 +4509,51 @@ font: 75 18pt &quot;Noto Sans&quot;;</string>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>JogIncrements</class>
-   <extends>QComboBox</extends>
-   <header>qtvcp.widgets.jog_increments</header>
-  </customwidget>
-  <customwidget>
-   <class>ScreenOptions</class>
-   <extends>QWidget</extends>
-   <header>qtvcp.widgets.screen_options</header>
+   <class>WidgetSwitcher</class>
+   <extends>QStackedWidget</extends>
+   <header>qtvcp.widgets.widget_switcher</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>StatusAdjustmentBar</class>
-   <extends>QWidget</extends>
-   <header>qtvcp.widgets.adjustment_bar</header>
+   <class>StateLED</class>
+   <extends>LED</extends>
+   <header>qtvcp.widgets.state_led</header>
   </customwidget>
   <customwidget>
    <class>StatusLabel</class>
    <extends>QLabel</extends>
    <header>qtvcp.widgets.status_label</header>
   </customwidget>
   <customwidget>
-   <class>DROLabel</class>
+   <class>StateLabel</class>
    <extends>QLabel</extends>
-   <header>qtvcp.widgets.dro_widget</header>
-   <container>1</container>
+   <header>qtvcp.widgets.state_label</header>
+  </customwidget>
+  <customwidget>
+   <class>ActionButton</class>
+   <extends>IndicatedPushButton</extends>
+   <header>qtvcp.widgets.action_button</header>
   </customwidget>
   <customwidget>
    <class>RoundButton</class>
    <extends>ActionButton</extends>
    <header>qtvcp.widgets.action_button_round</header>
   </customwidget>
   <customwidget>
-   <class>WidgetSwitcher</class>
-   <extends>QStackedWidget</extends>
-   <header>qtvcp.widgets.widget_switcher</header>
-   <container>1</container>
+   <class>StatusAdjustmentBar</class>
+   <extends>QWidget</extends>
+   <header>qtvcp.widgets.adjustment_bar</header>
   </customwidget>
   <customwidget>
-   <class>GcodeEditor</class>
+   <class>ScreenOptions</class>
    <extends>QWidget</extends>
-   <header>qtvcp.widgets.gcode_editor</header>
+   <header>qtvcp.widgets.screen_options</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>ActionButton</class>
-   <extends>QPushButton</extends>
-   <header>qtvcp.widgets.action_button</header>
+   <class>JogIncrements</class>
+   <extends>QComboBox</extends>
+   <header>qtvcp.widgets.jog_increments</header>
   </customwidget>
  </customwidgets>
  <resources/>