fix sending

Author: arpruss

gcodeplot.inx

@@ -22,7 +22,7 @@
       <param name="pen-up-speed" type="float" min="-1000000" max="1000000" precision="1" _gui-text="Movement speed (mm/s):" _gui-description="Speed  moving with pen up (Default: 40)">40</param>
       <param name="pen-down-speed" type="float" min="-1000000" max="1000000" precision="1" _gui-text="Draw speed (mm/s):" _gui-description="Speed moving with pen down (Default: 35)">35</param>
       <param name="z-speed" type="float" min="-1000000" max="1000000" precision="1" _gui-text="Z-speed (mm/s):" _gui-description="Speed moving pen up/down (Default: 5)">5</param>
-      <param name="send" type="string" _gui-text="Serial port to send gcode to (blank not to send)" _gui-description="If you enter the name of your serial port here (e.g., COM4), then you can directly send the file to your device."></param>
+      <param name="send-and-save" type="string" _gui-text="Serial port to send gcode to (blank not to send)" _gui-description="If you enter the name of your serial port here (e.g., COM4), then you can directly send the file to your device."></param>
       <param name="send-speed" type="enum" _gui-text="Serial baud rate:" _gui-description="Baud rate of your serial device (Default: 115200)">
         <item value="115200">115200</item>
         <item value="300">300</item>

gcodeplot.py

@@ -664,6 +664,7 @@ def help(error=False):
     toolMode = "custom"
     booleanExtractColor = False
     quiet = False
+    sendAndSave = False
 
     try:
         opts, args = getopt.getopt(sys.argv[1:], "UR:Uhdulw:P:o:Oc:LT:M:m:A:XHrf:na:D:t:s:S:x:y:z:Z:p:f:F:", 
@@ -674,7 +675,7 @@ def help(error=False):
                         'shading-angle=', 'shading-crosshatch', 'no-shading-crosshatch', 'shading-avoid-outline', 
                         'pause-at-start', 'no-pause-at-start', 'min-x=', 'max-x=', 'min-y=', 'max-y=',
                         'no-shading-avoid-outline', 'shading-darkest=', 'shading-lightest=', 'stroke-all', 'no-stroke-all', 'gcode-pause', 'dump-options', 'tab=', 'extract-color=', 'sort', 'no-sort', 'simulation', 'no-simulation', 'tool-offset=', 'overcut=', 
-                        'boolean-shading-crosshatch=', 'boolean-sort=', 'tool-mode=' ], )
+                        'boolean-shading-crosshatch=', 'boolean-sort=', 'tool-mode=', 'send-and-save=' ], )
 
         if len(args) + len(opts) == 0:
             raise getopt.GetoptError("invalid commandline")
@@ -732,6 +733,10 @@ def help(error=False):
                 tolerance = float(arg)
             elif opt in ('-s', '--send'):
                 sendPort = None if len(arg.strip()) == 0 else arg
+            elif opt == '--send-and-save':
+                sendPort = None if len(arg.strip()) == 0 else arg
+                if sendPort is not None:
+                    sendAndSave = True
             elif opt == '--no-send':
                 sendPort = None
             elif opt in ('-S', '--send-speed'):
@@ -985,17 +990,24 @@ def help(error=False):
                 plotter=plotter, gcodePause=gcodePause, pens=pens, pauseAtStart=pauseAtStart, simulation=svgSimulation)
 
     if g:
+        dump = True
+        
         if sendPort is not None and not svgSimulation:
             import gcodeplotutils.sendgcode as sendgcode
+            
+            dump = sendAndSave
+                    
             if hpglOut:
                 sendgcode.sendHPGL(port=sendPort, speed=sendSpeed, commands=g)
             else:
                 sendgcode.sendGcode(port=sendPort, speed=sendSpeed, commands=g, gcodePause=gcodePause, plotter=plotter, variables=variables, formulas=formulas)
-        else:    
+        
+        if dump:
             if hpglOut:
                 sys.stdout.write(g)
             else:
                 print('\n'.join(g))
+    
     else:
         sys.stderr.write("No points.")
         sys.exit(1)