use checkbox in menu item to display current object state and refactor the code

This commit is contained in:
Max Wilfinger
2023-12-28 11:30:49 +01:00
parent 72821eb513
commit aac3003dcf
4 changed files with 44 additions and 39 deletions

View File

@@ -133,29 +133,18 @@ void ViewProviderBody::setupContextMenu(QMenu* menu, QObject* receiver, const ch
Q_UNUSED(member);
Gui::ActionFunction* func = new Gui::ActionFunction(menu);
auto activeDoc = Gui::Application::Instance->activeDocument();
if(!activeDoc)
activeDoc = getDocument();
auto activeView = activeDoc->setActiveView(this);
if (activeView->isActiveObject(getObject(),PDBODYKEY)) {
QAction* act = menu->addAction(tr("Unset active body"));
QAction* act = menu->addAction(tr("Active body"));
act->setCheckable(true);
act->setChecked(isActiveBody());
func->trigger(act, [this]() {
this->doubleClicked();
this->toggleActiveBody();
});
} else {
QAction* act = menu->addAction(tr("Set active body"));
func->trigger(act, [this]() {
this->doubleClicked();
});
}
Gui::ViewProviderGeometryObject::setupContextMenu(menu, receiver, member); // clazy:exclude=skipped-base-method
}
bool ViewProviderBody::doubleClicked()
bool ViewProviderBody::isActiveBody()
{
//first, check if the body is already active.
auto activeDoc = Gui::Application::Instance->activeDocument();
if(!activeDoc)
activeDoc = getDocument();
@@ -163,7 +152,16 @@ bool ViewProviderBody::doubleClicked()
if(!activeView)
return false;
if (activeView->isActiveObject(getObject(),PDBODYKEY)) {
if (activeView->isActiveObject(getObject(),PDBODYKEY)){
return true;
} else {
return false;
}
}
void ViewProviderBody::toggleActiveBody()
{
if (isActiveBody()) {
//active body double-clicked. Deactivate.
Gui::Command::doCommand(Gui::Command::Gui,
"Gui.ActiveDocument.ActiveView.setActiveObject('%s', None)", PDBODYKEY);
@@ -175,7 +173,7 @@ bool ViewProviderBody::doubleClicked()
// and set correct active objects
auto* part = App::Part::getPartOfObject ( getObject() );
if ( part && part != activeView->getActiveObject<App::Part*> ( PARTKEY ) ) {
if ( part && !isActiveBody() ) {
Gui::Command::doCommand(Gui::Command::Gui,
"Gui.ActiveDocument.ActiveView.setActiveObject('%s',%s)",
PARTKEY, Gui::Command::getObjectCmd(part).c_str());
@@ -185,7 +183,11 @@ bool ViewProviderBody::doubleClicked()
"Gui.ActiveDocument.ActiveView.setActiveObject('%s',%s)",
PDBODYKEY, Gui::Command::getObjectCmd(getObject()).c_str());
}
}
bool ViewProviderBody::doubleClicked()
{
toggleActiveBody();
return true;
}