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

+ fixes #0001562: Add units to Fillet and Chamfer in PartDesign

Browse Source
This commit is contained in:
wmayer 2014-06-10 12:33:14 +02:00
parent 8923810e1d
commit 30e8c12f54
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
View File

@ -57,7 +57,7 @@ TaskFilletParameters::TaskFilletParameters(ViewProviderFillet *FilletView,QWidge
ui->setupUi(proxy); ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this); QMetaObject::connectSlotsByName(this);
connect(ui->doubleSpinBox, SIGNAL(valueChanged(double)), connect(ui->filletRadius, SIGNAL(valueChanged(double)),
this, SLOT(onLengthChanged(double))); this, SLOT(onLengthChanged(double)));
this->groupLayout()->addWidget(proxy); this->groupLayout()->addWidget(proxy);
@ -65,11 +65,10 @@ TaskFilletParameters::TaskFilletParameters(ViewProviderFillet *FilletView,QWidge
PartDesign::Fillet* pcFillet = static_cast<PartDesign::Fillet*>(FilletView->getObject()); PartDesign::Fillet* pcFillet = static_cast<PartDesign::Fillet*>(FilletView->getObject());
double r = pcFillet->Radius.getValue(); double r = pcFillet->Radius.getValue();
ui->doubleSpinBox->setDecimals(Base::UnitsApi::getDecimals()); ui->filletRadius->setUnit(Base::Unit::Length);
ui->doubleSpinBox->setMaximum(INT_MAX); ui->filletRadius->setValue(r);
ui->doubleSpinBox->setValue(r); ui->filletRadius->selectNumber();
ui->doubleSpinBox->selectAll(); QMetaObject::invokeMethod(ui->filletRadius, "setFocus", Qt::QueuedConnection);
QMetaObject::invokeMethod(ui->doubleSpinBox, "setFocus", Qt::QueuedConnection);
} }
void TaskFilletParameters::onLengthChanged(double len) void TaskFilletParameters::onLengthChanged(double len)
@ -81,10 +80,9 @@ void TaskFilletParameters::onLengthChanged(double len)
double TaskFilletParameters::getLength(void) const double TaskFilletParameters::getLength(void) const
{ {
return ui->doubleSpinBox->value(); return ui->filletRadius->getQuantity().getValue();
} }
TaskFilletParameters::~TaskFilletParameters() TaskFilletParameters::~TaskFilletParameters()
{ {
delete ui; delete ui;

16
src/Mod/PartDesign/Gui/TaskFilletParameters.ui
View File

@ -24,19 +24,19 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBox"> <widget class="Gui::InputField" name="filletRadius"/>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>999999999.000000000000000</double>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>Gui::InputField</class>
<extends>QLineEdit</extends>
<header>Gui/InputField.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>