begin directional drawing support

Author: arpruss

gcodeplot.py

@@ -670,17 +670,18 @@ def help(error=False):
     booleanExtractColor = False
     quiet = False
     sendAndSave = False
+    directionAngle = None
 
     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:", 
+        opts, args = getopt.getopt(sys.argv[1:], "e: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-time=', "pens=",
                         'input-dpi=', 'tolerance=', 'send=', 'send-speed=', 'work-z=', 'lift-delta-z=', 'safe-delta-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=', 'boolean-sort=', 'tool-mode=', 'send-and-save=' ], )
+                        'boolean-shading-crosshatch=', 'boolean-sort=', 'tool-mode=', 'send-and-save=', 'direction=' ], )
 
         if len(args) + len(opts) == 0:
             raise getopt.GetoptError("invalid commandline")
@@ -826,13 +827,13 @@ def help(error=False):
                 sys.exit(0)
             elif opt == '--dump-options':
                 doDump = True
-            elif opt in ('R', '--extract-color'):
+            elif opt in ('-R', '--extract-color'):
                 arg = arg.lower()
                 if arg == 'all' or len(arg.strip())==0:
                     extractColor = None
                 else:
                     extractColor = parser.rgbFromColor(arg)
-            elif opt in ('d', '--sort'):
+            elif opt in ('-d', '--sort'):
                 sortPaths = True
                 optimizationTime = 0
             elif opt == '--no-sort':
@@ -845,6 +846,11 @@ def help(error=False):
                 quiet = True # Inkscape
             elif opt == "--tool-mode":
                 toolMode = arg
+            elif opt in ('e', '--direction'):
+                if len(arg.strip()) == 0 or arg == 'none':
+                    directionAngle = None
+                else:
+                    directionAngle = float(arg)
             else:
                 raise ValueError("Unrecognized argument "+opt)
             i += 1
@@ -956,7 +962,8 @@ def help(error=False):
     if svgTree is None and 'PD' not in data and 'PU' not in data:
         sys.stderr.write("Unrecognized file.\n")
         exit(1)
-        
+
+    shader.setDrawingDirectionAngle(directionAngle)
     if svgTree is not None:
         penData = parseSVG(svgTree, tolerance=tolerance, shader=shader, strokeAll=strokeAll, pens=pens, extractColor=extractColor)
     else:

svgpath/shader.py

@@ -10,11 +10,23 @@ def __init__(self, unshadedThreshold=1., lightestSpacing=3., darkestSpacing=0.5,
         self.lightestSpacing = lightestSpacing
         self.darkestSpacing = darkestSpacing
         self.angle = angle
+        self.secondaryAngle = angle + 90
         self.crossHatch = False
 
     def isActive(self):
         return self.unshadedThreshold > 0.000001
 
+    def setDrawingDirectionAngle(self, drawingDirectionAngle):
+        self.drawingDirectionAngle = drawingDirectionAngle
+        
+        if drawingDirectionAngle is None:
+            return
+            
+        if 90 < (self.angle - drawingDirectionAngle) % 360 < 270:
+            self.angle = (self.angle + 180) % 360
+        if 90 < (self.secondaryAngle - drawingDirectionAngle) % 360 < 270:
+            self.secondaryAngle = (self.secondaryAngle + 180) % 360
+        
     def shade(self, polygon, grayscale, avoidOutline=True, mode=None):
         if mode is None:
             mode = Shader.MODE_EVEN_ODD
@@ -24,11 +36,11 @@ def shade(self, polygon, grayscale, avoidOutline=True, mode=None):
         spacing = self.lightestSpacing * (1-intensity) + self.darkestSpacing * intensity
         lines = Shader.shadePolygon(polygon, self.angle, spacing, avoidOutline=avoidOutline, mode=mode)
         if self.crossHatch:
-            lines += Shader.shadePolygon(polygon, self.angle+90, spacing, avoidOutline=avoidOutline, mode=mode)
+            lines += Shader.shadePolygon(polygon, self.angle+90, spacing, avoidOutline=avoidOutline, mode=mode, alternate=(self.drawingDirectionAngle==None))
         return lines
 
     @staticmethod
-    def shadePolygon(polygon, angleDegrees, spacing, avoidOutline=True, mode=None):
+    def shadePolygon(polygon, angleDegrees, spacing, avoidOutline=True, mode=None, alternate=True):
         if mode is None:
             mode = Shader.MODE_EVEN_ODD
 
@@ -102,7 +114,7 @@ def shadePolygon(polygon, angleDegrees, spacing, avoidOutline=True, mode=None):
             else:
                 raise ValueError()
 
-            if odd:
+            if odd and alternate:
                 thisLine = list(reversed([(l[1],l[0]) for l in thisLine]))
 
             if not avoidOutline and len(thisLine) and len(all) and all[-1][1][2] == thisLine[0][0][2]: