Updating for Python3 and Windows

README.md

@@ -1,3 +1,11 @@
+# Changes on this fork
+
+This framework is an awesome project from Axford, but it appears to have been abandoned, at least it's not been worked on since 2016 or so (it's now Jan 2019).  Original was written for Python 2, and assumed Unix (or Mac?) conventions.  I've updated it to work with Python 3 (only tested with 3.6.5) and made some changes to make it work on Windows.
+
+**Note**:  I have not tested this extensively.  I've only used it with Python 3.6.5 on Win10, and don't know if I broke anything for other platforms.  I'm also quite new to using it, so there may be use cases that don't currently work (sadly, the tutorial only has part 1)  If you find any bugs, please open an issue, I'll try to take a look.  
+
+Everythng below is from the original project.
+
 # OpenSCAD for Machine Design framework
 
 ## Overview

scripts/adda.py

@@ -77,7 +77,7 @@ def adda(t, n, d):
             o.write("include <"+incFile+">\n")
 
     else:
-        print(templateFile + " template is missing")
+        print((templateFile + " template is missing"))
 
     # Sandbox
     templateFile = os.path.join(config.paths['template'],"sandbox","sandbox.scad")
@@ -93,7 +93,7 @@ def adda(t, n, d):
             o.write(s)
 
     else:
-        print(templateFile + " template is missing")
+        print((templateFile + " template is missing"))
 
 
 if __name__ == '__main__':

scripts/animate.py

@@ -57,8 +57,8 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
 
     # locate required machine
     for m in jso:
-        if type(m) is DictType and m['type'] == 'machine' and m['title'] == mname:
-            print("Found machine: "+m['title'])
+        if type(m) is dict and m['type'] == 'machine' and m['title'] == mname:
+            print(("Found machine: "+m['title']))
 
             al = m['assemblies']
 
@@ -70,7 +70,7 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
             # locate required assembly
             for a in al:
                 if a['title'] == aname:
-                    print("Found assembly: "+a['title'])
+                    print(("Found assembly: "+a['title']))
                     fn = config.paths['root'] + a['file']
                     if (os.path.isfile(fn)):
 
@@ -94,7 +94,7 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
                         }
                         firstView = True
                         for step in a['steps']:
-                            print("Step: "+str(step['num']))
+                            print(("Step: "+str(step['num'])))
 
                             # generate a transition move?
                             if len(step['views']) > 0:
@@ -177,7 +177,7 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
                                 views.PolishTransparentBackground = False
                                 views.PolishCrop = False
                                 fn = view_dir + "/" +prefix + format(frameNum, '03') + "_" +view['title']+".png"
-                                print("Rendering: "+fn)
+                                print(("Rendering: "+fn))
                                 views.render_view_using_file(prefix + format(frameNum, '03'), config.paths['tempscad'], view_dir, view, hashchanged, h)
                                 frameNum = frameNum + 1
 
@@ -199,7 +199,7 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
                                             alpha = extra / (1.0*framesPerStep)
                                             if (alpha > 1.0):
                                                 alpha = 1.0
-                                            print("Blending: "+str(alpha) +", "+str(frameNum))
+                                            print(("Blending: "+str(alpha) +", "+str(frameNum)))
                                             imgNew = Image.blend(imgPrev,img,alpha)
 
                                         draw = ImageDraw.Draw(imgNew, "RGBA")
@@ -219,7 +219,7 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
 
                                         fn = view_dir + "/" +prefix + format(frameNum, '03') + "_" +view['title']+".png"
                                         frameNum = frameNum + 1
-                                        print("Saving: "+fn)
+                                        print(("Saving: "+fn))
                                         imgNew.save(fn)
 
                                 lfn = fn
@@ -262,12 +262,12 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
 
                         # build video
                         cmd = "ffmpeg -r "+str(framesPerStep)+" -y -i "+view_dir + "/" + prefix+"%03d_"+view['title']+".png -vcodec libx264 -pix_fmt yuv420p "+view_dir + "/" + prefix+".mp4"
-                        print("Encoding video with: "+cmd)
+                        print(("Encoding video with: "+cmd))
                         os.system(cmd)
 
                         # build animated gif
                         cmd = "convert "+view_dir + "/" + prefix+".mp4 "+view_dir + "/" + prefix+".gif"
-                        print("Creating GIF with: "+cmd)
+                        print(("Creating GIF with: "+cmd))
                         os.system(cmd)
 
                         # clean up temporary images
@@ -283,7 +283,7 @@ def animateAssembly(mname, aname, prefix, framesPerStep):
                             print("Exception running osascript")
 
                     else:
-                        print("    Error: scad file not found: "+a['file'])
+                        print(("    Error: scad file not found: "+a['file']))
 
     return 0
 

scripts/assemblies.py

@@ -34,8 +34,8 @@ def assemblies():
 
     # for each machine
     for m in jso:
