kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 4 Packages Projects 9 Releases 2 Wiki Activity

Gui: bind spin boxes of Placement dialog when opening it via menu

Browse Source
This commit is contained in:
wmayer
2022-10-27 19:30:24 +02:00
parent 39b28c8a27
commit 5cc9bae455
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Gui/CommandDoc.cpp
View File

@@ -1498,8 +1498,19 @@ void StdCmdPlacement::activated(int iMsg)
auto plm = new Gui::Dialog::TaskPlacement();
if (!sel.empty()) {
App::Property* prop = sel.front()->getPropertyByName("Placement");
if (prop && prop->getTypeId() == App::PropertyPlacement::getClassTypeId())
if (prop && prop->getTypeId() == App::PropertyPlacement::getClassTypeId()) {
plm->setPlacement(static_cast<App::PropertyPlacement*>(prop)->getValue());
std::vector<Gui::SelectionObject> selection;
selection.reserve(sel.size());
std::transform(sel.cbegin(), sel.cend(), std::back_inserter(selection), [](App::DocumentObject* obj) {
return Gui::SelectionObject(obj);
});
plm->setPropertyName(QLatin1String("Placement"));
plm->setSelection(selection);
plm->bindObject();
}
}
Gui::Control().showDialog(plm);
}

16
src/Gui/Placement.cpp
View File

@@ -156,8 +156,13 @@ void Placement::setupSignalMapper()
signalMapper->setMapping(it, id++);
}
#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
connect(signalMapper, qOverload<int>(&QSignalMapper::mapped),
this, &Placement::onPlacementChanged);
#else
connect(signalMapper, &QSignalMapper::mappedInt,
this, &Placement::onPlacementChanged);
#endif
}
void Placement::setupDocument()
@@ -229,7 +234,8 @@ void Placement::revertTransformation()
{
for (const auto & it : documents) {
Gui::Document* document = Application::Instance->getDocument(it.c_str());
if (!document) continue;
if (!document)
continue;
if (!changeProperty) {
std::vector<App::DocumentObject*> obj = document->getDocument()->
@@ -245,7 +251,9 @@ void Placement::revertTransformation()
auto property = static_cast<App::PropertyPlacement*>(jt->second);
Base::Placement cur = property->getValue();
Gui::ViewProvider* vp = document->getViewProvider(it);
if (vp) vp->setTransformation(cur.toMatrix());
if (vp) {
vp->setTransformation(cur.toMatrix());
}
}
}
}
@@ -282,7 +290,9 @@ void Placement::applyPlacement(const Base::Placement& p, bool incremental)
if (!changeProperty) {
Gui::ViewProvider* vp = document->getViewProvider(it);
if (vp) vp->setTransformation(cur.toMatrix());
if (vp) {
vp->setTransformation(cur.toMatrix());
}
}
else {
property->setValue(cur);