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

+ fixes #0001746: Part Fillet and Chamfer do not show correct length/radius when editing old items

Browse Source
This commit is contained in:
wmayer 2014-12-30 17:20:32 +01:00
parent ff09f0524d
commit c231866b8d
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@ -547,6 +547,8 @@ void DlgFilletEdges::setupFillet(const std::vector<App::DocumentObject*>& objs)
on_shapeObject_activated(current_index); on_shapeObject_activated(current_index);
ui->shapeObject->setEnabled(false); ui->shapeObject->setEnabled(false);
double startRadius = 1;
double endRadius = 1;
std::vector<std::string> subElements; std::vector<std::string> subElements;
QStandardItemModel *model = qobject_cast<QStandardItemModel*>(ui->treeView->model()); QStandardItemModel *model = qobject_cast<QStandardItemModel*>(ui->treeView->model());
bool block = model->blockSignals(true); // do not call toggleCheckState bool block = model->blockSignals(true); // do not call toggleCheckState
@ -558,6 +560,9 @@ void DlgFilletEdges::setupFillet(const std::vector<App::DocumentObject*>& objs)
model->setData(model->index(index, 1), QVariant(QLocale::system().toString(et->radius1,'f',Base::UnitsApi::getDecimals()))); 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()))); 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(); int id = model->index(index, 0).data(Qt::UserRole).toInt();
std::stringstream str; std::stringstream str;
str << "Edge" << id; str << "Edge" << id;
@ -566,6 +571,14 @@ void DlgFilletEdges::setupFillet(const std::vector<App::DocumentObject*>& objs)
} }
model->blockSignals(block); 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(); App::Document* doc = d->object->getDocument();
Gui::Selection().addSelection(doc->getName(), Gui::Selection().addSelection(doc->getName(),
d->object->getNameInDocument(), d->object->getNameInDocument(),