suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/s7726-repo/PadToolDatum'

Browse Source
This commit is contained in:
jriegel 2014-02-09 09:57:38 +01:00
commit 3f9642136c
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Mod/PartDesign/Gui/TaskPadParameters.cpp
View File

@ -61,13 +61,13 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView,QWidget *parent)
ui->setupUi(proxy); ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this); QMetaObject::connectSlotsByName(this);
connect(ui->doubleSpinBox, SIGNAL(valueChanged(double)), connect(ui->lengthEdit, SIGNAL(valueChanged(double)),
this, SLOT(onLengthChanged(double))); this, SLOT(onLengthChanged(double)));
connect(ui->checkBoxMidplane, SIGNAL(toggled(bool)), connect(ui->checkBoxMidplane, SIGNAL(toggled(bool)),
this, SLOT(onMidplane(bool))); this, SLOT(onMidplane(bool)));
connect(ui->checkBoxReversed, SIGNAL(toggled(bool)), connect(ui->checkBoxReversed, SIGNAL(toggled(bool)),
this, SLOT(onReversed(bool))); this, SLOT(onReversed(bool)));
connect(ui->doubleSpinBox2, SIGNAL(valueChanged(double)), connect(ui->lengthEdit2, SIGNAL(valueChanged(double)),
this, SLOT(onLength2Changed(double))); this, SLOT(onLength2Changed(double)));
connect(ui->changeMode, SIGNAL(currentIndexChanged(int)), connect(ui->changeMode, SIGNAL(currentIndexChanged(int)),
this, SLOT(onModeChanged(int))); this, SLOT(onModeChanged(int)));
@ -81,8 +81,8 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView,QWidget *parent)
this->groupLayout()->addWidget(proxy); this->groupLayout()->addWidget(proxy);
// Temporarily prevent unnecessary feature recomputes // Temporarily prevent unnecessary feature recomputes
ui->doubleSpinBox->blockSignals(true); ui->lengthEdit->blockSignals(true);
ui->doubleSpinBox2->blockSignals(true); ui->lengthEdit2->blockSignals(true);
ui->checkBoxMidplane->blockSignals(true); ui->checkBoxMidplane->blockSignals(true);
ui->checkBoxReversed->blockSignals(true); ui->checkBoxReversed->blockSignals(true);
ui->buttonFace->blockSignals(true); ui->buttonFace->blockSignals(true);
@ -106,12 +106,12 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView,QWidget *parent)
} }
// Fill data into dialog elements // Fill data into dialog elements
ui->doubleSpinBox->setMinimum(0); ui->lengthEdit->setMinimum(0);
ui->doubleSpinBox->setMaximum(INT_MAX); ui->lengthEdit->setMaximum(INT_MAX);
ui->doubleSpinBox->setValue(l); ui->lengthEdit->setValue(l);
ui->doubleSpinBox2->setMinimum(0); ui->lengthEdit2->setMinimum(0);
ui->doubleSpinBox2->setMaximum(INT_MAX); ui->lengthEdit2->setMaximum(INT_MAX);
ui->doubleSpinBox2->setValue(l2); ui->lengthEdit2->setValue(l2);
ui->checkBoxMidplane->setChecked(midplane); ui->checkBoxMidplane->setChecked(midplane);
// According to bug #0000521 the reversed option // According to bug #0000521 the reversed option
// shouldn't be de-activated if the pad has a support face // shouldn't be de-activated if the pad has a support face
@ -129,8 +129,8 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView,QWidget *parent)
ui->changeMode->setCurrentIndex(index); ui->changeMode->setCurrentIndex(index);
// activate and de-activate dialog elements as appropriate // activate and de-activate dialog elements as appropriate
ui->doubleSpinBox->blockSignals(false); ui->lengthEdit->blockSignals(false);
ui->doubleSpinBox2->blockSignals(false); ui->lengthEdit2->blockSignals(false);
ui->checkBoxMidplane->blockSignals(false); ui->checkBoxMidplane->blockSignals(false);
ui->checkBoxReversed->blockSignals(false); ui->checkBoxReversed->blockSignals(false);
ui->buttonFace->blockSignals(false); ui->buttonFace->blockSignals(false);
@ -142,32 +142,32 @@ TaskPadParameters::TaskPadParameters(ViewProviderPad *PadView,QWidget *parent)
void TaskPadParameters::updateUI(int index) void TaskPadParameters::updateUI(int index)
{ {
if (index == 0) { // dimension if (index == 0) { // dimension
ui->doubleSpinBox->setEnabled(true); ui->lengthEdit->setEnabled(true);
ui->doubleSpinBox->selectAll(); ui->lengthEdit->selectAll();
// Make sure that the spin box has the focus to get key events // Make sure that the spin box has the focus to get key events
// Calling setFocus() directly doesn't work because the spin box is not // Calling setFocus() directly doesn't work because the spin box is not
// yet visible. // yet visible.
QMetaObject::invokeMethod(ui->doubleSpinBox, "setFocus", Qt::QueuedConnection); QMetaObject::invokeMethod(ui->lengthEdit, "setFocus", Qt::QueuedConnection);
ui->checkBoxMidplane->setEnabled(true); ui->checkBoxMidplane->setEnabled(true);
// Reverse only makes sense if Midplane is not true // Reverse only makes sense if Midplane is not true
ui->checkBoxReversed->setEnabled(!ui->checkBoxMidplane->isChecked()); ui->checkBoxReversed->setEnabled(!ui->checkBoxMidplane->isChecked());
ui->doubleSpinBox2->setEnabled(false); ui->lengthEdit2->setEnabled(false);
ui->buttonFace->setEnabled(false); ui->buttonFace->setEnabled(false);
ui->lineFaceName->setEnabled(false); ui->lineFaceName->setEnabled(false);
onButtonFace(false); onButtonFace(false);
} else if (index == 1 || index == 2) { // up to first/last } else if (index == 1 || index == 2) { // up to first/last
ui->doubleSpinBox->setEnabled(false); ui->lengthEdit->setEnabled(false);
ui->checkBoxMidplane->setEnabled(false); ui->checkBoxMidplane->setEnabled(false);
ui->checkBoxReversed->setEnabled(true); ui->checkBoxReversed->setEnabled(true);
ui->doubleSpinBox2->setEnabled(false); ui->lengthEdit2->setEnabled(false);
ui->buttonFace->setEnabled(false); ui->buttonFace->setEnabled(false);
ui->lineFaceName->setEnabled(false); ui->lineFaceName->setEnabled(false);
onButtonFace(false); onButtonFace(false);
} else if (index == 3) { // up to face } else if (index == 3) { // up to face
ui->doubleSpinBox->setEnabled(false); ui->lengthEdit->setEnabled(false);
ui->checkBoxMidplane->setEnabled(false); ui->checkBoxMidplane->setEnabled(false);
ui->checkBoxReversed->setEnabled(false); ui->checkBoxReversed->setEnabled(false);
ui->doubleSpinBox2->setEnabled(false); ui->lengthEdit2->setEnabled(false);
ui->buttonFace->setEnabled(true); ui->buttonFace->setEnabled(true);
ui->lineFaceName->setEnabled(true); ui->lineFaceName->setEnabled(true);
QMetaObject::invokeMethod(ui->lineFaceName, "setFocus", Qt::QueuedConnection); QMetaObject::invokeMethod(ui->lineFaceName, "setFocus", Qt::QueuedConnection);
@ -175,12 +175,12 @@ void TaskPadParameters::updateUI(int index)
if (ui->lineFaceName->text().isEmpty()) if (ui->lineFaceName->text().isEmpty())
onButtonFace(true); onButtonFace(true);
} else { // two dimensions } else { // two dimensions
ui->doubleSpinBox->setEnabled(true); ui->lengthEdit->setEnabled(true);
ui->doubleSpinBox->selectAll(); ui->lengthEdit->selectAll();
QMetaObject::invokeMethod(ui->doubleSpinBox, "setFocus", Qt::QueuedConnection); QMetaObject::invokeMethod(ui->lengthEdit, "setFocus", Qt::QueuedConnection);
ui->checkBoxMidplane->setEnabled(false); ui->checkBoxMidplane->setEnabled(false);
ui->checkBoxReversed->setEnabled(false); ui->checkBoxReversed->setEnabled(false);
ui->doubleSpinBox2->setEnabled(true); ui->lengthEdit2->setEnabled(true);
ui->buttonFace->setEnabled(false); ui->buttonFace->setEnabled(false);
ui->lineFaceName->setEnabled(false); ui->lineFaceName->setEnabled(false);
onButtonFace(false); onButtonFace(false);
@ -273,8 +273,8 @@ void TaskPadParameters::onModeChanged(int index)
case 0: case 0:
pcPad->Type.setValue("Length"); pcPad->Type.setValue("Length");
// Avoid error message // Avoid error message
if (ui->doubleSpinBox->value() < Precision::Confusion()) if (ui->lengthEdit->getQuantity() < Precision::Confusion())
ui->doubleSpinBox->setValue(5.0); ui->lengthEdit->setValue(5.0);
break; break;
case 1: pcPad->Type.setValue("UpToLast"); break; case 1: pcPad->Type.setValue("UpToLast"); break;
case 2: pcPad->Type.setValue("UpToFirst"); break; case 2: pcPad->Type.setValue("UpToFirst"); break;
@ -357,7 +357,7 @@ void TaskPadParameters::onUpdateView(bool on)
double TaskPadParameters::getLength(void) const double TaskPadParameters::getLength(void) const
{ {
return ui->doubleSpinBox->value(); return ui->lengthEdit->getQuantity().getValue();
} }
bool TaskPadParameters::getReversed(void) const bool TaskPadParameters::getReversed(void) const
@ -372,7 +372,7 @@ bool TaskPadParameters::getMidplane(void) const
double TaskPadParameters::getLength2(void) const double TaskPadParameters::getLength2(void) const
{ {
return ui->doubleSpinBox2->value(); return ui->lengthEdit2->getQuantity().getValue();
} }
int TaskPadParameters::getMode(void) const int TaskPadParameters::getMode(void) const
@ -399,8 +399,8 @@ void TaskPadParameters::changeEvent(QEvent *e)
{ {
TaskBox::changeEvent(e); TaskBox::changeEvent(e);
if (e->type() == QEvent::LanguageChange) { if (e->type() == QEvent::LanguageChange) {
ui->doubleSpinBox->blockSignals(true); ui->lengthEdit->blockSignals(true);
ui->doubleSpinBox2->blockSignals(true); ui->lengthEdit2->blockSignals(true);
ui->lineFaceName->blockSignals(true); ui->lineFaceName->blockSignals(true);
ui->changeMode->blockSignals(true); ui->changeMode->blockSignals(true);
int index = ui->changeMode->currentIndex(); int index = ui->changeMode->currentIndex();
@ -422,8 +422,8 @@ void TaskPadParameters::changeEvent(QEvent *e)
ui->lineFaceName->setText(ok ? ui->lineFaceName->setText(ok ?
tr("Face") + QString::number(faceId) : tr("Face") + QString::number(faceId) :
tr("No face selected")); tr("No face selected"));
ui->doubleSpinBox->blockSignals(false); ui->lengthEdit->blockSignals(false);
ui->doubleSpinBox2->blockSignals(false); ui->lengthEdit2->blockSignals(false);
ui->lineFaceName->blockSignals(false); ui->lineFaceName->blockSignals(false);
ui->changeMode->blockSignals(false); ui->changeMode->blockSignals(false);
} }

11
src/Mod/PartDesign/Gui/TaskPadParameters.ui
View File

@ -44,7 +44,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBox"> <widget class="Gui::InputField" name="lengthEdit">
<property name="minimum"> <property name="minimum">
<double>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
@ -88,7 +88,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBox2"> <widget class="Gui::InputField" name="lengthEdit2">
<property name="minimum"> <property name="minimum">
<double>0.000000000000000</double> <double>0.000000000000000</double>
</property> </property>
@ -139,5 +139,12 @@
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
<customwidgets>
<customwidget>
<class>Gui::InputField</class>
<extends>QLineEdit</extends>
<header>Gui/InputField.h</header>
</customwidget>
</customwidgets>
<connections/> <connections/>
</ui> </ui>