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

#2216 Disable creation of new calculation object as this causes crash

Browse Source 
Introduced in  8281391fb9
This commit is contained in:
Magne Sjaastad 2017-12-04 10:20:21 +01:00
parent c0109361ef
commit f79e31be8f
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
View File

@ -51,11 +51,6 @@ RicSummaryCurveCalculator::RicSummaryCurveCalculator()
RicSummaryCurveCalculator::assignPushButtonEditor(&m_deleteCalculation); RicSummaryCurveCalculator::assignPushButtonEditor(&m_deleteCalculation);
m_calcContextMenuMgr = std::unique_ptr<RiuCalculationsContextMenuManager>(new RiuCalculationsContextMenuManager()); m_calcContextMenuMgr = std::unique_ptr<RiuCalculationsContextMenuManager>(new RiuCalculationsContextMenuManager());
if (!m_currentCalculation)
{
createNewCalculation();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -124,7 +119,8 @@ void RicSummaryCurveCalculator::fieldChangedByUi(const caf::PdmFieldHandle* chan
{ {
m_newCalculation = false; m_newCalculation = false;
createNewCalculation(); RimSummaryCalculation* rimCalc = calculationCollection()->addCalculation();
m_currentCalculation = rimCalc;
this->updateConnectedEditors(); this->updateConnectedEditors();
} }
@ -292,12 +288,3 @@ void RicSummaryCurveCalculator::onEditorWidgetsCreated()
m_calcContextMenuMgr->attachWidget(widget, this); m_calcContextMenuMgr->attachWidget(widget, this);
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::createNewCalculation()
{
RimSummaryCalculation* rimCalc = calculationCollection()->addCalculation();
m_currentCalculation = rimCalc;
}

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h
View File

@ -56,8 +56,6 @@ private:
virtual void onEditorWidgetsCreated(); virtual void onEditorWidgetsCreated();
private: private:
void createNewCalculation();
// TODO : Move to a common caf helper class // TODO : Move to a common caf helper class
static void assignPushButtonEditor(caf::PdmFieldHandle* fieldHandle); static void assignPushButtonEditor(caf::PdmFieldHandle* fieldHandle);
static void assignPushButtonEditorText(caf::PdmUiEditorAttribute* attribute, const QString& text); static void assignPushButtonEditorText(caf::PdmUiEditorAttribute* attribute, const QString& text);