foo

Author: arpruss

gcodeplot.inx

@@ -6,7 +6,7 @@
   <dependency type="executable" location="extensions">gcodeplot.py</dependency>
   <param name="tab" type="notebook">
     <page name="general" _gui-text="General Settings ">
-      <param name="tool-mode" type="enum" _gui-text="Tool mode:" _gui-description="In draw mode, tool offset and overcut settings are ignored. In cut mode, shading is always disabled. In custom mode, all the other settings are used.">
+      <param name="tool-mode" type="enum" _gui-text="Tool mode:" _gui-description="In draw mode, tool offset, overcut and inside-out sorting settings are ignored. In cut mode, shading is always disabled, optimization is disabled and inside-out sorting is always enabled. In custom mode, one can mix and match these.">
         <item value="draw">drawing</item>
         <item value="cut">cutting</item>
         <item value="custom">custom</item>
@@ -22,18 +22,40 @@
       <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>
+    </page>
+    <page name="fitting" _gui-text="Fitting and Extracting">
       <param name="scale" type="enum" _gui-text="Scaling mode:" _gui-description="Method for scaling to print area (Default: none; should be 'none' if tool-offset option is set in cutter tab)">
         <item value="none">none (needed if tool offset&gt;0)</item>
         <item value="fit">fit</item>
         <item value="down-only">down-only</item>
       </param>
+      <param name="align-x" type="enum" _gui-text="Horizontal alignment:" _gui-description="Horizontal alignment of drawing in plotter area">
+        <item value="none">none</item>
+        <item value="left">left</item>
+        <item value="center">center</item>
+        <item value="right">right</item>
+      </param>
+      <param name="align-y" type="enum" _gui-text="Vertical alignment:" _gui-description="Vertical alignment of drawing in plotter area">
+        <item value="none">none</item>
+        <item value="bottom">left</item>
+        <item value="center">center</item>
+        <item value="top">right</item>
+      </param>
+      <param name="boolean-extract-color" type="boolean" _gui-text="Extract one color from drawing" _gui-description="If enabled, only paths in the selected color are drawn.">0</param>
+      <param name="extract-color" type="color" _gui-text="Color to extract from drawing" _gui-description="If extract option is active, this selects the color to extract.">#000000</param>
     </page>
-    <page name="shading" _gui-text="Shading Settings">
+    <page name="drawing" _gui-text="Drawing Settings">
       <param name="shading-threshold" type="float" min="0" max="1" precision="2" _gui-text="Shading threshold:" _gui-description="Shade whenever the shade is below this value, where 0=black and 1=white. To turn off shading, set to 0. (Default: 1, shade everything other than white).">1</param>
       <param name="shading-lightest" type="float" min="0" max="1000" precision="1" _gui-text="Lightest shading spacing (mm):" _gui-description="Distance between shading lines for the lightest shaded areas.">3</param>
       <param name="shading-darkest" type="float" min="0" max="1000" precision="1" _gui-text="Darkest shading spacing (mm):" _gui-description="Distance between shading lines for the darkest shaded areas.">0.5</param>
       <param name="shading-angle" type="float" min="0" max="180" precision="1" _gui-text="Shading angle (degrees)" _gui-description="Angle of shading lines">45</param>
       <param name="boolean-shading-crosshatch" type="boolean" _gui-text="Crosshatching" _gui-description="Crosshatching when shading">0</param>
+      <param name="optimization-time" type="int" min="0" max="600" precision="1" _gui-text="Optimization time (sec.):" _gui-description="Maximum amount of time to spend optimizing pen movement (typical is half of it).">60</param>
+    </page>
+    <page name="cutting" _gui-text="Cutting Settings">
+      <param name="tool-offset" type="float" min="0" max="1000" precision="2" _gui-text="Tool offset (mm):" _gui-description="Horizontal distance from tool rotation axis to cutting tip (default: 1)">1</param>
+      <param name="overcut" type="float" min="0" max="1000" precision="2" _gui-text="Overcut (mm):" _gui-description="Extra cut distance for closed curves (default: 1)">1</param>
+      <param name="boolean-sort" type="boolean" _gui-text="Inside-out sorting" _gui-description="Cut inside curves first">1</param>
     </page>
   </param>
   <output>

gcodeplot.py

@@ -614,7 +614,7 @@ def help():
  -X|--shading-crosshatch*: cross hatch shading
  -L|--stroke-all*: stroke even regions specified by SVG to have no stroke
  -O|--shading-avoid-outline*: avoid going over outline twice when shading
