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

fixes 0003061: 'Move object after other object' function causes chaos

Browse Source
This commit is contained in:
wmayer
2019-02-24 14:04:42 +01:00
parent 4e973324ae
commit e3d63493c7
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Mod/PartDesign/Gui/CommandBody.cpp
View File

@@ -913,6 +913,7 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg)
openCommand("Move an object inside tree");
App::DocumentObject* lastObject = nullptr;
for ( auto feat: features ) {
if ( feat == target ) continue;
@@ -930,9 +931,37 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg)
body->getNameInDocument(), feat->getNameInDocument() );
doCommand ( Doc, "App.activeDocument().%s.insertObject(App.activeDocument().%s, %s, True)",
body->getNameInDocument(), feat->getNameInDocument(), targetStr.c_str () );
if (!lastObject)
lastObject = feat;
}
updateActive();
// If the selected objects have been moved after the current tip then ask the
// user if he wants the last object to be the new tip.
if (lastObject && body->Tip.getValue() == target) {
QMessageBox msgBox(Gui::getMainWindow());
msgBox.setIcon(QMessageBox::Question);
msgBox.setWindowTitle(qApp->translate("PartDesign_MoveFeatureInTree","Move tip"));
msgBox.setText(qApp->translate("PartDesign_MoveFeatureInTree","The moved feature appears after the currently set tip."));
msgBox.setInformativeText(qApp->translate("PartDesign_MoveFeatureInTree","Do you want the last feature to be the new tip?"));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes) {
openCommand("Move tip to selected feature");
doCommand(Doc,"App.activeDocument().%s.Tip = App.activeDocument().%s",
body->getNameInDocument(),
lastObject->getNameInDocument());
// Adjust visibility to show only the Tip feature
doCommand(Gui,"Gui.activeDocument().show(\"%s\")", lastObject->getNameInDocument());
updateActive();
}
}
}
bool CmdPartDesignMoveFeatureInTree::isActive(void)