qtvcp: add "unlinkp" and "net" commands to mdi_line widget

Author: snowgoer540

docs/src/gui/qtvcp-widgets.adoc

@@ -1873,7 +1873,7 @@ It is a comma separated list of keyword and data.
 
 === MDILine Widget
 
-One can enter MDI commands here. A popup keyboard is available
+One can enter MDI commands here. A popup keyboard is available.
 There are also embedded commands available from this Widget.
 Enter any of these case sensitive commands to load the respective
 program or access the feature:
@@ -1892,11 +1892,23 @@ program or access the feature:
   link:http://linuxcnc.org/docs/devel/html/ladder/classic-ladder.html[ClassicLadder GUI] if the ClassicLadder realtime HAL component was loaded by the machine's config files
 * `PREFERENCE` - Loads the preference file onto the gcodeEditor
 * `CLEAR HISTORY` - Clears the MDI History
+* `net` - Connects a pin to a signal. An error will result if
+  the command is unsuccessful. Running LinuxCNC from terminal
+  may help determine the root cause as error messages from hal_lib.c
+  will be displayed there.
+** _Syntax_: `net <pin name> <signal name>`
+** __Example__: `net motion.jog-stop plasmac:jog-inhibit`
 * `setp` - Sets the value of a pin or a parameter. Valid values depend
   on the object type of the pin or parameter. An error will result if
   the data types do not match or the pin is connected to a signal.
 ** _Syntax_: `setp <pin/parameter-name> <value>`
 ** __Example__: `setp plasmac.resolution 100`
+* `unlinkp` - Disconnects a pin from a signal. An error will result
+  if the pin does not exist. Running LinuxCNC from terminal
+  may help determine the root cause as error messages from hal_lib.c
+  will be displayed there.
+** _Syntax_: `unlinkp <pin name>`
+** __Example__: `unlinkp motion.jog-stop`
 
 Note that the MDILine function "spindle_inhibit" can be used by a GUI's
 handler file to inhibit M3, M4, and M5 spindle commands if necessary.
@@ -1907,34 +1919,9 @@ It is based on pyQT's QLineEdit.
 
 Displays a scrollable list of past MDI command.
 A edit line is embedded for MDI commands.
-There are also embedded commands available from this Widget.
-Enter any of these case sensitive commands to load the respective
-program or access the feature:
-
-* `HALMETER` - Starts LinuxCNC utility
-  link:http://linuxcnc.org/docs/devel/html/hal/tutorial.html#sec:tutorial-halmeter[`halmeter`]
-* `HALSHOW` - Starts LinuxCNC utility
-  link:http://linuxcnc.org/docs/devel/html/hal/halshow.html#cha:halshow[`halshow`]
-* `HALSCOPE` - Starts LinuxCNC utility
-  link:http://linuxcnc.org/docs/devel/html/hal/tutorial.html#sec:tutorial-halscope[`halscope`]
-* `STATUS` - Starts LinuxCNC utility
-  link:https://linuxcnc.org/docs//html/man/man1/linuxcnctop.1.html[`status`]
-* `CALIBRATION` - Starts LinuxCNC utility
-  link:http://linuxcnc.org/docs/devel/html/getting-started/updating-linuxcnc.html#_calibration_emccalib_tcl[`calibration`]
-* `CLASSICLADDER` - Starts the
-  link:http://linuxcnc.org/docs/devel/html/ladder/classic-ladder.html[ClassicLadder GUI] if the ClassicLadder realtime HAL component was loaded by the machine's config files
-* `PREFERENCE` - Loads the preference file onto the gcodeEditor
-* `CLEAR HISTORY` - Clears the MDI History
-* `setp` - Sets the value of a pin or a parameter. Valid values depend
-  on the object type of the pin or parameter. An error will result if
-  the data types do not match or the pin is connected to a signal.
-** _Syntax_: `setp <pin/parameter-name> <value>`
-** _Example_: `setp plasmac.resolution 100`
-
-Note that the MDILine function "spindle_inhibit" can be used by a GUI's
-handler file to inhibit M3, M4, and M5 spindle commands if necessary.
+The same MDILine embedded commands may be accessed from this Widget.
 
-The history is recorded on a file defined in the INI.
+The history is recorded in a file defined in the INI.
 under the heading [DISPLAY] (this shows the default)
 
 [source,{ini}]

