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

Add abort method to PartDesign TaskDlgFeaturePick

Browse Source
This commit is contained in:
Ian Rees
2017-04-06 09:30:21 +12:00
committed by wmayer
parent 05b5b48af8
commit e2b73e5bb1
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
View File

@@ -152,7 +152,6 @@ TaskFeaturePick::~TaskFeaturePick()
{
for(Gui::ViewProviderOrigin* vpo : origins)
vpo->resetTemporaryVisibility();
}
void TaskFeaturePick::updateList()
@@ -439,10 +438,11 @@ void TaskFeaturePick::showExternal(bool val)
// TaskDialog
//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
TaskDlgFeaturePick::TaskDlgFeaturePick(std::vector<App::DocumentObject*> &objects,
TaskDlgFeaturePick::TaskDlgFeaturePick( std::vector<App::DocumentObject*> &objects,
const std::vector<TaskFeaturePick::featureStatus> &status,
boost::function<bool (std::vector<App::DocumentObject*>)> afunc,
boost::function<void (std::vector<App::DocumentObject*>)> wfunc)
boost::function<void (std::vector<App::DocumentObject*>)> wfunc,
boost::function<void (void)> abortfunc /* = NULL */ )
: TaskDialog(), accepted(false)
{
pick = new TaskFeaturePick(objects, status);
@@ -450,14 +450,27 @@ TaskDlgFeaturePick::TaskDlgFeaturePick(std::vector<App::DocumentObject*> &object
acceptFunction = afunc;
workFunction = wfunc;
abortFunction = abortfunc;
}
TaskDlgFeaturePick::~TaskDlgFeaturePick()
{
//do the work now as before in accept() the dialog is still open, hence the work
//function could not open another dialog
if (accepted)
if (accepted) {
workFunction(pick->buildFeatures());
} else if (abortFunction) {
// Get rid of the TaskFeaturePick before the TaskDialog dtor does. The
// TaskFeaturePick holds pointers to things (ie any implicitly created
// Body objects) that might be modified/removed by abortFunction.
for (auto it : Content) {
delete it;
}
Content.clear();
abortFunction();
}
}
//==== calls from the TaskView ===============================================================

6
src/Mod/PartDesign/Gui/TaskFeaturePick.h
View File

@@ -90,10 +90,11 @@ class TaskDlgFeaturePick : public Gui::TaskView::TaskDialog
Q_OBJECT
public:
TaskDlgFeaturePick(std::vector<App::DocumentObject*> &objects,
TaskDlgFeaturePick( std::vector<App::DocumentObject*> &objects,
const std::vector<TaskFeaturePick::featureStatus> &status,
boost::function<bool (std::vector<App::DocumentObject*>)> acceptfunc,
boost::function<void (std::vector<App::DocumentObject*>)> workfunc);
boost::function<void (std::vector<App::DocumentObject*>)> workfunc,
boost::function<void (void)> abortfunc = NULL );
~TaskDlgFeaturePick();
public:
@@ -120,6 +121,7 @@ protected:
bool accepted;
boost::function<bool (std::vector<App::DocumentObject*>)> acceptFunction;
boost::function<void (std::vector<App::DocumentObject*>)> workFunction;
boost::function<void (void)> abortFunction;
};
}