-        if type(m) is DictType and m['type'] == 'machine':
-            print(m['title'])
+        if type(m) is dict and m['type'] == 'machine':
+            print((m['title']))
 
             al = m['assemblies']
 
@@ -46,7 +46,7 @@ def assemblies():
 
             # for each assembly
             for a in al:
-                print("  "+a['title'])
+                print(("  "+a['title']))
                 fn = config.paths['root'] + a['file']
                 if (os.path.isfile(fn)):
 
@@ -73,18 +73,18 @@ def assemblies():
                         f.close()
 
                         # Views
-                        print("      Step "+str(step['num']))
+                        print(("      Step "+str(step['num'])))
                         for view in step['views']:
                             render_view_using_file(a['title']+'_step'+str(step['num']), config.paths['tempscad'], view_dir, view, hashchanged, h)
 
                     # for each animation
                     for anim in a['animations']:
-                        print("    Animation: "+anim['title']+", framesPerStep="+str(anim['framesPerStep']))
+                        print(("    Animation: "+anim['title']+", framesPerStep="+str(anim['framesPerStep'])))
 
                         animateAssembly(m['title'], a['title'], anim['title'], anim['framesPerStep'])
 
                 else:
-                    print("    Error: scad file not found: "+a['file'])
+                    print(("    Error: scad file not found: "+a['file']))
 
 
     # Save changes to json

scripts/build.py

@@ -22,15 +22,15 @@ def build(argv):
     try:
         opts, args = getopt.getopt(argv,"hcq",[])
     except getopt.GetoptError:
-        print 'build.py -h -c -q'
-        print ''
+        print('build.py -h -c -q')
+        print( '')
         sys.exit(2)
     for opt, arg in opts:
         if opt == '-h':
-            print 'Usage: -h -c -q'
-            print ''
-            print '  -c   Skip catalogue'
-            print '  -q   Quick build - skip assemblies, guide and catalogue'
+            print('Usage: -h -c -q')
+            print('')
+            print('  -c   Skip catalogue')
+            print( '  -q   Quick build - skip assemblies, guide and catalogue')
             sys.exit()
         if opt in ("-c"):
             doCatalogue = False
@@ -82,7 +82,7 @@ def build(argv):
     print("Build Complete")
 
     if errorlevel > 0:
-        print("Error: " + str(errorlevel))
+        print(("Error: " + str(errorlevel)))
 
     return errorlevel
 

scripts/c14n_stl.py

@@ -6,7 +6,7 @@
 # This has no effect on the model but makes the STL consistent. I.e. it makes a canonical form.
 #
 
-from __future__ import print_function
+
 
 import sys
 import math

scripts/catalogue.py

@@ -36,7 +36,7 @@ def output_vitamin(v):
 
         # per view
         for view in t['children']:
-            if type(view) is DictType and view['type'] == 'view':
+            if type(view) is dict and view['type'] == 'view':
                 md += '!['+t['title']+']('+view['png_name']+')\n'
 
     md += '\n'
@@ -68,7 +68,7 @@ def compile_vitamin(v, dom):
         os.makedirs(config.paths['vitaminsimages'])
 
     # Compile
-    print("  "+v['title'])
+    print(("  "+v['title']))
     fn = '../' + v['file']
     if (os.path.isfile(fn)):
 
@@ -84,8 +84,8 @@ def compile_vitamin(v, dom):
         # Views
         print("    Views")
         for view in v['children']:
-            if type(view) is DictType and view['type'] == 'view':
-                print("      "+view['title'])
+            if type(view) is dict and view['type'] == 'view':
+                print(("      "+view['title']))
 
                 render_view(v['title'], v['call'], config.paths['vitaminsimages'], view, hashchanged, h, [fn], False, useVitaminSTL=False)
 
@@ -96,14 +96,14 @@ def compile_vitamin(v, dom):
 
 
     else:
-        print("    Error: scad file not found: "+v['file'])
+        print(("    Error: scad file not found: "+v['file']))
 
 
 def parse_vitamin(vitaminscad, use_catalogue_call=False):
 
     vitamincall = vitaminscad[:-5];
 
-    print("  Calling: "+ vitamincall + "();")
+    print(("  Calling: "+ vitamincall + "();"))
 
     # Generate a wrapper scad file for the vitamin file
     with open(config.paths['tempscad'], "w") as f:
@@ -157,7 +157,7 @@ def parse_vitamin(vitaminscad, use_catalogue_call=False):
                 js = json.dumps(jso, sort_keys=False, indent=4, separators=(',', ': '))
 
             except Exception as e:
-                print("  "+e)
+                print(("  "+e))
                 # Stop malformed machine json screwing up everything else!
                 js = ''
 
@@ -185,7 +185,7 @@ def catalogue():
 
     for filename in os.listdir(config.paths['vitamins']):
         if filename[-5:] == '.scad':
-            print("  Parsing: "+filename)
+            print(("  Parsing: "+filename))
 
             s = ''
 