- -o|--optimization-timeout=t: timeout on optimization attempt (seconds; will be retried once; set to 0 to turn off optimization) [default 30]
+ -o|--optimization-time=t: max time to spend optimizing (seconds; set to 0 to turn off optimization) [default 60]
  -d|--sort*: sort paths from inside to outside for cutting [default off]
  -c|--config-file=filename: read arguments, one per line, from filename
  -w|--gcode-pause=cmd: gcode pause command [default: @pause]
@@ -641,7 +641,7 @@ def help():
     strokeAll = False
     extractColor = None
     gcodePause = "@pause"
-    optimizationTimeOut = 30
+    optimizationTime = 30
     dpi = (1016., 1016.)
     pens = {1:Pen('1 (0.,0.) black default')}
     doDump = False
@@ -652,16 +652,18 @@ def help():
     toolOffset = 0.
     overcut = 0.
     toolMode = "custom"
+    booleanExtractColor = 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:", 
                         ["help", "down", "up", "lower-left", "allow-repeats", "no-allow-repeats", "scale=", "config-file=",
-                        "area=", 'align-x=', 'align-y=', 'optimization-timeout=', "pens=",
+                        "area=", 'align-x=', 'align-y=', 'optimization-time=', "pens=",
                         'input-dpi=', 'tolerance=', 'send=', 'send-speed=', 'pen-down-z=', 'pen-up-z=', 'parking-z=',
                         'pen-down-speed=', 'pen-up-speed=', 'z-speed=', 'hpgl-out', 'no-hpgl-out', 'shading-threshold=',
                         '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=' ], )
+                        '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-extract-color=', 'boolean-sort=' ], )
 
         if len(args) + len(opts) == 0:
             raise getopt.GetoptError("invalid commandline")
@@ -771,6 +773,10 @@ def help():
                 shader.angle = float(arg)
             elif opt == '--boolean-shading-crosshatch':
                 shader.crossHatch = int(arg) != 0
+            elif opt == '--boolean-extract-color':
+                booleanExtractColor = int(arg) != 0
+            elif opt == '--boolean-sort':
+                sort = int(arg) != 0
             elif opt in ('-X', '--shading-crosshatch'):
                 shader.crossHatch = True
             elif opt == '--no-shading-crosshatch':
@@ -792,9 +798,9 @@ def help():
             elif opt in ('-c', '--config-file'):
                 configOpts = getConfigOpts(arg)
                 opts = opts[:i+1] + configOpts + opts[i+1:]
-            elif opt in ('-o', '--optimization-timeout'):
-                optimizationTimeOut = float(arg)
-                if optimizationTimeOut > 0:
+            elif opt in ('-o', '--optimization-time'):
+                optimizationTime = float(arg)
+                if optimizationTime > 0:
                     sort = False
             elif opt in ('-h', '--help'):
                 help()
@@ -809,7 +815,7 @@ def help():
                     extractColor = parser.rgbFromColor(arg)
             elif opt in ('d', '--sort'):
                 sortPaths = True
-                optimizationTimeOut = 0
+                optimizationTime = 0
             elif opt == '--no-sort':
                 sortPaths = False
             elif opt in ('U', '--simulation'):
@@ -881,7 +887,7 @@ def help():
         print('shading-angle=%g' % (shader.angle))
         print('shading-crosshatch' if shader.crossHatch else 'no-shading-crosshatch')
         print('stroke-all' if strokeAll else 'no-stroke-all')
-        print('optimization-timeout=%g' % (optimizationTimeOut))
+        print('optimization-time=%g' % (optimizationTime))
         print('sort' if sortPaths else 'no-sort')
         print('pause-at-start' if pauseAtStart else 'no-pause-at-start')
         print('extract-color=all' if extractColor is None else 'extract-color=rgb(%.3f,%.3f,%.3f)' % tuple(extractColor))
@@ -893,8 +899,11 @@ def help():
 
     if toolMode == 'cut':
         shader.unshadedThreshold = 0
+        optimizationTime = 0
+        sortPaths = True
     elif toolMode == 'draw':
         toolOffset = 0.
+        sortPaths = False
 
     variables = {'lift':plotter.liftDeltaZ, 'work':plotter.workZ, 'safe':plotter.safeDeltaZ, 'left':plotter.xyMin[0],
         'bottom':plotter.xyMin[1]}
@@ -944,9 +953,9 @@ def help():
         for pen in penData:
             penData[pen] = op.processPath(penData[pen])
 
-    if optimizationTimeOut > 0.:
+    if optimizationTime > 0.:
         for pen in penData:
-            penData[pen] = anneal.optimize(penData[pen], timeout=optimizationTimeOut)
+            penData[pen] = anneal.optimize(penData[pen], timeout=optimizationTime/2.)
         penData = removePenBob(penData)
 
     if sortPaths: