From 240389096588af8a7bffc35594ed873832b9a23d Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Fri, 6 Jan 2017 10:26:00 -0800 Subject: [PATCH] Minimum # tags is 2, makes sense and avoids the endless loop. --- src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui | 6 +++++- src/Mod/Path/PathScripts/PathDressupHoldingTags.py | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui index 85ea93435..ba2fe037d 100644 --- a/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/HoldingTagsEdit.ui @@ -151,7 +151,11 @@ - + + + 2 + + diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py index 7caa9eb70..408d3cd0a 100644 --- a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py +++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py @@ -747,7 +747,7 @@ class ObjectDressup: obj.Height = self.pathData.defaultTagHeight() obj.Width = self.pathData.defaultTagWidth() obj.Angle = self.pathData.defaultTagAngle() - self.generateTags(obj, generate) + self.generateTags(obj, min(2, generate)) return self.pathData def setXyEnabled(self, triples): @@ -900,7 +900,8 @@ class TaskPanel: def whenTagSelectionChanged(self): print('whenTagSelectionChanged') index = self.formTags.lwTags.currentRow() - self.formTags.pbDelete.setEnabled(index != -1) + count = self.formTags.lwTags.count() + self.formTags.pbDelete.setEnabled(index != -1 and count > 2) self.formTags.pbEdit.setEnabled(index != -1) self.viewProvider.selectTag(index) @@ -1002,17 +1003,16 @@ class TaskPanel: self.pointCbMove = self.view.addEventCallbackPivy(coin.SoLocation2Event.getClassTypeId(), mouseMove) def setupSpinBox(self, widget, val, decimals = 2): - widget.setMinimum(0) if decimals: widget.setDecimals(decimals) widget.setValue(val) def setFields(self): self.updateTagsView() - self.setupSpinBox(self.formTags.sbCount, len(self.obj.Positions), None) + self.formTags.sbCount.setValue(len(self.obj.Positions)) self.formTags.ifHeight.setText(FreeCAD.Units.Quantity(self.obj.Height, FreeCAD.Units.Length).UserString) self.formTags.ifWidth.setText(FreeCAD.Units.Quantity(self.obj.Width, FreeCAD.Units.Length).UserString) - self.setupSpinBox(self.formTags.dsbAngle, self.obj.Angle, 0) + self.formTags.dsbAngle.setValue(self.obj.Angle) def updateModelHeight(self): print('updateModelHeight')