From 858d2aa313d70f7bb0f8b680903d6f3676616f0a Mon Sep 17 00:00:00 2001 From: Karsten Merkle Date: Thu, 27 Jul 2017 23:11:41 +0200 Subject: [PATCH] python3 issues --- src/Mod/Arch/ArchStairs.py | 2 +- src/Mod/Arch/ArchWindow.py | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py index 17c90bb2b0..9ccd1cce7a 100644 --- a/src/Mod/Arch/ArchStairs.py +++ b/src/Mod/Arch/ArchStairs.py @@ -487,7 +487,7 @@ class _Stairs(ArchComponent.Component): else: h = obj.Height.Value hstep = h/obj.NumberOfSteps - landing = obj.NumberOfSteps/2 + landing = int(obj.NumberOfSteps/2) p2 = p1.add(DraftVecUtils.scale(vLength,landing-1).add(Vector(0,0,landing*hstep))) p3 = p2.add(DraftVecUtils.scaleTo(vLength,obj.Width.Value)) p4 = p3.add(DraftVecUtils.scale(vLength,obj.NumberOfSteps-(landing+1)).add(Vector(0,0,(obj.NumberOfSteps-landing)*hstep))) diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py index 9b52a95616..3e8fa34860 100644 --- a/src/Mod/Arch/ArchWindow.py +++ b/src/Mod/Arch/ArchWindow.py @@ -393,11 +393,6 @@ def makeWindowPreset(windowtype,width,height,h1,h2,h3,w1,w2,o1,o2,placement=None class _CommandWindow: "the Arch Window command definition" - def __init__(self): - # hack for inputwidgets - global setArchWindowParamFunction - setArchWindowParamFunction = self.setParams - def GetResources(self): return {'Pixmap' : 'Arch_Window', 'MenuText': QT_TRANSLATE_NOOP("Arch_Window","Window"), @@ -586,12 +581,14 @@ class _CommandWindow: grid.addWidget(lab,i,0,1,1) grid.addWidget(wid,i,1,1,1) i += 1 + valueChanged = self.getValueChanged(param) FreeCAD.wid = wid - exec("""def valueChanged(d): - setArchWindowParamFunction('"""+param+"""',d)""") - QtCore.QObject.connect(getattr(self,"val"+param),QtCore.SIGNAL("valueChanged(double)"),valueChanged) + QtCore.QObject.connect(getattr(self,"val"+param),QtCore.SIGNAL("valueChanged(double)"), valueChanged) return w + def getValueChanged(self,p): + return lambda d : self.setParams(p, d) + def setSill(self,d): self.Sill = d @@ -716,7 +713,7 @@ class _Window(ArchComponent.Component): if obj.WindowParts and (len(obj.WindowParts)%5 == 0): shapes = [] rotdata = None - for i in range(len(obj.WindowParts)/5): + for i in range(int(len(obj.WindowParts)/5)): wires = [] hinge = None omode = None