chamfer option added, and module chamfer_sphere() to the scad file.

Added a header with version number and date and source file to the scad file.

Author: Jürgen Weigert

Makefile

@@ -6,9 +6,13 @@ NAME = $(notdir $(CURDIR))
 PYTHON_VERSION = 2.7.8
 VIRTUALENV_VERSION = 1.11.6
 
+
 .PHONY: all
 all: test
 
+include make-includes/python.mk
+include make-includes/variables.mk
+
 #
 # pep8 seems to disallow visually aligned code in a tabular way.
 # Therefore we ignored these pep8 errors:
@@ -21,7 +25,7 @@ all: test
 .PHONY: test
 test: virtualenv
 	. virtualenv/bin/activate && \
-		pip install --requirement python-test-requirements.txt && \
+		pip2 install --requirement python-test-requirements.txt && \
 		$(MAKE) METHOD=git PEP8_OPTIONS='--max-line-length=140 --ignore=E127,E221,E241,E272' python-pep8
 
 .PHONY: clean
@@ -57,6 +61,3 @@ install:
 	install -m 755 -t $(DEST) *.py
 	install -m 644 -t $(DEST) *.inx
 
-
-include make-includes/python.mk
-include make-includes/variables.mk

paths2openscad-de.inx

@@ -27,22 +27,29 @@
     <param type="boolean" name="stlpost" gui-text="STL Nachbearbeitung" xml:lang="de">false</param>
     <param type="description" name="stlpost_help" xml:lang="de">Starte beispielsweise einen 'slicer' nach der STL-Konvertierung. Siehe auch den Reiter Kommandos.</param>
 
-    <param name="stlmodule" type="boolean" _gui-text="Erzeuge ein Modul">false</param>
-    <_param name="stlmodule_help" type="description">Rendern Sie das Objekt nicht in der Scad-Datei, erstellen Sie eine für den Import geeignete Datei.</_param>
-    <param type="description" name="spacer"><!-- --></param>
+    <param name="stlmodule" type="boolean" _gui-text="Erzeuge nur ein Modul">false</param>
   </page>
 
   <page name="tuning" gui-text="Feinheiten" xml:lang="de">
     <param type="float" name="smoothness" min="0.0001" max="5" gui-text="Glättung" xml:lang="de">0.2</param>
     <param type="description" name="smoothness_help" xml:lang="de">Wird verwendet, wenn Kurven dargestellt werden. Kleinere Werte sind glatter. Bereich: 0.0001 bis 5</param>
+    <param type="description" name="spacer"><!-- --></param>
+    <param type="float" name="chamfer" min="0.0" gui-text="Radius (Verrundung) hinzufügen [mm]" xml:lang="de">0</param>
+    <param name="chamfer_fn" type="optiongroup" appearance="minimal"  _gui-text="Genauigkeit der Verrundung ($fn)">
+      <option value="4">4: Rough (fast)</option>
+      <option value="12">12: Medium (slow)</option>
+      <option value="16">16: Fine (slower)</option>
+      <option value="32">32: Perfect (slowest)</option>
+    </param>
     <param type="description" name="outline_header" appearance="header" xml:lang="de">Umrisslinien-Modus</param>
-    <param type="description" name="outline_help" xml:lang="de">Objekte werden nach einer von zwei Methoden in 3D extrudiert: Normal oder Umrisslinien-Modus. Normalerweise werden gefüllte Flächen von geschlossenen Objekten extrudiert, die Dicke der Randlinie wird dabei nicht hinzugerechnet. Offene Linienzüge oder Objekte ohne Füllung werden im Umrisslinien-Modus extrudiert. Die Anweisung 'Scale: XX %' wird im Umrisslinien-Modus nicht beachtet.</param>
+    <param type="description" name="outline_help" xml:lang="de">Objekte werden nach einer von zwei Methoden in 3D extrudiert: Normal oder Umrisslinien-Modus. Normalerweise werden gefüllte Flächen extrudiert, die Dicke der Randlinie wird dabei nicht hinzugerechnet. Objekte ohne Füllung werden im Umrisslinien-Modus extrudiert. Die Anweisung 'Scale: XX %' wird im Umrisslinien-Modus nicht beachtet.</param>
     <param type="float" name="min_line_width" min="0.1" max="10" gui-text="Minimale Linienbreite [mm]" xml:lang="de">1.0</param>
     <param type="float" name="line_width_scale_perc" min="1" max="10000" gui-text="Skaliere Linienbreite [%]" xml:lang="de">100.0</param>
     <param type="optiongroup" name="line_fn" appearance="minimal" gui-text="Genauigkeit der Linienbreite ($fn)" xml:lang="de">
