kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 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 025b2638dc
commit 326c2404fa
2 changed files with 14 additions and 16 deletions
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);
QMetaObject::connectSlotsByName(this);
connect(ui->doubleSpinBox, SIGNAL(valueChanged(double)),
connect(ui->filletRadius, SIGNAL(valueChanged(double)),
this, SLOT(onLengthChanged(double)));
this->groupLayout()->addWidget(proxy);
@@ -65,11 +65,10 @@ TaskFilletParameters::TaskFilletParameters(ViewProviderFillet *FilletView,QWidge
PartDesign::Fillet* pcFillet = static_cast<PartDesign::Fillet*>(FilletView->getObject());
double r = pcFillet->Radius.getValue();
ui->doubleSpinBox->setDecimals(Base::UnitsApi::getDecimals());
ui->doubleSpinBox->setMaximum(INT_MAX);
ui->doubleSpinBox->setValue(r);
ui->doubleSpinBox->selectAll();
QMetaObject::invokeMethod(ui->doubleSpinBox, "setFocus", Qt::QueuedConnection);
ui->filletRadius->setUnit(Base::Unit::Length);
ui->filletRadius->setValue(r);
ui->filletRadius->selectNumber();
QMetaObject::invokeMethod(ui->filletRadius, "setFocus", Qt::QueuedConnection);
}
void TaskFilletParameters::onLengthChanged(double len)
@@ -81,10 +80,9 @@ void TaskFilletParameters::onLengthChanged(double len)
double TaskFilletParameters::getLength(void) const
{
return ui->doubleSpinBox->value();
return ui->filletRadius->getQuantity().getValue();
}
TaskFilletParameters::~TaskFilletParameters()
{
delete ui;