qtplasmac: fix m_code pathing

Fixes the m_code path for a package install sim.
Allows update 001-017 to be applied correctly for configs that were build prior to then.

Author: snowgoer540

configs/sim/qtplasmac/qtplasmac_imperial_ini.inc

@@ -9,7 +9,7 @@ tap                     = qtplasmac_gcode
 RS274NGC_STARTUP_CODE   = G20 G40 G49 G80 G90 G92.1 G94 G97 M52P1
 PARAMETER_FILE          = imperial_parameters.txt
 SUBROUTINE_PATH         = ./:../../nc_files
-USER_M_PATH             = ./:../../nc_files/plasmac/m_files
+USER_M_PATH             = ./:../../nc_files/examples/plasmac/m_files:../../nc_files/plasmac/m_files
 
 [HAL]
 TWOPASS                 = ON

configs/sim/qtplasmac/qtplasmac_metric_ini.inc

@@ -9,7 +9,7 @@ tap                     = qtplasmac_gcode
 RS274NGC_STARTUP_CODE   = G21 G40 G49 G80 G90 G92.1 G94 G97 M52P1
 PARAMETER_FILE          = metric_parameters.txt
 SUBROUTINE_PATH         = ./:../../nc_files
-USER_M_PATH             = ./:../../nc_files/plasmac/m_files
+USER_M_PATH             = ./:../../nc_files/examples/plasmac/m_files:../../nc_files/plasmac/m_files
 
 [HAL]
 TWOPASS                 = ON

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

@@ -1,4 +1,4 @@
-VERSION = '008.049'
+VERSION = '008.050'
 LCNCVER = '2.10'
 DOCSVER = LCNCVER
 
@@ -352,7 +352,7 @@ def initialized__(self):
             STATUS.emit('error', linuxcnc.OPERATOR_ERROR, f'{msg0} {LCNCVER}\n\n{msg1} {linuxcnc.version.split(".")[:2]}\n\n{msg2}')
             quit()
         # if USER_M_PATH is not valid try to find a valid USER_M_PATH in the possible default locations
-        if self.mPath != 'valid':
+        if self.mPath != 'valid' and not self.updateIni:
             msg0 = _translate('HandlerClass', 'cannot be found in the path')
             msg1 = _translate('HandlerClass', 'Please edit [RS274NGC]USER_M_PATH in the .ini file')
             msg2 = _translate('HandlerClass', 'QtPlasmac is closing')
@@ -363,7 +363,8 @@ def initialized__(self):
                     break
             if not mPath:
                 msg3 = _translate('HandlerClass', 'does not exist in the default locations')
-            STATUS.emit('error', linuxcnc.OPERATOR_ERROR, f'M190 {msg0}:\n{":".join(self.mPath)}\n\n{msg1}\n\nM190 {msg3}:\n{mPath}\n\n{msg2}')
+            msg = f'M190 {msg0}:\n{":".join(self.mPath)}\n\n{msg1}\n\nM190 {msg3}:\n{mPath[:-5]}\n\n{msg2}'
+            STATUS.emit('error', linuxcnc.OPERATOR_ERROR, msg)
             quit()
         ucFile = os.path.join(self.PATHS.CONFIGPATH, 'qtplasmac_custom.py')
         if os.path.isfile(ucFile):
@@ -474,7 +475,7 @@ def initialized__(self):
             STATUS.emit('error', msgType, msgText)
             if restart:
                 STATUS.emit('error', linuxcnc.OPERATOR_TEXT, 'Due to configuration changes a restart is required')
-
+                quit()
         if not os.path.isfile(updateLog):
             with open(updateLog, 'w') as f:
                 f.write(f'{time.strftime("%y-%m-%d")} Initial    V{LCNCVER}-{VERSION}\n')
@@ -2587,7 +2588,7 @@ def update_check(self):
                         return
         # set user_m_path to include the nc_files directory (pre V2.10-001.017 2024/01/23)
         mPathIni = self.iniFile.find('RS274NGC', 'USER_M_PATH')
-        if 'nc_files' not in mPathIni:
+        if 'nc_files/plasmac/m_files' not in mPathIni:
             if '/usr' in self.PATHS.BASEDIR:
                 mPath = '/usr/share/doc/linuxcnc/examples/nc_files/plasmac/m_files'
                 # simPath = os.path.join(self.PATHS.BASEDIR, 'share/doc/linuxcnc/examples/sample-configs/sim/qtplasmac')

share/qtvcp/screens/qtplasmac/versions.html

@@ -26,6 +26,12 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>008.050 2024 Sept 6</u></b>
+<ul style="margin:0;">
+  <li>fix sim m_code pathing</li>
+  <li>allow update 001-017 to be correctly applied</li>
+</ul>
+
 <br><b><u>008.049 2024 Sept 2</u></b>
 <ul style="margin:0;">
   <li>process element names for custom stylesheets as well</li>