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

#2211 Curve calc. Create new calculation if empty

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-12-01 15:36:46 +01:00
parent 83a272296c
commit 8281391fb9
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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