@@ -225,12 +225,12 @@ def catalogue():
     try:
         jso = json.loads(js)
 
-        print("Parsed "+str(files)+" vitamin files")
+        print(("Parsed "+str(files)+" vitamin files"))
 
         dom = {'vitamins':[]}
 
         for v in jso:
-            if type(v) is DictType and v['type'] == 'vitamin':
+            if type(v) is dict and v['type'] == 'vitamin':
                 try:
                     compile_vitamin(v, dom)
                 except Exception as e:

scripts/cut.py

@@ -33,8 +33,8 @@ def cut():
 
     # for each machine
     for m in jso:
-        if type(m) is DictType and m['type'] == 'machine':
-            print(m['title'])
+        if type(m) is dict and m['type'] == 'machine':
+            print((m['title']))
 
             al = m['cut']
 
@@ -43,7 +43,7 @@ def cut():
                 os.makedirs(config.paths['cutpartsimages'])
 
             for a in al:
-                print("  "+a['title'])
+                print(("  "+a['title']))
                 fn = config.paths['root'] + a['file']
                 if (os.path.isfile(fn)):
 
@@ -81,13 +81,13 @@ def cut():
                         f.close()
 
                         # Views
-                        print("      Step "+str(step['num']))
+                        print(("      Step "+str(step['num'])))
                         for view in step['views']:
                             render_view_using_file(a['title']+'_step'+str(step['num']), config.paths['tempscad'], config.paths['cutpartsimages'], view, hashchanged, h)
 
 
                 else:
-                    print("    Error: scad file not found: "+a['file'])
+                    print(("    Error: scad file not found: "+a['file']))
 
 
     # Save changes to json

scripts/guides.py

@@ -215,7 +215,7 @@ def assembly_level(a):
 
 
 def gen_assembly_guide(m, guide_template):
-    print(m['title'])
+    print((m['title']))
 
     md = ''
 
@@ -224,7 +224,7 @@ def gen_assembly_guide(m, guide_template):
 
     # machine views
     for c in m['children']:
-        if type(c) is DictType and c['type'] == 'view' and 'filepath' in c:
+        if type(c) is dict and c['type'] == 'view' and 'filepath' in c:
             view = c
             md += '!['+view['caption']+']('+ view['filepath'][3:] +')\n\n'
 
@@ -273,7 +273,7 @@ def gen_assembly_guide(m, guide_template):
 
 
 def gen_printing_guide(m, guide_template):
-    print(m['title'])
+    print((m['title']))
 
     if len(m['printed']) == 0:
         return {};
@@ -347,29 +347,29 @@ def gen_printing_guide(m, guide_template):
 
 
 def load_sources():
-    print "Loading sourcing info..."
+    print("Loading sourcing info...")
 
     load_source(config.paths['sourcingcsv'])
 
     for filename in os.listdir(config.paths['vitamins']):
         if filename[-4:] == '.csv':
-            print("  Parsing: "+filename)
+            print(("  Parsing: "+filename))
             csvfn = os.path.join(src_dir, filename)
             load_source(csvfn)
 
 def load_source(csvfn):
     if os.path.isfile(csvfn):
-        with open(csvfn, 'rb') as csvfile:
+        with open(csvfn, 'r') as csvfile:
             rdr = csv.DictReader(csvfile)
             for row in rdr:
-                vn = row['Vitamin']
+                vn = row.get('Vitamin');
                 if vn not in sourcing:
                     sourcing[vn] = []
-                sourcing[vn].append({"Cost":row['Cost'], "Source":row['Source'], 'Notes':row['Notes']});
+                sourcing[vn].append({"Cost":row.get('Cost'), "Source":row.get('Source'), 'Notes':row.get('Notes')});
 
 
 def gen_sourcing_guide(m, guide_template):
-    print(m['title'])
+    print((m['title']))
 
     if len(m['vitamins']) == 0:
         return {};
@@ -469,7 +469,7 @@ def gen_index(jso, index_file, index_template):
     # build object
     indexObj = { 'machines': [], 'project':'' };
     for m in jso:
-        if type(m) is DictType and m['type'] == 'machine':
+        if type(m) is dict and m['type'] == 'machine':
 
             # tack in a view filename
             m['viewFilename'] = views.view_filename(m['title'] + '_view')
@@ -527,7 +527,7 @@ def guides():
 
     # for each machine
     for m in jso:
-        if type(m) is DictType and m['type'] == 'machine':
+        if type(m) is dict and m['type'] == 'machine':
 
             if 'guides' not in m:
                 m['guides'] = []

scripts/jsontools.py

@@ -11,7 +11,7 @@ def json_merge_missing_keys(j1, j2, overwrite=False, exclude=[]):
 def get_child_by_key_values(j1, kvs={}):
     if 'children' in j1:
         for c in j1['children']:
-            if type(c) is DictType:
+            if type(c) is dict:
                 match = True
                 for kv in kvs:
                     if not (kv in c and c[kv] == kvs[kv]):