From c231866b8deddc556335e4a05938e895847b0e3e Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 30 Dec 2014 17:20:32 +0100 Subject: [PATCH] + fixes #0001746: Part Fillet and Chamfer do not show correct length/radius when editing old items --- src/Mod/Part/Gui/DlgFilletEdges.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 99ea9a996..993c1d34a 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -547,6 +547,8 @@ void DlgFilletEdges::setupFillet(const std::vector& objs) on_shapeObject_activated(current_index); ui->shapeObject->setEnabled(false); + double startRadius = 1; + double endRadius = 1; std::vector subElements; QStandardItemModel *model = qobject_cast(ui->treeView->model()); bool block = model->blockSignals(true); // do not call toggleCheckState @@ -558,6 +560,9 @@ void DlgFilletEdges::setupFillet(const std::vector& objs) model->setData(model->index(index, 1), QVariant(QLocale::system().toString(et->radius1,'f',Base::UnitsApi::getDecimals()))); model->setData(model->index(index, 2), QVariant(QLocale::system().toString(et->radius2,'f',Base::UnitsApi::getDecimals()))); + startRadius = et->radius1; + endRadius = et->radius2; + int id = model->index(index, 0).data(Qt::UserRole).toInt(); std::stringstream str; str << "Edge" << id; @@ -566,6 +571,14 @@ void DlgFilletEdges::setupFillet(const std::vector& objs) } model->blockSignals(block); + // #0001746 + ui->filletStartRadius->blockSignals(true); + ui->filletStartRadius->setValue(startRadius); + ui->filletStartRadius->blockSignals(false); + ui->filletEndRadius->blockSignals(true); + ui->filletEndRadius->setValue(endRadius); + ui->filletEndRadius->blockSignals(false); + App::Document* doc = d->object->getDocument(); Gui::Selection().addSelection(doc->getName(), d->object->getNameInDocument(),