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

fix #0002662 - crash when create ShapeBinder with origin selected

Browse Source
This commit is contained in:
Sergo 2016-12-01 23:50:00 -05:00 committed by wmayer
parent 2313b05db5
commit 261bc46738
3 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/ShapeBinder.cpp
View File

@ -89,7 +89,7 @@ void ShapeBinder::getFilteredReferences(App::PropertyLinkSubList* prop, Part::Fe
//we only allow one part feature, so get the first one we find
size_t index = 0;
while(!objs[index]->isDerivedFrom(Part::Feature::getClassTypeId()) && index < objs.size())
while(index < objs.size() && !objs[index]->isDerivedFrom(Part::Feature::getClassTypeId()))
index++;
//do we have any part feature?

38
src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
View File

@ -317,35 +317,13 @@ bool TaskDlgShapeBinder::accept()
return true;
}
//bool TaskDlgShapeBinder::reject()
//{
// // get the support and Sketch
// PartDesign::Pipe* pcPipe = static_cast<PartDesign::Pipe*>(PipeView->getObject());
// Sketcher::SketchObject *pcSketch = 0;
// App::DocumentObject *pcSupport = 0;
// if (pcPipe->Sketch.getValue()) {
// pcSketch = static_cast<Sketcher::SketchObject*>(pcPipe->Sketch.getValue());
// pcSupport = pcSketch->Support.getValue();
// }
//
// // roll back the done things
// Gui::Command::abortCommand();
// Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
//
// // if abort command deleted the object the support is visible again
// if (!Gui::Application::Instance->getViewProvider(pcPipe)) {
// if (pcSketch && Gui::Application::Instance->getViewProvider(pcSketch))
// Gui::Application::Instance->getViewProvider(pcSketch)->show();
// if (pcSupport && Gui::Application::Instance->getViewProvider(pcSupport))
// Gui::Application::Instance->getViewProvider(pcSupport)->show();
// }
//
// //Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.recompute()");
// //Gui::Command::commitCommand();
//
// return true;
//}
bool TaskDlgShapeBinder::reject()
{
// roll back the done things
Gui::Command::abortCommand();
Gui::Command::doCommand(Gui::Command::Gui, "Gui.activeDocument().resetEdit()");
Gui::Command::doCommand(Gui::Command::Doc, "App.ActiveDocument.recompute()");
return true;
}
#include "moc_TaskShapeBinder.cpp"

2
src/Mod/PartDesign/Gui/TaskShapeBinder.h
View File

@ -94,7 +94,7 @@ public:
/// is called by the framework if the dialog is accepted (Ok)
virtual bool accept();
/// is called by the framework if the dialog is rejected (Cancel)
//virtual bool reject();
virtual bool reject();
protected:
TaskShapeBinder *parameter;