diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index 55d80ccbfb..99628beb28 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -142,6 +142,10 @@ class _CommandStructure: "the Arch Structure command definition" + def __init__(self): + + self.beammode = False + def GetResources(self): return {'Pixmap' : 'Arch_Structure', @@ -203,7 +207,11 @@ class _CommandStructure: self.precast = ArchPrecast._PrecastTaskPanel() self.dents = ArchPrecast._DentsTaskPanel() self.precast.Dents = self.dents - FreeCADGui.Snapper.getPoint(callback=self.getPoint,movecallback=self.update,extradlg=[self.taskbox(),self.precast.form,self.dents.form]) + if self.beammode: + title=translate("Arch","First point of the beam")+":" + else: + title=translate("Arch","Base point of column")+":" + FreeCADGui.Snapper.getPoint(callback=self.getPoint,movecallback=self.update,extradlg=[self.taskbox(),self.precast.form,self.dents.form],title=title) def getPoint(self,point=None,obj=None): @@ -211,7 +219,7 @@ class _CommandStructure: if self.modeb.isChecked() and (self.bpoint == None): self.bpoint = point - FreeCADGui.Snapper.getPoint(callback=self.getPoint,movecallback=self.update,extradlg=[self.taskbox(),self.precast.form,self.dents.form]) + FreeCADGui.Snapper.getPoint(callback=self.getPoint,movecallback=self.update,extradlg=[self.taskbox(),self.precast.form,self.dents.form],title=translate("Arch","Next point")+":",mode="line") return self.tracker.finalize() if point == None: @@ -285,14 +293,14 @@ class _CommandStructure: w = QtGui.QWidget() ui = FreeCADGui.UiLoader() - w.setWindowTitle(translate("Arch","Structure options", utf8_decode=True)) + w.setWindowTitle(translate("Arch","Structure options")) grid = QtGui.QGridLayout(w) # mode box - labelmode = QtGui.QLabel(translate("Arch","Drawing mode:", utf8_decode=True)) - self.modeb = QtGui.QRadioButton(translate("Arch","Beam", utf8_decode=True)) - self.modec = QtGui.QRadioButton(translate("Arch","Column", utf8_decode=True)) - if self.bpoint: + labelmode = QtGui.QLabel(translate("Arch","Drawing mode")+":") + self.modeb = QtGui.QRadioButton(translate("Arch","Beam")) + self.modec = QtGui.QRadioButton(translate("Arch","Column")) + if self.bpoint or self.beammode: self.modeb.setChecked(True) else: self.modec.setChecked(True) @@ -301,14 +309,14 @@ class _CommandStructure: grid.addWidget(self.modec,1,1,1,1) # categories box - labelc = QtGui.QLabel(translate("Arch","Category", utf8_decode=True)) + labelc = QtGui.QLabel(translate("Arch","Category")) valuec = QtGui.QComboBox() valuec.addItems([" ","Precast concrete"]+Categories) grid.addWidget(labelc,2,0,1,1) grid.addWidget(valuec,2,1,1,1) # presets box - labelp = QtGui.QLabel(translate("Arch","Preset", utf8_decode=True)) + labelp = QtGui.QLabel(translate("Arch","Preset")) self.vPresets = QtGui.QComboBox() self.pSelect = [None] fpresets = [" "] @@ -317,34 +325,34 @@ class _CommandStructure: grid.addWidget(self.vPresets,3,1,1,1) # length - label1 = QtGui.QLabel(translate("Arch","Length", utf8_decode=True)) + label1 = QtGui.QLabel(translate("Arch","Length")) self.vLength = ui.createWidget("Gui::InputField") self.vLength.setText(FreeCAD.Units.Quantity(self.Length,FreeCAD.Units.Length).UserString) grid.addWidget(label1,4,0,1,1) grid.addWidget(self.vLength,4,1,1,1) # width - label2 = QtGui.QLabel(translate("Arch","Width", utf8_decode=True)) + label2 = QtGui.QLabel(translate("Arch","Width")) self.vWidth = ui.createWidget("Gui::InputField") self.vWidth.setText(FreeCAD.Units.Quantity(self.Width,FreeCAD.Units.Length).UserString) grid.addWidget(label2,5,0,1,1) grid.addWidget(self.vWidth,5,1,1,1) # height - label3 = QtGui.QLabel(translate("Arch","Height", utf8_decode=True)) + label3 = QtGui.QLabel(translate("Arch","Height")) self.vHeight = ui.createWidget("Gui::InputField") self.vHeight.setText(FreeCAD.Units.Quantity(self.Height,FreeCAD.Units.Length).UserString) grid.addWidget(label3,6,0,1,1) grid.addWidget(self.vHeight,6,1,1,1) # horizontal button - value5 = QtGui.QPushButton(translate("Arch","Switch L/H", utf8_decode=True)) + value5 = QtGui.QPushButton(translate("Arch","Switch L/H")) grid.addWidget(value5,7,0,1,1) - value6 = QtGui.QPushButton(translate("Arch","Switch L/W", utf8_decode=True)) + value6 = QtGui.QPushButton(translate("Arch","Switch L/W")) grid.addWidget(value6,7,1,1,1) # continue button - label4 = QtGui.QLabel(translate("Arch","Con&tinue", utf8_decode=True)) + label4 = QtGui.QLabel(translate("Arch","Con&tinue")) value4 = QtGui.QCheckBox() value4.setObjectName("ContinueCmd") value4.setLayoutDirection(QtCore.Qt.RightToLeft) diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py index 7d581adfbd..704c3ed035 100644 --- a/src/Mod/Arch/ArchWall.py +++ b/src/Mod/Arch/ArchWall.py @@ -235,7 +235,7 @@ class _CommandWall: self.tracker = DraftTrackers.boxTracker() if hasattr(FreeCAD,"DraftWorkingPlane"): FreeCAD.DraftWorkingPlane.setup() - FreeCADGui.Snapper.getPoint(callback=self.getPoint,extradlg=self.taskbox()) + FreeCADGui.Snapper.getPoint(callback=self.getPoint,extradlg=self.taskbox(),title=translate("Arch","First point of wall")+":") def getPoint(self,point=None,obj=None): @@ -253,7 +253,7 @@ class _CommandWall: self.tracker.width(self.Width) self.tracker.height(self.Height) self.tracker.on() - FreeCADGui.Snapper.getPoint(last=self.points[0],callback=self.getPoint,movecallback=self.update,extradlg=self.taskbox()) + FreeCADGui.Snapper.getPoint(last=self.points[0],callback=self.getPoint,movecallback=self.update,extradlg=self.taskbox(),title=translate("Arch","Next point")+":",mode="line") elif len(self.points) == 2: import Part l = Part.LineSegment(FreeCAD.DraftWorkingPlane.getLocalCoords(self.points[0]),FreeCAD.DraftWorkingPlane.getLocalCoords(self.points[1])) @@ -298,6 +298,7 @@ class _CommandWall: FreeCADGui.doCommand('base.addGeometry(trace)') else: FreeCADGui.doCommand('base=Draft.makeLine(trace)') + FreeCADGui.doCommand('FreeCAD.ActiveDocument.recompute()') FreeCADGui.doCommand('wall = Arch.makeWall(base,width='+str(self.Width)+',height='+str(self.Height)+',align="'+str(self.Align)+'")') FreeCADGui.doCommand('wall.Normal = FreeCAD.DraftWorkingPlane.getNormal()') if self.MultiMat: @@ -330,11 +331,12 @@ class _CommandWall: w = QtGui.QWidget() ui = FreeCADGui.UiLoader() - w.setWindowTitle(translate("Arch","Wall options", utf8_decode=True)) + w.setWindowTitle(translate("Arch","Wall options")) grid = QtGui.QGridLayout(w) matCombo = QtGui.QComboBox() matCombo.addItem(translate("Arch","Wall Presets...")) + matCombo.setToolTip(translate("Arch","This list shows all the MultiMaterials objects of this document. Create some to define wall types.")) self.multimats = [] self.MultiMat = None for o in FreeCAD.ActiveDocument.Objects: @@ -348,33 +350,33 @@ class _CommandWall: self.MultiMat = o grid.addWidget(matCombo,0,0,1,2) - label5 = QtGui.QLabel(translate("Arch","Length", utf8_decode=True)) + label5 = QtGui.QLabel(translate("Arch","Length")) self.Length = ui.createWidget("Gui::InputField") self.Length.setText("0.00 mm") grid.addWidget(label5,1,0,1,1) grid.addWidget(self.Length,1,1,1,1) - label1 = QtGui.QLabel(translate("Arch","Width", utf8_decode=True)) + label1 = QtGui.QLabel(translate("Arch","Width")) value1 = ui.createWidget("Gui::InputField") value1.setText(FreeCAD.Units.Quantity(self.Width,FreeCAD.Units.Length).UserString) grid.addWidget(label1,2,0,1,1) grid.addWidget(value1,2,1,1,1) - label2 = QtGui.QLabel(translate("Arch","Height", utf8_decode=True)) + label2 = QtGui.QLabel(translate("Arch","Height")) value2 = ui.createWidget("Gui::InputField") value2.setText(FreeCAD.Units.Quantity(self.Height,FreeCAD.Units.Length).UserString) grid.addWidget(label2,3,0,1,1) grid.addWidget(value2,3,1,1,1) - label3 = QtGui.QLabel(translate("Arch","Alignment", utf8_decode=True)) + label3 = QtGui.QLabel(translate("Arch","Alignment")) value3 = QtGui.QComboBox() - items = ["Center","Left","Right"] + items = [translate("Arch","Center"),translate("Arch","Left"),translate("Arch","Right")] value3.addItems(items) value3.setCurrentIndex(items.index(self.Align)) grid.addWidget(label3,4,0,1,1) grid.addWidget(value3,4,1,1,1) - label4 = QtGui.QLabel(translate("Arch","Con&tinue", utf8_decode=True)) + label4 = QtGui.QLabel(translate("Arch","Con&tinue")) value4 = QtGui.QCheckBox() value4.setObjectName("ContinueCmd") value4.setLayoutDirection(QtCore.Qt.RightToLeft) @@ -385,7 +387,7 @@ class _CommandWall: grid.addWidget(label4,5,0,1,1) grid.addWidget(value4,5,1,1,1) - label5 = QtGui.QLabel(translate("Arch","Use sketches", utf8_decode=True)) + label5 = QtGui.QLabel(translate("Arch","Use sketches")) value5 = QtGui.QCheckBox() value5.setObjectName("UseSketches") value5.setLayoutDirection(QtCore.Qt.RightToLeft)