-      <option value="4" xml:lang="de">Grob (schnell)</option>
-      <option value="8" xml:lang="de">Mittel (langsam)</option>
-      <option value="16" xml:lang="de">Fein (sehr langsam)</option>
+      <option value="4" xml:lang="de">4: Grob (schnell)</option>
+      <option value="8" xml:lang="de">8: Mittel (langsam)</option>
+      <option value="16" xml:lang="de">16: Fein (langsamer)</option>
+      <option value="32" xml:lang="de">32: Perfekt (sehr langsam)</option>
     </param>
     <param type="boolean" name="force_line" gui-text="Umrisslinien-Modus immer verwenden; Füllungen werden ignoriert" xml:lang="de">False</param>
     <param type="description" name="spacer"><!-- --></param>

paths2openscad.inx

@@ -27,26 +27,35 @@
     <param name="stlpost" type="boolean" _gui-text="STL postprocessing">false</param>
     <_param name="stlpost_help" type="description">Start e.g. a slicer after converting to STL. See the Commands tab for details.</_param>
 
-    <param name="stlmodule" type="boolean" _gui-text="Only create module">false</param>
-    <_param name="stlmodule_help" type="description">Do not render the object in the scad file, create file suitable for import.</_param>
+    <param name="stlmodule" type="boolean" _gui-text="Only create a module">false</param>
     <_param name="spacer" type="description"><!-- --></_param>
   </page>
 
   <page name="tuning" _gui-text="Tuning">
-    <param name="smoothness" type="float" min="0.0001" max="5" _gui-text="Smoothing">0.2</param>
+    <param name="smoothness" type="float" min="0.0001" max="5" precision="4" _gui-text="Smoothing">0.2</param>
     <_param name="smoothness_help" type="description">Used when rendering curves. Smaller values are smoother. Range: 0.0001 to 5
     </_param>
+    <param type="float" name="chamfer" min="0.0" gui-text="Add chamfer radius [mm]" xml:lang="de">0</param>
+    <param name="chamfer_fn" type="optiongroup" appearance="minimal"  _gui-text="Chamfer präzision ($fn)">
+      <option value="4">4: Rough (fast)</option>
+      <option value="12">12: Medium (slow)</option>
+      <option value="16">16: Fine (slower)</option>
+      <option value="32">32: Perfekt (slowest)</option>
+    </param>
     <_param name="outline_header" type="description" appearance="header">Outline Mode</_param>
-    <_param name="outline_help" type="description">Objects are extruded into 3D either in normal mode, or in outline mode. Normally the filled surface of a closed object is extruded without adding any line width. Lines that are not a closed loop and objects with no fill are rendered in outline mode.
+    <_param name="outline_help" type="description">Objects are extruded into 3D either in normal mode, or in outline mode. Normally filled areas are extruded, ignoring the line width. Objects with no fill are rendered in outline mode.
 
 Note: the 'Scale: XX %' instruction has no effect in outline mode.</_param>
     <param name="min_line_width" type="float" min="0.1" max="10" _gui-text="Minimum line width [mm]">1.0</param>
     <param type="float" name="line_width_scale_perc" min="1" max="10000" gui-text="Scale line width [%]">100.0</param>
+
     <param name="line_fn" type="optiongroup" appearance="minimal"  _gui-text="Line width precision ($fn)">
-      <option value="4">Rough (fast)</option>
-      <option value="8">Medium (slow)</option>
-      <option value="16">Fine (very slow)</option>
+      <option value="4">4: Rough (fast)</option>
+      <option value="8">8: Medium (slow)</option>
+      <option value="16">16: Fine (slower)</option>
+      <option value="32">32: Perfekt (slowest)</option>
     </param>
+
     <param name="force_line" type="boolean" _gui-text="Force outline mode, ignore fill">False</param>
     <_param name="spacer" type="description"><!-- --></_param>
   </page>

paths2openscad.py

@@ -83,6 +83,7 @@
 #   0.25 Allow Depth,Offset instead of Zsize,Zoffset
 #   Simplify the syntax description page.
 #   Added parameter line_width_scale.
+#   Added parameter chamfer, and module chamfer_sphere for doing minkowski
 #
 # CAUTION: keep the version number in sync with paths2openscad.inx about page
 
@@ -110,10 +111,12 @@
 import cspsubdiv
 import bezmisc
 import re
+import time
 import string
 import tempfile
 import gettext
 
+VERSION = '0.25';       # CAUTION: Keep in sync with all *.inx files
 DEFAULT_WIDTH = 100
 DEFAULT_HEIGHT = 100
 # Parse all these as 56.7 mm zsize:
@@ -391,6 +394,14 @@ def __init__(self):
             '--smoothness', dest='smoothness', type='float', default=float(0.2), action='store',
             help='Curve smoothing (less for more)')
 
+        self.OptionParser.add_option(
+            '--chamfer', dest='chamfer', type='float', default=float(1.), action='store',
+            help='Add a chamfer radius, displacing all object walls outwards [mm]')
+
+        self.OptionParser.add_option(
+            '--chamfer_fn', dest='chamfer_fn', type='int', default=int(4), action='store',
+            help='Chamfer precision ($fn when generating the minkowski sphere)')
+
         self.OptionParser.add_option(
             '--depth', '--zsize', dest='zsize', type='string', default='5', action='store',
             help='Depth (Z-size) [mm]')
