From a0480dc62c0ba58481e8a649b3b5e376e6590444 Mon Sep 17 00:00:00 2001 From: mikeprice99 Date: Mon, 20 Jul 2020 07:37:31 +0100 Subject: [PATCH] fixed door open plan symbol and make makeWindow use name parameter --- src/Mod/Arch/ArchWindow.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py index 4f64a65f8c..342bde7a10 100644 --- a/src/Mod/Arch/ArchWindow.py +++ b/src/Mod/Arch/ArchWindow.py @@ -60,7 +60,7 @@ WindowOpeningModes = ["None","Arc 90","Arc 90 inv","Arc 45","Arc 45 inv","Arc 18 WindowPresets = ArchWindowPresets.WindowPresets -def makeWindow(baseobj=None,width=None,height=None,parts=None,name="Window"): +def makeWindow(baseobj=None,width=None,height=None,parts=None,name=None): '''makeWindow(baseobj,[width,height,parts,name]): creates a window based on the given base 2D object (sketch or draft).''' @@ -75,7 +75,10 @@ def makeWindow(baseobj=None,width=None,height=None,parts=None,name="Window"): p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch") obj = FreeCAD.ActiveDocument.addObject("Part::FeaturePython","Window") _Window(obj) - obj.Label = translate("Arch","Window") + if name: + obj.Label = name + else: + obj.Label = translate("Arch","Window") if FreeCAD.GuiUp: _ViewProviderWindow(obj.ViewObject) #obj.ViewObject.Transparency=p.GetInt("WindowTransparency",85) @@ -671,7 +674,8 @@ class _Window(ArchComponent.Component): if proj.Length > 0: #chord = p.sub(ev1.add(proj)) #p = v1.add(chord) - p = p.add(proj.negative()) + p = p.sub(proj) + chord = p.sub(ev1) # calculate symbols v4 = p.add(DraftVecUtils.scale(enorm,0.5)) if omode == 1: # Arc 90