suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keep up with upstream version 0.5d of importCSG

Browse Source
This commit is contained in:
Sebastian Hoogen 2012-10-21 16:17:07 +02:00 committed by wmayer
parent 1d0a79a5f2
commit 60cd7ee95b
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/OpenSCAD/importCSG.py
View File

@ -153,7 +153,11 @@ def p_render_action(p):
def p_group_action1(p): def p_group_action1(p):
'group_action1 : group LPAREN RPAREN OBRACE block_list EBRACE' 'group_action1 : group LPAREN RPAREN OBRACE block_list EBRACE'
print "Group" print "Group"
p[0] = p[5] # Test if need for implicit fuse
if (len(p[5]) > 1) :
p[0] = [fuse(p[5],"Group")]
else :
p[0] = p[5]
def p_group_action2(p) : def p_group_action2(p) :
'group_action2 : group LPAREN RPAREN SEMICOL' 'group_action2 : group LPAREN RPAREN SEMICOL'
@ -765,7 +769,7 @@ def p_cylinder_action(p):
fnmax = FreeCAD.ParamGet(\ fnmax = FreeCAD.ParamGet(\
"User parameter:BaseApp/Preferences/Mod/OpenSCAD").\ "User parameter:BaseApp/Preferences/Mod/OpenSCAD").\
GetInt('useMaxFN') GetInt('useMaxFN')
if n < 3 or fnmax != 0 and n > fnmax: if n < 3 or fnmax != 0 and n >= fnmax:
mycyl=doc.addObject("Part::Cylinder",p[1]) mycyl=doc.addObject("Part::Cylinder",p[1])
mycyl.Height = h mycyl.Height = h
mycyl.Radius = r1 mycyl.Radius = r1
@ -836,9 +840,11 @@ def p_circle_action(p) :
n = int(p[3]['$fn']) n = int(p[3]['$fn'])
fnmax = FreeCAD.ParamGet(\ fnmax = FreeCAD.ParamGet(\
"User parameter:BaseApp/Preferences/Mod/OpenSCAD").\ "User parameter:BaseApp/Preferences/Mod/OpenSCAD").\
GetInt('useMaxFN') GetInt('useMaxFN',50)
# Alter Max polygon to control if polygons are circles or polygons
# in the modules preferences
import Draft import Draft
if n == 0 or fnmax != 0 and n > fnmax: if n == 0 or fnmax != 0 and n >= fnmax:
mycircle = Draft.makeCircle(r) mycircle = Draft.makeCircle(r)
#mycircle = doc.addObject('Part::Circle',p[1]) #mycircle = doc.addObject('Part::Circle',p[1])
#mycircle.Radius = r #mycircle.Radius = r

3
src/Mod/OpenSCAD/importVersions.txt
View File

@ -49,6 +49,9 @@ Version History
0.05c - Fix for polygon with path - Changes to Polygon and polyhdron - parse projection 0.05c - Fix for polygon with path - Changes to Polygon and polyhdron - parse projection
0.05d - Fix for implicit fuse for groups
global max_polygon parameter to control cylinder or prism
There appear to be problems with some files and these maybe as a result of bugs in FreeCAD that corrupt There appear to be problems with some files and these maybe as a result of bugs in FreeCAD that corrupt
the model. If you find problem files please email them to keith@sloan-home.co.uk the model. If you find problem files please email them to keith@sloan-home.co.uk