lib/python/qtvcp/widgets/mdi_line.py

@@ -100,6 +100,10 @@ def submit(self):
             fp.close()
         elif text.lower().startswith('setp'):
             self.setp(text)
+        elif text.lower().startswith('unlinkp'):
+            self.unlinkp(text)
+        elif text.lower().startswith('net'):
+            self.net(text)
         elif self.spindleInhibit and self.inhibit_spindle_commands(text):
             return
         else:
@@ -141,52 +145,74 @@ def line_down(self):
         STATUS.emit('move-text-linedown')
 
     def setp(self, setpString):
-        arguments = len(setpString.lower().replace('setp ','').split(' '))
+        arguments = len(setpString.lower().replace('setp',' ').split())
         if arguments == 2:
-            halpin, value = setpString.lower().replace('setp ','').split(' ')
+            halpin, value = setpString.lower().replace('setp',' ').split()
         else:
-            ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nsetp requires 2 arguments, {} given\n'.format(arguments))
+            ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nsetp requires 2 arguments, {} given\n'.format(arguments))
             return
         try:
             hal.get_value(halpin)
         except Exception as err:
-            ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\n{}\n'.format(err))
+            ACTION.SET_ERROR_MESSAGE('SETP ERROR:\n{}\n'.format(err))
             return
         try:
             hal.set_p(halpin, value)
         except Exception as err:
-            ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\n"{}" {}\n'.format(halpin, err))
+            ACTION.SET_ERROR_MESSAGE('SETP ERROR:\n"{}" {}\n'.format(halpin, err))
             return
         if type(hal.get_value(halpin)) == bool:
             if value.lower() in ['true', '1']:
                 value = True
             elif value.lower() in ['false', '0']:
                 value = False
             else:
-                ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nValue "{}" invalid for a BIT pin/parameter\n'.format(value))
+                ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nValue "{}" invalid for a BIT pin/parameter\n'.format(value))
                 return
             if hal.get_value(halpin) != value:
-                ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nBIT value comparison error\n')
+                ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nBIT value comparison error\n')
                 return
         elif type(hal.get_value(halpin)) == float:
             try:
                 value = float(value)
             except:
-                ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nValue "{}" invalid for a Float pin/parameter\n'.format(value))
+                ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nValue "{}" invalid for a Float pin/parameter\n'.format(value))
                 return
             if hal.get_value(halpin) != value:
-                ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nFloat value comparison error\n')
+                ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nFloat value comparison error\n')
                 return
         else:
             try:
                 value = int(value)
             except:
-                ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nValue "{}" invalid for S32 or U32 pin/parameter\n'.format(value))
+                ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nValue "{}" invalid for S32 or U32 pin/parameter\n'.format(value))
                 return
             if hal.get_value(halpin) != value:
-                ACTION.SET_ERROR_MESSAGE('SETP UNSUCCESSFUL:\nS32 or U32 value comparison error\n')
+                ACTION.SET_ERROR_MESSAGE('SETP ERROR:\nS32 or U32 value comparison error\n')
                 return
 
+    def unlinkp(self, unlinkpString):
+        arguments = len(unlinkpString.lower().replace('unlinkp',' ').split())
+        if arguments == 1:
+            halpin = unlinkpString.lower().replace('unlinkp',' ').strip()
+        else:
+            ACTION.SET_ERROR_MESSAGE('UNLINKP ERROR:\nunlinkp requires 1 argument, {} given\n'.format(arguments))
+            return
+        reply = hal.disconnect(halpin)
+        if reply:
+            ACTION.SET_ERROR_MESSAGE('UNLINKP ERROR:\nPin "{}" not found\n'.format(halpin))
+
+    def net(self, netString):
+        arguments = len(netString.lower().replace('net',' ').split())
+        if arguments == 2:
+            halpin, signal = netString.lower().replace('net',' ').split()
+        else:
+            ACTION.SET_ERROR_MESSAGE('NET ERROR:\nnet requires 2 arguments, {} given\n'.format(arguments))
+            return
+        reply = hal.connect(halpin, signal)
+        if reply:
+            ACTION.SET_ERROR_MESSAGE('NET ERROR:\nFailed to link pin "{}" to signal "{}"\n'.format(halpin, signal))
+
     def spindle_inhibit(self, state):
         self.spindleInhibit = state