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

0000979: Move windows with their host wall

Browse Source
This commit is contained in:
Yorik van Havre 2013-04-19 18:46:24 -03:00
parent 3511a807a3
commit 051dee07f2
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Arch/ArchComponent.py
View File

@ -25,7 +25,7 @@ __title__="FreeCAD Arch Component"
__author__ = "Yorik van Havre" __author__ = "Yorik van Havre"
__url__ = "http://free-cad.sourceforge.net" __url__ = "http://free-cad.sourceforge.net"
import FreeCAD,FreeCADGui import FreeCAD,FreeCADGui,Draft
from PyQt4 import QtGui,QtCore from PyQt4 import QtGui,QtCore
from DraftTools import translate from DraftTools import translate
@ -101,7 +101,8 @@ def removeFromComponent(compobject,subobject):
l = compobject.Subtractions l = compobject.Subtractions
l.append(subobject) l.append(subobject)
compobject.Subtractions = l compobject.Subtractions = l
subobject.ViewObject.hide() if Draft.getType(subobject) != "Window":
subobject.ViewObject.hide()
class ComponentTaskPanel: class ComponentTaskPanel:
@ -306,7 +307,8 @@ class Component:
if prop in ["Additions","Subtractions"]: if prop in ["Additions","Subtractions"]:
if hasattr(obj,prop): if hasattr(obj,prop):
for o in getattr(obj,prop): for o in getattr(obj,prop):
o.ViewObject.hide() if Draft.getType(o) != "Window":
o.ViewObject.hide()
def processSubShapes(self,obj,base): def processSubShapes(self,obj,base):
"Adds additions and subtractions to a base shape" "Adds additions and subtractions to a base shape"

13
src/Mod/Arch/ArchWall.py
View File

@ -335,6 +335,19 @@ class _Wall(ArchComponent.Component):
self.hideSubobjects(obj,prop) self.hideSubobjects(obj,prop)
if prop in ["Base","Height","Width","Align","Additions","Subtractions"]: if prop in ["Base","Height","Width","Align","Additions","Subtractions"]:
self.createGeometry(obj) self.createGeometry(obj)
# propagate movements to children windows
if prop == "Placement":
if obj.Shape:
if not obj.Shape.isNull():
vo = obj.Shape.Placement.Base
vn = obj.Placement.Base
if not DraftVecUtils.equals(vo,vn):
delta = vn.sub(vo)
for o in obj.OutList:
if (Draft.getType(o) == "Window") or Draft.isClone(o,"Window"):
o.Placement.move(delta)
def getDefaultValues(self,obj): def getDefaultValues(self,obj):
"returns normal,width,height values from this wall" "returns normal,width,height values from this wall"