@@ -552,6 +563,7 @@ def getDocProps(self):
             '''
             inkscape:version="0.91 r"
             inkscape:version="0.92.0 ..."
+            inkscape:version="0.92.4 (unknown)"
            See also https://github.com/fablabnbg/paths2openscad/issues/1
             '''
             # inkex.errormsg("inkscape:version="+inkscape_version)
@@ -565,6 +577,7 @@ def getDocProps(self):
         # get zsize and width after dpi. This is needed for e.g. mm units.
         self.docHeight = self.getLength('height', DEFAULT_HEIGHT)
         self.docWidth = self.getLength('width', DEFAULT_WIDTH)
+        self.inkscape_version = re.sub(" *\(unknown\) *", "", inkscape_version)
 
         if (self.docHeight is None) or (self.docWidth is None):
             return False
@@ -1228,6 +1241,10 @@ def effect(self):
             if '/' != os.sep:
                 scad_fname = scad_fname.replace('/', os.sep)
             self.f = open(scad_fname, 'w')
+
+            self.f.write('// Generated by inkscape %s + inkscape-paths2openscad %s\n' % (self.inkscape_version, VERSION))
+            self.f.write('// %s from "%s.svg"\n' % (time.ctime(), self.basename))
+
             # for use in options.fname basename is derived from the sodipodi_docname by
             # stripping the svg extension - or if there is no sodipodi_docname basename is 'inkscape'.
             # for use in scadviewcmd, scad2stlcmd and stlpostcmd basename is rederived from
@@ -1245,9 +1262,14 @@ def effect(self):
 // keep the resulting .stl file manifold.
 fudge = 0.1;
 ''')
+            if self.options.chamfer < 0.001: self.options.chamfer = None
+
             # writeout users parameters
             self.f.write('zsize = %s;\n' % (self.options.zsize))
             self.f.write('line_fn = %d;\n' % (self.options.line_fn))
+            if self.options.chamfer:
+                self.f.write('chamfer = %s;\n' % (self.options.chamfer))
+                self.f.write('chamfer_fn = %d;\n' % (self.options.chamfer_fn))
             self.f.write('min_line_width = %s;\n' % (self.options.min_line_width))
             self.f.write('line_width_scale = %s;\n' % (self.options.line_width_scale_perc * 0.01))
             self.f.write('function min_line_mm(w) = max(min_line_width, w * line_width_scale) * %g/25.4;\n\n' % self.dpi)
@@ -1256,21 +1278,47 @@ def effect(self):
                 self.f.write('\n')
                 self.convertPath(key)
 
+            if self.options.chamfer:
+                self.f.write('''
+module chamfer_sphere(rad=chamfer, res=chamfer_fn)
+{
+  if(res <= 4)
+  {
+    // octaeder: 3 sided faces = 8
+    polyhedron(
+      points = [ [.0, .0, rad], [.0, .0, -rad], [ rad, .0, .0], [-rad, .0, .0], [.0, rad, .0], [.0, -rad, .0] ],
+      faces = [ [4, 2, 0], [3, 4, 0], [5, 3, 0], [2, 5, 0], [5, 2, 1], [3, 5, 1], [4, 3, 1], [2 , 4, 1] ]);
+  }
+  else
+  {
+    sphere(r=rad, center=true, $fn=res);
+  }
+}
+''')
+
             # Come up with a name for the module based on the file name.
             name = os.path.splitext(os.path.basename(self.options.fname))[0]
             # Remove all punctuation except underscore.
             name = re.sub('[' + string.punctuation.replace('_', '') + ']', '', name)
 
             self.f.write('\nmodule %s(h)\n{\n' % name)
+            mi = ''
+            if self.options.chamfer:
+                mi = '  '
+                self.f.write('  minkowski()\n  {\n')
+
 
             # Now output the list of modules to call
-            self.f.write('  difference()\n  {\n    union()\n    {\n')
+            self.f.write('%s  difference()\n%s  {\n%s    union()\n%s    {\n' % (mi,mi,mi,mi))
             for call in self.call_list:
-                self.f.write('      ' + call)
-            self.f.write('    }\n    union()\n    {\n')
+                self.f.write('%s      %s' % (mi,call))
+            self.f.write('%s    }\n%s    union()\n%s    {\n' % (mi,mi,mi))
             for call in self.call_list_neg:
-                self.f.write('      ' + call)
-            self.f.write('    }\n  }\n')
+                self.f.write('%s      %s' % (mi,call))
+            self.f.write('%s    }\n%s  }\n' % (mi,mi))
+            if self.options.chamfer:
+                self.f.write('    chamfer_sphere();\n  }\n')
+
 
             # The module that calls all the other ones.
             if self.options.stlmodule == 'true':