From a085e21e9a30d1e6f69d3c551d8376d5c0db2965 Mon Sep 17 00:00:00 2001 From: jrheinlaender Date: Fri, 22 Mar 2013 19:29:45 +0430 Subject: [PATCH] Bug fixes --- src/Mod/PartDesign/WizardShaft/WizardShaft.py | 3 +++ src/Mod/PartDesign/WizardShaft/WizardShaftTable.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py index 15b3f1b72..37c82afd5 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaft.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.py @@ -157,6 +157,9 @@ class TaskWizardShaft: if self.form: del self.form return True + + def isAllowedAlterDocument(self): + return False # Work-around to allow a callback # Problem: From the FemConstraint ViewProvider, we need to tell the Shaft instance that the user finished editing the constraint diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py index 0d73da049..afd7f8897 100644 --- a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py +++ b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py @@ -82,7 +82,7 @@ class WizardShaftTable: self.addColumn() self.setLength(0, 40.0) self.setDiameter(0, 50.0) - self.setConstraintType(0, "Bearing") + self.setConstraintType(0, "Fixed") # Section 2 self.addColumn() self.setLength(1, 80.0) @@ -164,6 +164,7 @@ class WizardShaftTable: widget.insertItem(2, "Fillet") self.widget.setCellWidget(self.rowDict["StartEdgeType"],index, widget) widget.setCurrentIndex(0) + widget.setEnabled(False) #self.widget.connect(widget, QtCore.SIGNAL("currentIndexChanged(const QString&)"), self.slotLoadType) # Start edge size widget = QtGui.QDoubleSpinBox(self.widget) @@ -173,6 +174,7 @@ class WizardShaftTable: widget.setValue(1) widget.valueChanged.connect(self.slotValueChanged) widget.editingFinished.connect(self.slotEditingFinished) + widget.setEnabled(False) # End edge type widget = QtGui.QComboBox(self.widget) widget.insertItem(0, "None",) @@ -180,6 +182,7 @@ class WizardShaftTable: widget.insertItem(2, "Fillet") self.widget.setCellWidget(self.rowDict["EndEdgeType"],index, widget) widget.setCurrentIndex(0) + widget.setEnabled(False) #self.widget.connect(widget, QtCore.SIGNAL("currentIndexChanged(const QString&)"), self.slotLoadType) # End edge size widget = QtGui.QDoubleSpinBox(self.widget) @@ -189,6 +192,7 @@ class WizardShaftTable: widget.setValue(1) widget.valueChanged.connect(self.slotValueChanged) widget.editingFinished.connect(self.slotEditingFinished) + widget.setEnabled(False) def slotValueChanged(self, value): (self.editedRow, self.editedColumn) = self.getFocusedCell()