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

Arch: minor fixes around Arch & Draft

Browse Source
This commit is contained in:
Yorik van Havre
2014-03-07 20:44:22 -03:00
parent 05dc5a8355
commit 7d09ca7314
4 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mod/Arch/ArchCommands.py
View File

@@ -325,6 +325,8 @@ def closeHole(shape):
def getCutVolume(cutplane,shapes):
"""getCutVolume(cutplane,shapes): returns a cut face and a cut volume
from the given shapes and the given cutting plane"""
if not shapes:
return None,None,None
import Part
if not isinstance(shapes,list):
shapes = [shapes]
@@ -652,8 +654,8 @@ def getBrepFacesData(obj,scale=1):
of solids inside the object. Scale can indicate a scaling factor"""
if hasattr(obj,"Shape"):
if obj.Shape:
if obj.Shape.isValid():
if not obj.Shape.isNull():
if not obj.Shape.isNull():
if obj.Shape.isValid():
sols = []
for sol in obj.Shape.Solids:
s = []

11
src/Mod/Arch/ArchSectionPlane.py
View File

@@ -155,17 +155,19 @@ class _ViewProviderSectionPlane(ArchComponent.ViewProviderComponent):
self.lcoords = coin.SoCoordinate3()
ls = coin.SoType.fromName("SoBrepEdgeSet").createInstance()
ls.coordIndex.setValues(0,57,[0,1,-1,2,3,4,5,-1,6,7,8,9,-1,10,11,-1,12,13,14,15,-1,16,17,18,19,-1,20,21,-1,22,23,24,25,-1,26,27,28,29,-1,30,31,-1,32,33,34,35,-1,36,37,38,39,-1,40,41,42,43,44])
sep = coin.SoSeparator()
psep = coin.SoSeparator()
fsep = coin.SoSeparator()
fsep.addChild(self.mat2)
fsep.addChild(self.fcoords)
fsep.addChild(fs)
psep.addChild(fsep)
psep.addChild(self.mat1)
psep.addChild(self.drawstyle)
psep.addChild(self.lcoords)
psep.addChild(ls)
vobj.addDisplayMode(psep,"Default")
sep.addChild(fsep)
sep.addChild(psep)
vobj.addDisplayMode(sep,"Default")
self.onChanged(vobj,"DisplaySize")
self.onChanged(vobj,"LineColor")
self.onChanged(vobj,"Transparency")
@@ -318,7 +320,10 @@ class _ArchDrawingView:
self.direction = p.Rotation.multVec(FreeCAD.Vector(0,0,1))
for o in objs:
if o.isDerivedFrom("Part::Feature"):
if o.Shape.isValid():
if o.Shape.isNull():
pass
#FreeCAD.Console.PrintWarning(translate("Arch","Skipping empty object: ")+o.Name)
elif o.Shape.isValid():
shapes.extend(o.Shape.Solids)
else:
FreeCAD.Console.PrintWarning(translate("Arch","Skipping invalid object: ")+o.Name)