From 2c300a23b94c0036a5d59c2bba57d3f38c274633 Mon Sep 17 00:00:00 2001 From: Jason Yosinski Date: Wed, 1 Feb 2012 21:37:51 -0500 Subject: [PATCH 1/3] Changed `scale' variable name to `v'. Change made per http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/The_OpenSCAD_Language#scale , previously was not working with OpenSCAD-2011.12 on Mac (perhaps others). --- pyopenscad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyopenscad.py b/pyopenscad.py index ce2dec8b..dee3865a 100644 --- a/pyopenscad.py +++ b/pyopenscad.py @@ -31,7 +31,7 @@ # Transforms {'name': 'translate', 'args': [], 'kwargs': ['v']} , - {'name': 'scale', 'args': [], 'kwargs': ['s']} , + {'name': 'scale', 'args': [], 'kwargs': ['v']} , {'name': 'rotate', 'args': [], 'kwargs': ['a', 'v']} , {'name': 'mirror', 'args': ['normal'], 'kwargs': []}, {'name': 'multmatrix', 'args': ['n'], 'kwargs': []}, From a3194582b414f9079f0be5f01e950731939e18ed Mon Sep 17 00:00:00 2001 From: Jason Yosinski Date: Wed, 1 Feb 2012 21:39:37 -0500 Subject: [PATCH 2/3] Ignore .pyc files --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 03d81361..cd798175 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.scad \ No newline at end of file +*.scad +*.pyc From 14e810164c26faff7f4c92f786d888a7b4e7ccf5 Mon Sep 17 00:00:00 2001 From: Jason Yosinski Date: Wed, 1 Feb 2012 21:40:49 -0500 Subject: [PATCH 3/3] Changed coding from UTF-8 to utf-8 to play nice with emacs. --- examples/basic_scad_include.py | 2 +- examples/bom_scad.py | 2 +- examples/koch.py | 2 +- examples/sierpinski.py | 2 +- finger_joint.py | 2 +- pyopenscad.py | 2 +- screw_thread.py | 2 +- sp_utils.py | 2 +- t_slots.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/basic_scad_include.py b/examples/basic_scad_include.py index fdeed3ef..b689c6fd 100644 --- a/examples/basic_scad_include.py +++ b/examples/basic_scad_include.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- import sys, os # Make sure we have access to pyopenscad diff --git a/examples/bom_scad.py b/examples/bom_scad.py index f9cab08a..1e4d9849 100644 --- a/examples/bom_scad.py +++ b/examples/bom_scad.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- # Basic shape with several repeated parts, demonstrating the use of # sp_utils.bill_of_materials() diff --git a/examples/koch.py b/examples/koch.py index ece06d39..9e9a89ee 100644 --- a/examples/koch.py +++ b/examples/koch.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- import os, sys, re sys.path.append(os.path.join( os.getenv('HOME'), 'Desktop', 'SolidPython')) diff --git a/examples/sierpinski.py b/examples/sierpinski.py index 34c30d04..423f0b1b 100644 --- a/examples/sierpinski.py +++ b/examples/sierpinski.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- import os, sys # Make sure we have access to pyopenscad diff --git a/finger_joint.py b/finger_joint.py index 801af651..f2aae586 100644 --- a/finger_joint.py +++ b/finger_joint.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- from __future__ import division import os, sys, re diff --git a/pyopenscad.py b/pyopenscad.py index dee3865a..89679aa5 100644 --- a/pyopenscad.py +++ b/pyopenscad.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- # Simple Python OpenSCAD Code Generator # Copyright (C) 2009 Philipp Tiefenbacher diff --git a/screw_thread.py b/screw_thread.py index c7adc17c..920ed199 100644 --- a/screw_thread.py +++ b/screw_thread.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- import os, sys, re # Make sure we have access to pyopenscad diff --git a/sp_utils.py b/sp_utils.py index e7245f62..d802bb53 100644 --- a/sp_utils.py +++ b/sp_utils.py @@ -1,5 +1,5 @@ #! /usr/bin/python2.5 -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- import os, sys, re from pyopenscad import * diff --git a/t_slots.py b/t_slots.py index d0b8d253..b1adc385 100644 --- a/t_slots.py +++ b/t_slots.py @@ -1,5 +1,5 @@ #! /usr/bin/python -# -*- coding: UTF-8 -*- +# -*- coding: utf-8 -*- import os, sys, re # Assumes SolidPython is in site-packages or elsewhwere in sys.path