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

+ fixes #0001549: crash with Draft move tool while sketch is in edit mode

Browse Source
This commit is contained in:
wmayer 2014-05-20 15:25:03 +02:00
parent 581d88485d
commit 17b7003ea7
16 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Gui/Control.cpp
View File

@ -24,6 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QApplication>
# include <QDebug>
# include <QDockWidget>
# include <QPointer>
@ -162,6 +163,37 @@ Gui::TaskView::TaskDialog* ControlSingleton::activeDialog() const
return ActiveDialog;
}
Gui::TaskView::TaskView* ControlSingleton::getTaskPanel()
{
// should return the pointer to combo view
Gui::DockWnd::CombiView* pcCombiView = qobject_cast<Gui::DockWnd::CombiView*>
(Gui::DockWindowManager::instance()->getDockWindow("Combo View"));
if (pcCombiView)
return pcCombiView->getTaskPanel();
else
return _taskPanel;
}
void ControlSingleton::accept()
{
Gui::TaskView::TaskView* taskPanel = getTaskPanel();
if (taskPanel) {
taskPanel->accept();
qApp->processEvents(QEventLoop::ExcludeUserInputEvents |
QEventLoop::ExcludeSocketNotifiers);
}
}
void ControlSingleton::reject()
{
Gui::TaskView::TaskView* taskPanel = getTaskPanel();
if (taskPanel) {
taskPanel->reject();
qApp->processEvents(QEventLoop::ExcludeUserInputEvents |
QEventLoop::ExcludeSocketNotifiers);
}
}
void ControlSingleton::closeDialog()
{
Gui::DockWnd::CombiView* pcCombiView = qobject_cast<Gui::DockWnd::CombiView*>

5
src/Gui/Control.h
View File

@ -82,6 +82,8 @@ public:
bool isAllowedAlterSelection(void) const;
public Q_SLOTS:
void accept();
void reject();
void closeDialog();
/// raises the task view panel
void showTaskView();
@ -90,6 +92,9 @@ private Q_SLOTS:
/// This get called by the TaskView when the Dialog is finished
void closedDialog();
private:
Gui::TaskView::TaskView *getTaskPanel();
private:
struct status {
std::bitset<32> StatusBits;

2
src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp
View File

@ -77,7 +77,7 @@ bool ViewProviderFemConstraintBearing::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp
View File

@ -77,7 +77,7 @@ bool ViewProviderFemConstraintFixed::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp
View File

@ -77,7 +77,7 @@ bool ViewProviderFemConstraintForce::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp
View File

@ -76,7 +76,7 @@ bool ViewProviderFemConstraintGear::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp
View File

@ -75,7 +75,7 @@ bool ViewProviderFemConstraintPulley::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp
View File

@ -75,7 +75,7 @@ bool ViewProviderChamfer::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderDraft.cpp
View File

@ -75,7 +75,7 @@ bool ViewProviderDraft::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderFillet.cpp
View File

@ -75,7 +75,7 @@ bool ViewProviderFillet::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
View File

@ -82,7 +82,7 @@ bool ViewProviderGroove::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderPad.cpp
View File

@ -87,7 +87,7 @@ bool ViewProviderPad::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
View File

@ -82,7 +82,7 @@ bool ViewProviderPocket::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
View File

@ -82,7 +82,7 @@ bool ViewProviderRevolution::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
View File

@ -178,7 +178,7 @@ const bool ViewProviderTransformed::checkDlgOpen(TaskDlgTransformedParameters* t
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@ -2991,7 +2991,7 @@ bool ViewProviderSketch::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}