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

#2032 Curve Calculator : Rename of calculation and calculation collection

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-23 14:42:38 +02:00
parent f943a80f95
commit 35a2769cab
16 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,15 +19,15 @@
#include "RicSummaryCurveCalculator.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimSummaryCalculation.h"
#include "RimCalculationCollection.h"
#include "RimProject.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "cafPdmUiListEditor.h"
#include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTreeSelectionEditor.h"
#include "RiaSummaryTools.h"
CAF_PDM_SOURCE_INIT(RicSummaryCurveCalculator, "RicSummaryCurveCalculator");
@@ -177,7 +177,7 @@ QList<caf::PdmOptionItemInfo> RicSummaryCurveCalculator::calculateValueOptions(c
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimCalculationCollection* RicSummaryCurveCalculator::calculationCollection()
RimSummaryCalculationCollection* RicSummaryCurveCalculator::calculationCollection()
{
RimProject* proj = RiaApplication::instance()->project();
if (proj)

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

@@ -23,7 +23,7 @@
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
class RimCalculationCollection;
class RimSummaryCalculationCollection;
class RimSummaryCalculation;
//==================================================================================================
@@ -51,7 +51,7 @@ private:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private:
static RimCalculationCollection* calculationCollection();
static RimSummaryCalculationCollection* calculationCollection();
// TODO : Move to a common caf helper class
static void assignPushButtonEditor(caf::PdmFieldHandle* fieldHandle);

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@@ -39,7 +39,7 @@
#include "RimSummaryCurveCollection.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimCalculationCollection.h"
#include "RimSummaryCalculationCollection.h"
#include "RiuMainPlotWindow.h"
#include "RiuSummaryQwtPlot.h"
@@ -674,7 +674,7 @@ bool RicSummaryCurveCreator::isObservedData(RimSummaryCase *sumCase) const
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RicSummaryCurveCreator::calculatedSummaryCase()
{
RimCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection();
RimSummaryCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection();
return calcColl->calculationSummaryCase();
}