OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1940 Curve Creator : Always recreate curve creator to ensure stable init

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-02 11:12:31 +02:00
parent fd1b8c83ff
commit eec974c53d
3 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.cpp
View File

@ -30,7 +30,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog(QWidget* parent, RicSummaryCurveCreator* summaryCurveCreator) RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog(QWidget* parent)
: QDialog(parent) : QDialog(parent)
{ {
m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi(this); m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi(this);
@ -41,9 +41,6 @@ RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog(QWidget* parent, RicS
dummy->setContentsMargins(0, 0, 0, 0); dummy->setContentsMargins(0, 0, 0, 0);
dummy->addWidget(propertyWidget); dummy->addWidget(propertyWidget);
m_curveCreatorSplitterUi->setPdmObject(summaryCurveCreator);
m_curveCreatorSplitterUi->updateUi();
setWindowTitle("ResInsight: Plot Editor"); setWindowTitle("ResInsight: Plot Editor");
resize(1200, 800); resize(1200, 800);
connect(m_curveCreatorSplitterUi, SIGNAL(signalCloseButtonPressed()), this, SLOT(accept())); connect(m_curveCreatorSplitterUi, SIGNAL(signalCloseButtonPressed()), this, SLOT(accept()));
@ -58,6 +55,15 @@ RicSummaryCurveCreatorDialog::~RicSummaryCurveCreatorDialog()
{ {
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorDialog::setCurveCreator(RicSummaryCurveCreator* summaryCurveCreator)
{
m_curveCreatorSplitterUi->setPdmObject(summaryCurveCreator);
m_curveCreatorSplitterUi->updateUi();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h
View File

@ -31,9 +31,11 @@ class RicSummaryCurveCreatorDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
RicSummaryCurveCreatorDialog(QWidget* parent, RicSummaryCurveCreator* summaryCurveCreator); RicSummaryCurveCreatorDialog(QWidget* parent);
~RicSummaryCurveCreatorDialog(); ~RicSummaryCurveCreatorDialog();
void setCurveCreator(RicSummaryCurveCreator* summaryCurveCreator);
private slots: private slots:
void slotDialogFinished(); void slotDialogFinished();

23
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorFactoryImpl.cpp
View File

@ -28,8 +28,8 @@ RicSummaryCurveCreatorFactoryImpl* RicSummaryCurveCreatorFactoryImpl::ms_instanc
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorFactoryImpl::RicSummaryCurveCreatorFactoryImpl() RicSummaryCurveCreatorFactoryImpl::RicSummaryCurveCreatorFactoryImpl()
{ {
m_curveCreator = new RicSummaryCurveCreator(); m_dialogWithSplitter = new RicSummaryCurveCreatorDialog(nullptr);
m_dialogWithSplitter = new RicSummaryCurveCreatorDialog(nullptr, m_curveCreator); m_curveCreator = nullptr;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -48,8 +48,20 @@ RicSummaryCurveCreatorFactoryImpl::~RicSummaryCurveCreatorFactoryImpl()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreator* RicSummaryCurveCreatorFactoryImpl::curveCreator() RicSummaryCurveCreator* RicSummaryCurveCreatorFactoryImpl::curveCreator()
{ {
if (m_curveCreator == nullptr) if (m_curveCreator)
m_curveCreator = new RicSummaryCurveCreator(); {
delete m_curveCreator;
m_curveCreator = nullptr;
}
// Recreate curve creator to make sure initialization is stable
m_curveCreator = new RicSummaryCurveCreator();
if (m_dialogWithSplitter)
{
m_dialogWithSplitter->setCurveCreator(m_curveCreator);
}
return m_curveCreator; return m_curveCreator;
} }
@ -59,7 +71,8 @@ RicSummaryCurveCreator* RicSummaryCurveCreatorFactoryImpl::curveCreator()
RicSummaryCurveCreatorDialog* RicSummaryCurveCreatorFactoryImpl::dialog() RicSummaryCurveCreatorDialog* RicSummaryCurveCreatorFactoryImpl::dialog()
{ {
if (m_dialogWithSplitter == nullptr) if (m_dialogWithSplitter == nullptr)
m_dialogWithSplitter = new RicSummaryCurveCreatorDialog(nullptr, curveCreator()); m_dialogWithSplitter = new RicSummaryCurveCreatorDialog(nullptr);
return m_dialogWithSplitter; return m_dialogWithSplitter;
} }