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

PartDesign/Gui: start to unify view providers code

Browse Source 
- Moved all common code for part design features view providers to a base
   class.
 - Move shared code for Sketch based features to newly created
   ViewProviderSketchBased class
 - Add ViewProviderSketchBased to initialization
 - Make Pad and Pocket ViewProviders to use the shared code
 - Minor fixes to TaskFeatureParameters and some derived classes
This commit is contained in:
Alexander Golubev
2015-07-26 06:29:02 +03:00
committed by Stefan Tröger
parent 6266d514d3
commit 5ee0cea467
15 changed files with 274 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/PartDesign/Gui/TaskFeatureParameters.cpp
View File

@@ -92,33 +92,27 @@ bool TaskDlgFeatureParameters::reject()
// Find out previous feature we won't be able to do it after abort
// (at least in the body case)
App::DocumentObject* previous;
if (body) {
// NOTE: feature->getBaseObject() should return the same for body
previous = body->getPrevSolidFeature(feature, /*inclusive =*/ false);
} else {
previous = feature->getBaseObject();
try {
previous = feature->getBaseObject(); // throws on errors
} catch (const Base::Exception &ex) {
previous = 0;
}
// roll back the done things
Gui::Command::abortCommand();
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
// if abort command deleted the object make the previous feature visible again
if (!Gui::Application::Instance->getViewProvider(feature)) {
// Body housekeeping
if (body != NULL) {
// Make the tip or the prebious feature visiable again with preference to the previous one
// Make the tip or the previous feature visiable again with preference to the previous one
// TODO: ViewProvider::onDelete has the same code. May be this one is excess?
if (previous && Gui::Application::Instance->getViewProvider(previous)) {
Gui::Application::Instance->getViewProvider(previous)->show();
} else if (body != NULL) {
App::DocumentObject* tip = body->Tip.getValue();
if (previous && Gui::Application::Instance->getViewProvider(previous)) {
Gui::Application::Instance->getViewProvider(previous)->show();
} else if (tip && Gui::Application::Instance->getViewProvider(tip)) {
if (tip && Gui::Application::Instance->getViewProvider(tip)) {
Gui::Application::Instance->getViewProvider(tip)->show();
}
} else {
if (previous && Gui::Application::Instance->getViewProvider(previous))
Gui::Application::Instance->getViewProvider(previous)->show();
}
}