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

fix crash in CSsysDragger dialog when closing the document beforehand

Browse Source
This commit is contained in:
wmayer 2016-08-05 15:55:19 +02:00
parent 7979ec275b
commit 1c8734de53
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Gui/TaskCSysDragger.cpp
View File

@ -30,13 +30,13 @@
#include <QGridLayout>
#include <QFontMetrics>
#include <TaskView/TaskView.h>
#include <Gui/TaskView/TaskView.h>
#include "QuantitySpinBox.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <BitmapFactory.h>
#include <ViewProviderGeometryObject.h>
#include <SoFCCSysDragger.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/SoFCCSysDragger.h>
#include "TaskCSysDragger.h"
@ -57,17 +57,19 @@ static double lastTranslationIncrement = 1.0;
static double lastRotationIncrement = degreesToRadains(15.0);
TaskCSysDragger::TaskCSysDragger(Gui::ViewProviderGeometryObject* vpObjectIn, Gui::SoFCCSysDragger* draggerIn) :
vpObject(vpObjectIn), dragger(draggerIn)
dragger(draggerIn)
{
assert(vpObject);
assert(dragger);
assert(vpObjectIn);
assert(draggerIn);
vpObject = vpObjectIn->getObject();
dragger->ref();
setupGui();
}
TaskCSysDragger::~TaskCSysDragger()
{
dragger->unref();
}
void TaskCSysDragger::setupGui()
@ -132,15 +134,14 @@ bool TaskCSysDragger::accept()
lastTranslationIncrement = dragger->translationIncrement.getValue();
lastRotationIncrement = dragger->rotationIncrement.getValue();
assert(vpObject);
App::DocumentObject* dObject = vpObject->getObject();
assert(dObject);
Gui::Document* document = Gui::Application::Instance->getDocument(dObject->getDocument());
assert(document);
document->commitCommand();
document->resetEdit();
document->getDocument()->recompute();
App::DocumentObject* dObject = vpObject.getObject();
if (dObject) {
Gui::Document* document = Gui::Application::Instance->getDocument(dObject->getDocument());
assert(document);
document->commitCommand();
document->resetEdit();
document->getDocument()->recompute();
}
return Gui::TaskView::TaskDialog::accept();
}

3
src/Gui/TaskCSysDragger.h
View File

@ -24,6 +24,7 @@
#define TASKCSYSDRAGGER_H
#include <Gui/TaskView/TaskDialog.h>
#include <App/DocumentObserver.h>
class QuantitySpinBox;
@ -47,7 +48,7 @@ namespace Gui
void onRIncrementSlot(double freshValue);
private:
void setupGui();
ViewProviderGeometryObject *vpObject;
App::DocumentObjectT vpObject;
SoFCCSysDragger *dragger;
QuantitySpinBox *tSpinBox;
QuantitySpinBox *rSpinBox;