kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

More code format fixes

Browse Source
This commit is contained in:
luz.paz
2019-10-13 23:56:00 -04:00
committed by Yorik van Havre
parent f1c811032c
commit 5e46b1c597
4 changed files with 59 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/Mod/OpenSCAD/OpenSCADCommands.py
View File

@@ -53,11 +53,10 @@ class ExplodeGroup:
return f1 == f2
else:
return abs((f1-f2)/f1) < 2**-24
scol=FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View")\
.GetUnsigned('DefaultShapeColor',0xccccccff)
defaultcolor = (((scol >> 24) & 0xff) / 255.0,\
((scol >> 16) & 0xff) / 255.0,\
((scol >> 8) & 0xff) / 255.0, 0.0)
scol=FreeCAD.ParamGet("User parameter:BaseApp/Preferences/View").GetUnsigned('DefaultShapeColor',0xccccccff)
defaultcolor = (((scol >> 24) & 0xff) / 255.0,
((scol >> 16) & 0xff) / 255.0,
((scol >> 8) & 0xff) / 255.0, 0.0)
return all(all(comparefloat(fcc,dcc) for fcc,dcc in \
zip(facecolor,defaultcolor)) for facecolor in shapecolor)
@@ -92,19 +91,16 @@ class ExplodeGroup:
else:
oo.ViewObject.DiffuseColor=color
else:
FreeCAD.Console.PrintError(translate('OpenSCAD',\
'Unable to explode %s') % obj.Name +u'\n')
FreeCAD.Console.PrintError(translate('OpenSCAD', 'Unable to explode %s') % obj.Name +u'\n')
for obj in FreeCADGui.Selection.getSelection():
if len(obj.InList) == 0: # allowed only for for top level objects
explode(obj)
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_Explode_Group', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExplodeGroup',\
'Explode Group'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExplodeGroup',\
'Remove fusion, apply placement to children, and color randomly')}
return {'Pixmap' : 'OpenSCAD_Explode_Group',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExplodeGroup', 'Explode Group'),
'ToolTip': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExplodeGroup', 'Remove fusion, apply placement to children, and color randomly')}
class ColorCodeShape:
"Change the Color of selected or all Shapes based on their validity"
@@ -118,11 +114,9 @@ class ColorCodeShape:
objs=FreeCAD.ActiveDocument.Objects
colorcodeshapes.colorcodeshapes(objs)
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_ColorCodeShape', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ColorCodeShape',\
'Color Shapes'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ColorCodeShape',\
'Color Shapes by validity and type')}
return {'Pixmap' : 'OpenSCAD_ColorCodeShape',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ColorCodeShape', 'Color Shapes'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ColorCodeShape', 'Color Shapes by validity and type')}
class Edgestofaces:
def IsActive(self):
@@ -140,10 +134,9 @@ class Edgestofaces:
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'Python', 'MenuText': QtCore.QT_TRANSLATE_NOOP(\
'OpenSCAD_Edgestofaces','Convert Edges To Faces'),
'ToolTip': QtCore.QT_TRANSLATE_NOOP('OpenSCAD',\
'Convert Edges to Faces')}
return {'Pixmap' : 'Python',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Edgestofaces', 'Convert Edges To Faces'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD', 'Convert Edges to Faces')}
class RefineShapeFeature:
def IsActive(self):
@@ -160,11 +153,9 @@ class RefineShapeFeature:
selobj.Object.ViewObject.hide()
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_RefineShapeFeature', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RefineShapeFeature',\
'Refine Shape Feature'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RefineShapeFeature',\
'Create Refine Shape Feature')}
return {'Pixmap' : 'OpenSCAD_RefineShapeFeature',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RefineShapeFeature', 'Refine Shape Feature'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RefineShapeFeature', 'Create Refine Shape Feature')}
class IncreaseToleranceFeature:
def IsActive(self):
@@ -181,12 +172,9 @@ class IncreaseToleranceFeature:
selobj.Object.ViewObject.hide()
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_IncreaseToleranceFeature', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_IncreaseToleranceFeature',\
'Increase Tolerance Feature'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_IncreaseToleranceFeature',\
'Create Feature that allows to increase the tolerance')}
return {'Pixmap' : 'OpenSCAD_IncreaseToleranceFeature',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_IncreaseToleranceFeature', 'Increase Tolerance Feature'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_IncreaseToleranceFeature', 'Create Feature that allows to increase the tolerance')}
class ExpandPlacements:
'''This should aid interactive repair in the future
@@ -201,10 +189,9 @@ class ExpandPlacements:
expandplacements.expandplacements(selobj.Object,FreeCAD.Placement())
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'Python', 'MenuText': QtCore.QT_TRANSLATE_NOOP(\
'OpenSCAD_ExpandPlacements','Expand Placements'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExpandPlacements',\
'Expand all placements downwards the FeatureTree')}
return {'Pixmap' : 'Python',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExpandPlacements', 'Expand Placements'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ExpandPlacements', 'Expand all placements downwards the FeatureTree')}
class ReplaceObject:
def IsActive(self):
@@ -221,15 +208,11 @@ class ReplaceObject:
tuple((len(obj.InList)) for obj in objs) in ((0,1),(1,0)):
replaceobj.replaceobjfromselection(objs)
else:
FreeCAD.Console.PrintError(translate('OpenSCAD',\
'Please select 3 objects first')+u'\n')
FreeCAD.Console.PrintError(translate('OpenSCAD', 'Please select 3 objects first')+u'\n')
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_ReplaceObject', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ReplaceObject',\
'Replace Object'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ReplaceObject',\
'Replace an object in the Feature Tree. Please select old, new, and parent object')}
return {'Pixmap' : 'OpenSCAD_ReplaceObject',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ReplaceObject', 'Replace Object'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_ReplaceObject', 'Replace an object in the Feature Tree. Please select old, new, and parent object')}
class RemoveSubtree:
def IsActive(self):
@@ -239,11 +222,9 @@ class RemoveSubtree:
OpenSCADUtils.removesubtree(FreeCADGui.Selection.getSelection())
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_RemoveSubtree', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RemoveSubtree',\
'Remove Objects and their Children'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RemoveSubtree',\
'Removes the selected objects and all children that are not referenced from other objects')}
return {'Pixmap' : 'OpenSCAD_RemoveSubtree',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RemoveSubtree', 'Remove Objects and their Children'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_RemoveSubtree', 'Removes the selected objects and all children that are not referenced from other objects')}
class AddSCADWidget(QtGui.QWidget):
def __init__(self,*args):
@@ -382,11 +363,10 @@ class AddOpenSCADElement:
panel = AddSCADTask()
FreeCADGui.Control.showDialog(panel)
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_AddOpenSCADElement', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement',\
'Add OpenSCAD Element...'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement',\
'Add an OpenSCAD element by entering OpenSCAD code and executing the OpenSCAD binary')}
return {'Pixmap' : 'OpenSCAD_AddOpenSCADElement',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement', 'Add OpenSCAD Element...'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_AddOpenSCADElement',
'Add an OpenSCAD element by entering OpenSCAD code and executing the OpenSCAD binary')}
class OpenSCADMeshBoolean:
def IsActive(self):
@@ -396,11 +376,10 @@ class OpenSCADMeshBoolean:
panel = OpenSCADMeshBooleanTask()
FreeCADGui.Control.showDialog(panel)
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_MeshBooleans', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean',\
'Mesh Boolean...'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean',\
'Export objects as meshes and use OpenSCAD to perform a boolean operation')}
return {'Pixmap' : 'OpenSCAD_MeshBooleans',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean','Mesh Boolean...'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_MeshBoolean',
'Export objects as meshes and use OpenSCAD to perform a boolean operation')}
class Hull:
def IsActive(self):
@@ -417,11 +396,9 @@ class Hull:
importCSG.process_ObjectsViaOpenSCAD(FreeCAD.activeDocument(),objList,"hull")
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_Hull', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull',\
'Hull'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull',\
'Perform Hull')}
return {'Pixmap' : 'OpenSCAD_Hull',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull', 'Hull'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull', 'Perform Hull')}
class Minkowski:
def IsActive(self):
@@ -438,11 +415,9 @@ class Minkowski:
importCSG.process_ObjectsViaOpenSCAD(FreeCAD.activeDocument(),objList,"minkowski")
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_Minkowski', 'MenuText': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski',\
'Minkowski'), 'ToolTip': \
QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski',\
'Perform Minkowski')}
return {'Pixmap' : 'OpenSCAD_Minkowski',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski', 'Minkowski'),
'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski', 'Perform Minkowski')}
FreeCADGui.addCommand('OpenSCAD_ColorCodeShape',ColorCodeShape())
FreeCADGui.addCommand('OpenSCAD_ExplodeGroup',ExplodeGroup())

10
src/Mod/OpenSCAD/OpenSCADUtils.py
View File

@@ -70,9 +70,9 @@ def searchforopenscadexe():
return testpath
elif sys.platform == 'darwin':
ascript = (b'tell application "Finder"\n'
b'POSIX path of (application file id "org.openscad.OpenSCAD"'
b'as alias)\n'
b'end tell')
b'POSIX path of (application file id "org.openscad.OpenSCAD"'
b'as alias)\n'
b'end tell')
p1=subprocess.Popen(['osascript','-'],stdin=subprocess.PIPE,\
stdout=subprocess.PIPE,stderr=subprocess.PIPE)
stdout,stderr = p1.communicate(ascript)
@@ -488,7 +488,7 @@ def meshoponobjs(opname,inobjs):
def process2D_ObjectsViaOpenSCADShape(ObjList,Operation,doc):
import FreeCAD,importDXF
import os,tempfile
# Mantis 3419
# https://www.freecadweb.org/tracker/view.php?id=3419
params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/OpenSCAD")
fn = params.GetInt('fnForImport',32)
fnStr = ",$fn=" + str(fn)
@@ -499,7 +499,7 @@ def process2D_ObjectsViaOpenSCADShape(ObjList,Operation,doc):
outputfilename=os.path.join(dir1,'%s.dxf' % next(tempfilenamegen))
importDXF.export([item],outputfilename,True,True)
filenames.append(outputfilename)
# Mantis 3419
# https://www.freecadweb.org/tracker/view.php?id=3419
dxfimports = ' '.join("import(file = \"%s\" %s);" % \
#filename \
(os.path.split(filename)[1], fnStr) for filename in filenames)

2
src/Mod/OpenSCAD/expandplacements.py
View File

@@ -99,7 +99,7 @@ def expandplacements(obj,placement):
elif obj.isDerivedFrom('Part::Mirroring'):
import OpenSCADUtils
mm = OpenSCADUtils.mirror2mat(obj.Normal,obj.Base)
#todo: set the base to 0,0,0
#TODO: set the base to 0,0,0
innerp=FreeCAD.Placement(mm * ownplacement.toMatrix() *mm)
expandplacements(obj.Source,innerp)
obj.Placement=FreeCAD.Placement()

23
src/Mod/OpenSCAD/prototype.py
View File

@@ -40,8 +40,7 @@ def openscadmesh(doc,scadstr,objname):
class Node:
#fnmin=12 # maximal fn for implicit polygon rendering
fnmin= FreeCAD.ParamGet(\
"User parameter:BaseApp/Preferences/Mod/OpenSCAD").\
GetInt('useMaxFN')
"User parameter:BaseApp/Preferences/Mod/OpenSCAD").GetInt('useMaxFN')
planedim=1e10 #size of the square used as x-y-plane
def __init__(self,name,arguments=None,children=None,):
pass
@@ -58,8 +57,8 @@ class Node:
return str1+')'
def __nonzero__(self):
'''a Node is not obsolete if doesn't have children. Only if as neither name children or
arguments'''
'''A Node is not obsolete if doesn't have children.
Only if as neither name children or arguments'''
return bool(self.name or self.arguments or self.children)
def __len__(self):
@@ -389,8 +388,7 @@ class Node:
try:
f=edgestofaces(edges)
except Part.OCCError:
FreeCAD.Console.PrintError(\
'processing of dxf import failed\nPlease rework \'%s\' manually\n' % layera)
FreeCAD.Console.PrintError('processing of dxf import failed\nPlease rework \'%s\' manually\n' % layera)
f=Part.Shape() #empty Shape
obj=doc.addObject("Part::FeaturePython",'import_dxf_%s_%s'%(objname,layera))
#obj=doc.addObject('Part::Feature',)
@@ -399,8 +397,7 @@ class Node:
obj.Shape=f
else:
FreeCAD.Console.ErrorMessage(\
'Filetype of %s not supported\n' % (filename))
FreeCAD.Console.ErrorMessage('Filetype of %s not supported\n' % (filename))
raise(NotImplementedError)
if obj: #handle origin and scale
if scale is not None and scale !=1:
@@ -530,10 +527,10 @@ class Node:
def flattengroups(self,name='group'):
"""removes group node with only one child and no arguments and empty groups"""
node=self
while (node.name==name and len(node.children)==1 and len(node.arguments)==0):
node=node.children[0]
node.children=[child for child in node.children if not (len(child.children)==0 and child.name==name)]
node = self
while (node.name == name and len(node.children) == 1 and len(node.arguments) == 0):
node = node.children[0]
node.children = [child for child in node.children if not (len(child.children) == 0 and child.name == name)]
if node.children:
node.children = [child.flattengroups() for child in node.children]
return node
@@ -688,5 +685,3 @@ def insert(filename,docname):
global dxfcache
dxfcache = {}