Merge branch '2.9'

Author: c-morley

docs/src/gui/qtdragon.adoc

@@ -447,6 +447,7 @@ You must also set the MAX_SPINDLE_POWER in the INI.
 
 [source,{hal}]
 ----
+qtdragon.spindle-modbus-connection
 qtdragon.spindle-modbus-errors
 qtdragon.spindle-amps
 qtdragon.spindle-fault
@@ -1233,6 +1234,18 @@ qproperty-styleFont7: "Times,15,-1,5,90,0,0,1,1,0";
 }
 ----
 
+To have the manual spindle buttons also incrementally increase/decrease speed:
+
+[source,{ini}]
+----
+#action_spindle_fwd{
+    qproperty-spindle_up_action: true;
+}
+#action_spindle_rev{
+    qproperty-spindle_down_action: true;
+}
+----
+
 === Qt Designer and Python code
 
 All aspects of the GUI are fully customization through Qt Designer and/or Python code.

docs/src/gui/qtvcp-vcp-panels.adoc

@@ -305,4 +305,75 @@ start
 <1> In this case we load `qtvcp` using *`-Wn`* which waits for the panel to finish loading before continuing to run the next HAL command. +
     This is to _ensure that the panel created HAL pins are actually done_ in case they are used in the rest of the file.
 
+== Embedding QtVCP Virtual Control Panels into QtVCP Screens
+Qtvcp panels can be embedded into most Qtvcp screens and avoids problems such as focus transferring that can be a problem in non-native embedding.
+
+=== Embedding Commands
+A typical screen such as QtDragon will search the INI file under the heading [DISPLAY] for commands to embed a panel.
+
+[source,{ini}]
+----
+[DISPLAY]
+EMBED_TAB_NAME=Embedding demo
+EMBED_TAB_COMMAND=qtvcp simple_hal
+EMBED_TAB_LOCATION=tabWidget_utilities
+----
+
+*'EMBED_TAB_NAME'*:: will typically be the title of the tab.
+*'EMBED_TAB_LOCATION'*:: will be specific to the screen and specifies the tabWidget or stackedWidget to embed into.
+*'EMBED_TAB_COMMAND'*:: is the command used to invoke loading of the panel. For native embedded panels the first word will always be 'qtvcp', the second will be the panel to load. You cannot currently add any switches to the command line. The panel will follow the debugging mode setting of the main screen.
+
+=== Location of builtin Panels
+There are panels available that are included with linuxcnc. To see a list open a terminal and type 'qtvcp' and press return. +
+You will get a help printout and a list of builtin screen and panels. +
+Pick any of the names from the panel list and add that to the COMMAND entry after 'qtvcp'. +
+The builtin panel search path is 'share/qtvcp/panels/PANELNAME'. +
+Run-In-Place and installed versions of linuxcnc have these in different locations on the system.
+
+=== Location of Custom Panels
+Custom panels can be embedded too -either a modified builtin panel or a new user-built one. +
+When loading panels, QtVCP looks in the configuration folders path for 'qtvcp/panels/PANELNAME/PANELNAME.ui'. +
+'PANNELNAME' being any valid string with no spaces. If no path is found there, then looks in the builtin file path. +
+QtVCP will do the same process for the optional handler file: 'qtvcp/panels/PANELNAME/PANELNAME_handler.py'
+
+=== Handler Programming Tips
+In a screen handler file, the reference used for the window is 'self.w'. +
+In QtVCP panels, that reference will refers to the panel's window. +
+To reference the main window use 'self.w.MAIN'
+If your panel is to be able to run independently and embedded, you must trap errors from referencing objects not available.
+(ie main screen objects are not available in an independent panel.)
+
+eg. This would use the panels preference file if there is one.
+[source,{hal}]
+----
+try:
+    belt_en = self.w.PREFS_.getpref('Front_Belt_enabled', 1, int, 'SPINDLE_EXTRAS')
+exception:
+    belt_en = 1
+----
+
+This would use the main screen preference file if there is one.
+[source,{hal}]
+----
+try:
+    belt_en = self.w.MAIN.PREFS_.getpref('Front_Belt_enabled', 1, int, 'SPINDLE_EXTRAS')
+exception:
+    belt_en = 1
+----
+
+=== Designer Widget Tips
+
+When using python command option in Action Button widgets of an embedded panel:
+
+*`INSTANCE`*::
+  refers to the panel window 
+  E.g., `INSTANCE.my_panel_handler_function_call(True)`
+
+*'MAIN_INSTANCE'*::
+  refers to the main screen window.
+  E.g., `INSTANCE.my_main_screen_handler_function_call(True)`
+
+If the panel is not embedded, both refer to the panel window. +
+
+
 // vim: set syntax=asciidoc:

share/qtvcp/screens/qtdragon/qtdragon_handler.py

@@ -253,6 +253,8 @@ def init_pins(self):
         pin.value_changed.connect(self.spindle_fault_changed)
         pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_U32, QHAL.HAL_IN)
         pin.value_changed.connect(self.mb_errors_changed)
+        pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_U32, QHAL.HAL_IN)
+        pin.value_changed.connect(self.mb_connection_changed)
         QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
         # external offset control pins
         QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
@@ -470,6 +472,12 @@ def mb_errors_changed(self, data):
         errors = self.h['spindle-modbus-errors']
         self.w.lbl_mb_errors.setText(str(errors))
 
+    def mb_connection_changed(self, data):
+        if data:
+            self.w.lbl_mb_errors.setStyleSheet('')
+        else:
+            self.w.lbl_mb_errors.setStyleSheet('''background-color:rgb(202, 0, 0);''')
+
     def dialog_return(self, w, message):
         rtn = message.get('RETURN')
         name = message.get('NAME')

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

@@ -214,6 +214,9 @@ def init_pins(self):
         pin = QHAL.newpin("spindle-modbus-errors", QHAL.HAL_U32, QHAL.HAL_IN)
         pin.value_changed.connect(self.mb_errors_changed)
         QHAL.newpin("spindle-inhibit", QHAL.HAL_BIT, QHAL.HAL_OUT)
+        pin = QHAL.newpin("spindle-modbus-connection", QHAL.HAL_U32, QHAL.HAL_IN)
+        pin.value_changed.connect(self.mb_connection_changed)
+
         # external offset control pins
         QHAL.newpin("eoffset-enable", QHAL.HAL_BIT, QHAL.HAL_OUT)
         QHAL.newpin("eoffset-clear", QHAL.HAL_BIT, QHAL.HAL_OUT)
@@ -501,6 +504,12 @@ def mb_errors_changed(self, data):
         errors = self.h['spindle-modbus-errors']
         self.w.lbl_mb_errors.setText(str(errors))
 
+    def mb_connection_changed(self, data):
+        if data:
+            self.w.lbl_mb_errors.setStyleSheet('')
+        else:
+            self.w.lbl_mb_errors.setStyleSheet('''background-color:rgb(202, 0, 0);''')
+
     def eoffset_changed(self, data):
         self.w.z_comp_eoffset_value.setText(format(data*.001, '.3f'))