Sfoglia il codice sorgente

Merged in marius_stanciu/flatcam_beta/Beta (pull request #218)

Beta - small fix for command line --shellvar argument
Marius Stanciu 6 anni fa
parent
commit
9218f79493
2 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 1 1
      FlatCAMApp.py
  2. 1 0
      README.md

+ 1 - 1
FlatCAMApp.py

@@ -2522,7 +2522,7 @@ class App(QtCore.QObject):
                         except:
                         except:
                             command_tcl = i
                             command_tcl = i
 
 
-                    command_tcl_formatted = 'set shellvar_{nr} {cmd}'.format(cmd=str(command_tcl), nr=str(cnt))
+                    command_tcl_formatted = 'set shellvar_{nr} [list {cmd}]'.format(cmd=str(command_tcl), nr=str(cnt))
                     cnt += 1
                     cnt += 1
 
 
                     # if there are Windows paths then replace the path separator with a Unix like one
                     # if there are Windows paths then replace the path separator with a Unix like one

+ 1 - 0
README.md

@@ -19,6 +19,7 @@ CAD program, and create G-Code for Isolation routing.
 - updated some of the default values to more reasonable ones
 - updated some of the default values to more reasonable ones
 - FlatCAM can be run in HEADLESS mode now. This mode can be selected by using the --headless=1 command line argument or by changing the line headless=False to True in config/configuration.txt file. In this mod the Sys Tray Icon menu will hold only the Run Scrip menu entry and Exit entry.
 - FlatCAM can be run in HEADLESS mode now. This mode can be selected by using the --headless=1 command line argument or by changing the line headless=False to True in config/configuration.txt file. In this mod the Sys Tray Icon menu will hold only the Run Scrip menu entry and Exit entry.
 - added a new TclCommand named quit_flatcam which will ... quit FlatCAM from Tcl Shell or from a script
 - added a new TclCommand named quit_flatcam which will ... quit FlatCAM from Tcl Shell or from a script
+- fixed the command line argument --shellvar to work when there are spaces in the argument value
 
 
 18.09.2019
 18.09.2019