qtplasmac: move options from ini file to prefs file

Author: phillc54

configs/by_machine/qtplasmac/machine.tcl

@@ -19,7 +19,10 @@ loadrt hypot names=sim:hyp_xy,sim:hyp_xyz
 # ---THREAD LINKS---
 addf motion-command-handler servo-thread
 addf motion-controller servo-thread
-addf plasmac servo-thread
+# don't add the plasmac component if it already exists
+if {[hal list pin plasmac.mode] == {}} {
+    addf plasmac servo-thread
+}
 for {set jnum 0} {$jnum < $numJoints} {incr jnum} {
     addf sim:${jnum}_pid.do-pid-calcs servo-thread
     addf sim:${jnum}_mux servo-thread

configs/by_machine/qtplasmac/sim_no_stepgen.tcl

@@ -68,14 +68,9 @@ net sim:tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepa
 
 # ---ESTOP HANDLING---
 loadrt or2 names=estop_or
-loadrt not names=estop_not
-addf estop_or      servo-thread
-addf estop_not servo-thread
-net sim:estop-raw estop_or.out estop_not.in
-net sim:estop-out estop_not.out iocontrol.0.emc-enable-in
-if {$::QTPLASMAC(ESTOP_TYPE) == 2} {
-    loadrt not names=estop_not_1
-    addf estop_not_1 servo-thread
-    net sim:estop-1-raw iocontrol.0.user-enable-out => estop_not_1.in
-    net sim:estop-1-in  estop_not_1.out             => estop_or.in1
-}
+loadrt not names=estop_not,estop_not_1
+addf estop_or    servo-thread
+addf estop_not   servo-thread
+addf estop_not_1 servo-thread
+net sim:estop-raw estop_or.out  => estop_not.in
+net sim:estop-out estop_not.out => iocontrol.0.emc-enable-in

configs/by_machine/qtplasmac/sim_stepgen.tcl

@@ -50,23 +50,18 @@ addf db_breakaway servo-thread
 addf db_arc-ok    servo-thread
 
 # ---Z JOINT CONNECTION---
-net plasmac:axis-position joint.${z-axis}.pos-fb  => plasmac.axis-z-position
+net plasmac:axis-position joint.${z-axis}.pos-fb => plasmac.axis-z-position
 
 # ---TOOL CHANGE PASSTHROUGH
 net sim:tool-number                                    <= iocontrol.0.tool-prep-number
-net sim:tool-change-loopback iocontrol.0.tool-change   => iocontrol.0.tool-changed
+net sim:tool-change-loopback  iocontrol.0.tool-change  => iocontrol.0.tool-changed
 net sim:tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared
 
 # ---ESTOP HANDLING---
 loadrt or2 names=estop_or
-loadrt not names=estop_not
-addf estop_or servo-thread
-addf estop_not servo-thread
+loadrt not names=estop_not,estop_not_1
+addf estop_or    servo-thread
+addf estop_not   servo-thread
+addf estop_not_1 servo-thread
 net sim:estop-raw estop_or.out  => estop_not.in
 net sim:estop-out estop_not.out => iocontrol.0.emc-enable-in
-if {$::QTPLASMAC(ESTOP_TYPE) == 2} {
-    loadrt not names=estop_not_1
-    addf estop_not_1 servo-thread
-    net sim:estop-1-raw iocontrol.0.user-enable-out => estop_not_1.in
-    net sim:estop-1-in  estop_not_1.out             => estop_or.in1
-}

docs/src/plasma/qtplasmac.adoc

@@ -27,7 +27,7 @@
 
 _translate = QCoreApplication.translate
 
-def dialog_show(P, W, iniPath, STATUS, ACTION, TOOL, foreColor, backColor):
+def dialog_show(P, W, prefs, iniPath, STATUS, ACTION, TOOL, foreColor, backColor):
     msg = QMessageBox()
     msg.setWindowIcon(QIcon(os.path.join(P.IMAGES, 'linuxcncicon.png')))
     msg.setWindowTitle(_translate('Offsets', 'SET PERIPHERAL OFFSET'))
@@ -50,7 +50,8 @@ def dialog_show(P, W, iniPath, STATUS, ACTION, TOOL, foreColor, backColor):
         if get_reply(P, STATUS, P.laserOffsetX, P.laserOffsetY):
             P.laserOffsetX = round(STATUS.get_position()[1][0], 4) + 0
             P.laserOffsetY = round(STATUS.get_position()[1][1], 4) + 0
-            do_ini_file(P, W, iniPath, P.laserOffsetX, P.laserOffsetY, '', 'LASER_TOUCHOFF', '# laser touchoff')
+            prefs.putpref('X axis', P.laserOffsetX, float, 'LASER_OFFSET')
+            prefs.putpref('Y axis', P.laserOffsetY, float, 'LASER_OFFSET')
             if P.laserOffsetX or P.laserOffsetY:
                 W.laser.show()
             else:
@@ -59,7 +60,8 @@ def dialog_show(P, W, iniPath, STATUS, ACTION, TOOL, foreColor, backColor):
         if get_reply(P, STATUS, P.camOffsetX, P.camOffsetY):
             P.camOffsetX = round(STATUS.get_position()[1][0], 4) + 0
             P.camOffsetY = round(STATUS.get_position()[1][1], 4) + 0
-            do_ini_file(P, W, iniPath, P.camOffsetX, P.camOffsetY, '', 'CAMERA_TOUCHOFF', '# camera touchoff')
+            prefs.putpref('X axis', P.camOffsetX, float, 'CAMERA_OFFSET')
+            prefs.putpref('Y axis', P.camOffsetY, float, 'CAMERA_OFFSET')
             if P.camOffsetX or P.camOffsetY:
                 W.camera.show()
             else:
@@ -110,7 +112,9 @@ def dialog_show(P, W, iniPath, STATUS, ACTION, TOOL, foreColor, backColor):
             P.probeOffsetX = round(STATUS.get_position()[1][0], 4) + 0
             P.probeOffsetY = round(STATUS.get_position()[1][1], 4) + 0
             P.probeDelay = new
-            do_ini_file(P, W, iniPath, P.probeOffsetX, P.probeOffsetY, P.probeDelay, 'OFFSET_PROBING', '# offset probing')
+            prefs.putpref('X axis', P.probeOffsetX, float, 'OFFSET_PROBING')
+            prefs.putpref('Y axis', P.probeOffsetY, float, 'OFFSET_PROBING')
+            prefs.putpref('Delay', P.probeDelay, float, 'OFFSET_PROBING')
             P.set_probe_offset_pins()
 
 def get_reply(P, STATUS, xOffset, yOffset, probe=False, delay=0.0, new=0.0):
@@ -140,58 +144,6 @@ def get_reply(P, STATUS, xOffset, yOffset, probe=False, delay=0.0, new=0.0):
     else:
         return False
 
-def do_ini_file(P, W, iniPath, xOffset, yOffset, pDelay, param, comment):
-    written = False
-    COPY(iniPath, '{}~'.format(iniPath))
-    inFile = open('{}~'.format(iniPath), 'r')
-    outFile = open(iniPath, 'w')
-    while 1:
-        line = inFile.readline()
-        if not line:
-            break
-        elif line.startswith('[QTPLASMAC]'):
-            outFile.write(line)
-            break
-        else:
-            outFile.write(line)
-    while 1:
-        line = inFile.readline()
-        if not line:
-            if not written:
-                outFile.write('{}\n'.format(comment))
-                if xOffset or yOffset:
-                    outFile.write('{} = X{:0.3f} Y{:0.3f} {}\n\n'.format(param, xOffset, yOffset, pDelay))
-                else:
-                    outFile.write('#{} = X0.000 Y0.000\n\n'.format(param))
-            break
-        elif line.startswith('['):
-            if not written:
-                outFile.write('{}\n'.format(comment))
-                if xOffset or yOffset:
-                    outFile.write('{} = X{:0.3f} Y{:0.3f} {}\n\n'.format(param, xOffset, yOffset, pDelay))
-                else:
-                    outFile.write('#{} = X0.000 Y0.000\n\n'.format(param))
-            outFile.write(line)
-            break
-        elif line.startswith('{}'.format(param)) or line.startswith('#{}'.format(param)):
-            if xOffset or yOffset:
-                outFile.write('{} = X{:0.3f} Y{:0.3f} {}\n'.format(param, xOffset, yOffset, pDelay))
-            else:
-                outFile.write('#{} = X0.000 Y0.000\n'.format(param))
-            written = True
-            break
-        else:
-            outFile.write(line)
-    while 1:
-        line = inFile.readline()
-        if not line:
-            break
-        else:
-            outFile.write(line)
-    inFile.close()
-    outFile.close()
-    os.remove('{}~'.format(iniPath))
-
 def do_tool_file(P, W, toolFile, xOffset, yOffset):
     written = False
     COPY(toolFile, '{}~'.format(toolFile))

lib/python/qtvcp/lib/qtplasmac/set_offsets.py

@@ -22,8 +22,89 @@
 import os
 from shutil import copy as COPY
 
+# move qtplasmac options from ini file to prefs file pre V1.227.219 2022/07/14)
+def move_options_to_prefs_file(inifile, prefs):
+    text = prefs.getpref('shutdown_msg_detail', '', str, 'SHUTDOWN_OPTIONS')
+    prefs.putpref('Exit warning text', text, str, 'GUI_OPTIONS')
+    prefs.remove_section('SHUTDOWN_OPTIONS')
+    prefs.write(open(prefs.fn, "w"))
+    data = inifile.find('QTPLASMAC', 'MODE') or None
+    if data:
+        prefs.putpref('Mode', data, int, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'ESTOP_TYPE') or None
+    if data:
+        prefs.putpref('Estop type', data, int, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'DRO_POSITION') or None
+    if data:
+        prefs.putpref('DRO position', data, str, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'FLASH_ERROR') or None
+    if data:
+        prefs.putpref('Flash error', data, bool, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'HIDE_RUN') or None
+    if data:
+        prefs.putpref('Hide run', data, bool, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'HIDE_PAUSE') or None
+    if data:
+        prefs.putpref('Hide pause', data, bool, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'HIDE_ABORT') or None
+    if data:
+        prefs.putpref('Hide abort', data, bool, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'CUSTOM_STYLE') or None
+    if data:
+        prefs.putpref('Custom style', data, str, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'AUTOREPEAT_ALL') or None
+    if data:
+        prefs.putpref('Autorepeat all', data, bool, 'GUI_OPTIONS')
+    data = inifile.find('QTPLASMAC', 'LASER_TOUCHOFF') or None
+    if data:
+        x, y, d = get_offsets(data)
+        prefs.putpref('X axis', x, float, 'LASER_OFFSET')
+        prefs.putpref('Y axis', y, float, 'LASER_OFFSET')
+    data = inifile.find('QTPLASMAC', 'CAMERA_TOUCHOFF') or None
+    if data:
+        x, y, d = get_offsets(data)
+        prefs.putpref('X axis', x, float, 'CAMERA_OFFSET')
+        prefs.putpref('Y axis', y, float, 'CAMERA_OFFSET')
+    data = inifile.find('QTPLASMAC', 'OFFSET_PROBING') or None
+    if data:
+        x, y, d = get_offsets(data)
+        prefs.putpref('X axis', x, float, 'OFFSET_PROBING')
+        prefs.putpref('Y axis', y, float, 'OFFSET_PROBING')
+        prefs.putpref('Delay', d, float, 'OFFSET_PROBING')
+    data = inifile.find('QTPLASMAC', 'PM_PORT') or None
+    if data:
+        prefs.putpref('Port', data, str, 'GUI_OPTIONS')
+    for bNum in range(1,21):
+        bName = inifile.find('QTPLASMAC', 'BUTTON_{}_NAME'.format(bNum)) or None
+        bCode = inifile.find('QTPLASMAC', 'BUTTON_{}_CODE'.format(bNum)) or None
+        if bName and bCode:
+            prefs.putpref('{} Name'.format(bNum), bName, str, 'BUTTONS')
+            prefs.putpref('{} Code'.format(bNum), bCode, str, 'BUTTONS')
+
+def move_options_to_prefs_file_iniwrite(inifile):
+    tmpFile = '{}~'.format(inifile)
+    COPY(inifile, tmpFile)
+    with open(tmpFile, 'r') as inFile:
+        with open(inifile, 'w') as outFile:
+            remove = False
+            for line in inFile:
+                if not line:
+                    break
+                elif line.startswith('[QTPLASMAC]'):
+                    remove = True
+                    continue
+                elif remove:
+                    if line.startswith('['):
+                        remove = False
+                    else:
+                        continue
+                outFile.write(line)
+    if os.path.isfile(tmpFile):
+        os.remove(tmpFile)
+    update_notify('V1.227.219')
+
 # remove the qtplasmac link from the config directory (pre V1.225.208 2022/06/29)
-def remove_qtplasmac_link(inifile):
+def remove_qtplasmac_link_iniwrite(inifile):
     tmpFile = '{}~'.format(inifile)
     COPY(inifile, tmpFile)
     with open(tmpFile, 'r') as inFile:
@@ -43,7 +124,7 @@ def remove_qtplasmac_link(inifile):
     update_notify('V1.225.208')
 
 # change startup parameters from a subroutine (pre V1.224.207 2022/06/22)
-def rs274ngc_startup_code(inifile): #, unitsCode):
+def rs274ngc_startup_code_iniwrite(inifile):
     tmpFile = '{}~'.format(inifile)
     COPY(inifile, tmpFile)
     with open(tmpFile, 'r') as inFile:
@@ -122,7 +203,41 @@ def split_prefs_file(old, new, prefs):
     update_notify('V1.222.170')
 
 # use qtplasmac_comp.hal for component connections (pre V1.221.154 2022/01/18)
-def add_component_hal_file(path, inifile, halfiles):
+def add_component_hal_file(path, halfiles):
+    pinsToCheck = ['PLASMAC COMPONENT INPUTS','plasmac.arc-ok-in','plasmac.axis-x-position',
+                   'plasmac.axis-y-position','plasmac.breakaway','plasmac.current-velocity',
+                   'plasmac.cutting-start','plasmac.cutting-stop','plasmac.feed-override',
+                   'plasmac.feed-reduction','plasmac.float-switch','plasmac.feed-upm',
+                   'plasmac.ignore-arc-ok-0','plasmac.machine-is-on','plasmac.motion-type',
+                   'plasmac.offsets-active','plasmac.ohmic-probe','plasmac.program-is-idle',
+                   'plasmac.program-is-paused','plasmac.program-is-running','plasmac.scribe-start',
+                   'plasmac.spotting-start','plasmac.thc-disable','plasmac.torch-off',
+                   'plasmac.units-per-mm','plasmac.x-offset-current','plasmac.y-offset-current',
+                   'plasmac.z-offset-current',
+                   'PLASMAC COMPONENT OUTPUTS','plasmac.adaptive-feed','plasmac.feed-hold',
+                   'plasmac.offset-scale','plasmac.program-pause','plasmac.program-resume',
+                   'plasmac.program-run','plasmac.program-stop','plasmac.torch-on',
+                   'plasmac.x-offset-counts','plasmac.y-offset-counts','plasmac.xy-offset-enable',
+                   'plasmac.z-offset-counts','plasmac.z-offset-enable','plasmac.requested-velocity']
+    for f in halfiles:
+        f = os.path.expanduser(f)
+        if not 'custom' in f:
+            halfile = os.path.join(path, f)
+            with open(halfile, 'r') as inFile:
+                if 'plasmac.cutting-start' in inFile.read():
+                    inFile.seek(0)
+                    tmpFile = '{}~'.format(halfile)
+                    COPY(halfile, tmpFile)
+                    with open(tmpFile, 'r') as inFile:
+                        with open(f, 'w') as outFile:
+                            for line in inFile:
+                                if any(pin in line for pin in pinsToCheck):
+                                    continue
+                                outFile.write(line)
+    if os.path.isfile(tmpFile):
+        os.remove(tmpFile)
+
+def add_component_hal_file_iniwrite(inifile):
     written = False
     tmpFile = '{}~'.format(inifile)
     COPY(inifile, tmpFile)
@@ -163,44 +278,25 @@ def add_component_hal_file(path, inifile, halfiles):
                     outFile.write(line)
     if os.path.isfile(tmpFile):
         os.remove(tmpFile)
-#'plasmac.axis-z-position',
-    pinsToCheck = ['PLASMAC COMPONENT INPUTS','plasmac.arc-ok-in','plasmac.axis-x-position',
-                   'plasmac.axis-y-position','plasmac.breakaway','plasmac.current-velocity',
-                   'plasmac.cutting-start','plasmac.cutting-stop','plasmac.feed-override',
-                   'plasmac.feed-reduction','plasmac.float-switch','plasmac.feed-upm',
-                   'plasmac.ignore-arc-ok-0','plasmac.machine-is-on','plasmac.motion-type',
-                   'plasmac.offsets-active','plasmac.ohmic-probe','plasmac.program-is-idle',
-                   'plasmac.program-is-paused','plasmac.program-is-running','plasmac.scribe-start',
-                   'plasmac.spotting-start','plasmac.thc-disable','plasmac.torch-off',
-                   'plasmac.units-per-mm','plasmac.x-offset-current','plasmac.y-offset-current',
-                   'plasmac.z-offset-current',
-                   'PLASMAC COMPONENT OUTPUTS','plasmac.adaptive-feed','plasmac.feed-hold',
-                   'plasmac.offset-scale','plasmac.program-pause','plasmac.program-resume',
-                   'plasmac.program-run','plasmac.program-stop','plasmac.torch-on',
-                   'plasmac.x-offset-counts','plasmac.y-offset-counts','plasmac.xy-offset-enable',
-                   'plasmac.z-offset-counts','plasmac.z-offset-enable','plasmac.requested-velocity']
-    for f in halfiles:
-        f = os.path.expanduser(f)
-        if not 'custom' in f:
-            halfile = os.path.join(path, f)
-            with open(halfile, 'r') as inFile:
-                if 'plasmac.cutting-start' in inFile.read():
-                    inFile.seek(0)
-                    tmpFile = '{}~'.format(halfile)
-                    COPY(halfile, tmpFile)
-                    with open(tmpFile, 'r') as inFile:
-                        with open(f, 'w') as outFile:
-                            for line in inFile:
-                                if any(pin in line for pin in pinsToCheck):
-                                    continue
-                                outFile.write(line)
-    if os.path.isfile(tmpFile):
-        os.remove(tmpFile)
     update_notify('V1.221.154')
 
+# common functions
+
+def get_offsets(data):
+    x = y = d = 0
+    parms = data.lower().split()
+    for parm in parms:
+        if parm.startswith('x'):
+            x = float(parm.replace('x', ''))
+        elif parm.startswith('y'):
+            y = float(parm.replace('y', ''))
+        else:
+            d = float(parm)
+    return x, y, d
+
 def update_notify(version, restart=False):
-    print('-------------------------------')
+    print('\n-------------------------------')
     print('QtPlasmac updated to', version)
     if restart:
         print('\n**** A restart is required ****\n')
-    print('-------------------------------')
+    print('-------------------------------\n')

lib/python/qtvcp/lib/qtplasmac/updater.py

@@ -109,7 +109,7 @@ def update(self):
             self.MACRO_PATH = None
         self.INI_MACROS = self.INI.findall("DISPLAY", "MACRO")
         self.MACHINE_IS_LATHE = bool(self.INI.find("DISPLAY", "LATHE"))
-        self.MACHINE_IS_QTPLASMAC = (self.INI.find("QTPLASMAC", "MODE")) or None
+        self.MACHINE_IS_QTPLASMAC = 'qtplasmac' in self.INI.find("DISPLAY", "DISPLAY")
 
         extensions = self.INI.findall("FILTER", "PROGRAM_EXTENSION")
         self.PROGRAM_FILTERS = ([e.split(None, 1) for e in extensions]) or None