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
Show Stats 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 "RicSummaryCurveCalculator.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimSummaryCalculation.h"
#include "RimCalculationCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "cafPdmUiListEditor.h" #include "cafPdmUiListEditor.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTreeSelectionEditor.h" #include "cafPdmUiTreeSelectionEditor.h"
#include "RiaSummaryTools.h"
CAF_PDM_SOURCE_INIT(RicSummaryCurveCalculator, "RicSummaryCurveCalculator"); 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(); RimProject* proj = RiaApplication::instance()->project();
if (proj) if (proj)

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

@ -23,7 +23,7 @@
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmPtrField.h" #include "cafPdmPtrField.h"
class RimCalculationCollection; class RimSummaryCalculationCollection;
class RimSummaryCalculation; class RimSummaryCalculation;
//================================================================================================== //==================================================================================================
@ -51,7 +51,7 @@ private:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override; virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
private: private:
static RimCalculationCollection* calculationCollection(); static RimSummaryCalculationCollection* calculationCollection();
// 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);

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

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

8
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -93,8 +93,8 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
${CEE_CURRENT_LIST_DIR}RimDialogData.h ${CEE_CURRENT_LIST_DIR}RimDialogData.h
${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.h ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.h
${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.h ${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.h
${CEE_CURRENT_LIST_DIR}RimCalculationCollection.h ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationCollection.h
${CEE_CURRENT_LIST_DIR}RimCalculationVariable.h ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationVariable.h
) )
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)
@ -193,8 +193,8 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
${CEE_CURRENT_LIST_DIR}RimDialogData.cpp ${CEE_CURRENT_LIST_DIR}RimDialogData.cpp
${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.cpp ${CEE_CURRENT_LIST_DIR}RimTimeStepFilter.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCalculation.cpp
${CEE_CURRENT_LIST_DIR}RimCalculationCollection.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationCollection.cpp
${CEE_CURRENT_LIST_DIR}RimCalculationVariable.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCalculationVariable.cpp
) )
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES)

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -30,7 +30,7 @@
#include "RigWellPath.h" #include "RigWellPath.h"
#include "RimCalcScript.h" #include "RimCalcScript.h"
#include "RimCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
#include "RimCase.h" #include "RimCase.h"
#include "RimCaseCollection.h" #include "RimCaseCollection.h"
#include "RimCommandObject.h" #include "RimCommandObject.h"
@ -114,7 +114,7 @@ RimProject::RimProject(void)
viewLinkerCollection = new RimViewLinkerCollection; viewLinkerCollection = new RimViewLinkerCollection;
CAF_PDM_InitFieldNoDefault(&calculationCollection, "CalculationCollection", "Calculation Collection", "", "", ""); CAF_PDM_InitFieldNoDefault(&calculationCollection, "CalculationCollection", "Calculation Collection", "", "", "");
calculationCollection = new RimCalculationCollection; calculationCollection = new RimSummaryCalculationCollection;
CAF_PDM_InitFieldNoDefault(&commandObjects, "CommandObjects", "CommandObjects", "", "", ""); CAF_PDM_InitFieldNoDefault(&commandObjects, "CommandObjects", "CommandObjects", "", "", "");
//wellPathImport.uiCapability()->setUiHidden(true); //wellPathImport.uiCapability()->setUiHidden(true);

4
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -34,7 +34,7 @@ class RigGridManager;
class RigMainGrid; class RigMainGrid;
class RigWellPath; class RigWellPath;
class RimCalculationCollection; class RimSummaryCalculationCollection;
class RimCase; class RimCase;
class RimCommandObject; class RimCommandObject;
class RimDialogData; class RimDialogData;
@ -79,7 +79,7 @@ public:
caf::PdmChildField<RimWellPathImport*> wellPathImport; caf::PdmChildField<RimWellPathImport*> wellPathImport;
caf::PdmChildField<RimMainPlotCollection*> mainPlotCollection; caf::PdmChildField<RimMainPlotCollection*> mainPlotCollection;
caf::PdmChildField<RimViewLinkerCollection*> viewLinkerCollection; caf::PdmChildField<RimViewLinkerCollection*> viewLinkerCollection;
caf::PdmChildField<RimCalculationCollection*> calculationCollection; caf::PdmChildField<RimSummaryCalculationCollection*> calculationCollection;
caf::PdmChildArrayField<RimCommandObject*> commandObjects; caf::PdmChildArrayField<RimCommandObject*> commandObjects;
caf::PdmChildArrayField<RimMultiSnapshotDefinition*> multiSnapshotDefinitions; caf::PdmChildArrayField<RimMultiSnapshotDefinition*> multiSnapshotDefinitions;

30
ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@ -23,9 +23,9 @@
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RimCalculationCollection.h"
#include "RimCalculationVariable.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCalculationVariable.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
@ -37,14 +37,14 @@
#include <algorithm> #include <algorithm>
CAF_PDM_SOURCE_INIT(RimSummaryCalculation, "RimCalculation"); CAF_PDM_SOURCE_INIT(RimSummaryCalculation, "RimSummaryCalculation");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCalculation::RimSummaryCalculation() RimSummaryCalculation::RimSummaryCalculation()
{ {
CAF_PDM_InitObject("RimCalculation", ":/octave.png", "Calculation", ""); CAF_PDM_InitObject("RimSummaryCalculation", ":/octave.png", "Calculation", "");
CAF_PDM_InitFieldNoDefault(&m_description, "Description", "Description", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_description, "Description", "Description", "", "", "");
m_description.uiCapability()->setUiReadOnly(true); m_description.uiCapability()->setUiReadOnly(true);
@ -85,9 +85,9 @@ caf::PdmChildArrayFieldHandle* RimSummaryCalculation::variables()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCalculationVariable* RimSummaryCalculation::addVariable() RimSummaryCalculationVariable* RimSummaryCalculation::addVariable()
{ {
RimCalculationVariable* v = new RimCalculationVariable; RimSummaryCalculationVariable* v = new RimSummaryCalculationVariable;
m_variables.push_back(v); m_variables.push_back(v);
return v; return v;
@ -96,7 +96,7 @@ RimCalculationVariable* RimSummaryCalculation::addVariable()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCalculation::deleteVariable(RimCalculationVariable* calcVariable) void RimSummaryCalculation::deleteVariable(RimSummaryCalculationVariable* calcVariable)
{ {
m_variables.removeChildObject(calcVariable); m_variables.removeChildObject(calcVariable);
@ -150,8 +150,8 @@ bool RimSummaryCalculation::parseExpression()
// Remove variables not present in expression // Remove variables not present in expression
{ {
std::vector<RimCalculationVariable*> toBeDeleted; std::vector<RimSummaryCalculationVariable*> toBeDeleted;
for (RimCalculationVariable* v : m_variables) for (RimSummaryCalculationVariable* v : m_variables)
{ {
if (std::find(variableNames.begin(), variableNames.end(), v->name()) == variableNames.end()) if (std::find(variableNames.begin(), variableNames.end(), v->name()) == variableNames.end())
{ {
@ -164,7 +164,7 @@ bool RimSummaryCalculation::parseExpression()
} }
} }
for (RimCalculationVariable* v : toBeDeleted) for (RimSummaryCalculationVariable* v : toBeDeleted)
{ {
deleteVariable(v); deleteVariable(v);
} }
@ -205,7 +205,7 @@ bool RimSummaryCalculation::calculate()
for (size_t i = 0; i < m_variables.size(); i++) for (size_t i = 0; i < m_variables.size(); i++)
{ {
RimCalculationVariable* v = m_variables[i]; RimSummaryCalculationVariable* v = m_variables[i];
if (!v->summaryCase()) if (!v->summaryCase())
{ {
@ -302,9 +302,9 @@ QString RimSummaryCalculation::findLeftHandSide(const QString& expresion)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCalculationVariable* RimSummaryCalculation::findByName(const QString& name) const RimSummaryCalculationVariable* RimSummaryCalculation::findByName(const QString& name) const
{ {
for (RimCalculationVariable* v : m_variables) for (RimSummaryCalculationVariable* v : m_variables)
{ {
if (v->name() == name) if (v->name() == name)
{ {
@ -329,7 +329,7 @@ QString RimSummaryCalculation::buildCalculationName() const
name += " ( "; name += " ( ";
for (RimCalculationVariable* v : m_variables) for (RimSummaryCalculationVariable* v : m_variables)
{ {
name += v->summaryAddressDisplayString(); name += v->summaryAddressDisplayString();
@ -350,7 +350,7 @@ QString RimSummaryCalculation::buildCalculationName() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCalculation::updateDependentCurvesAndPlots() void RimSummaryCalculation::updateDependentCurvesAndPlots()
{ {
RimCalculationCollection* calcColl = nullptr; RimSummaryCalculationCollection* calcColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(calcColl); this->firstAncestorOrThisOfTypeAsserted(calcColl);
calcColl->rebuildCaseMetaData(); calcColl->rebuildCaseMetaData();

10
ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
View File

@ -22,7 +22,7 @@
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmField.h" #include "cafPdmField.h"
class RimCalculationVariable; class RimSummaryCalculationVariable;
//================================================================================================== //==================================================================================================
/// ///
@ -39,8 +39,8 @@ public:
QString description() const; QString description() const;
caf::PdmChildArrayFieldHandle* variables(); caf::PdmChildArrayFieldHandle* variables();
RimCalculationVariable* addVariable(); RimSummaryCalculationVariable* addVariable();
void deleteVariable(RimCalculationVariable* calcVariable); void deleteVariable(RimSummaryCalculationVariable* calcVariable);
const std::vector<double>& values() const; const std::vector<double>& values() const;
const std::vector<time_t>& timeSteps() const; const std::vector<time_t>& timeSteps() const;
@ -54,14 +54,14 @@ public:
static QString findLeftHandSide(const QString& expresion); static QString findLeftHandSide(const QString& expresion);
private: private:
RimCalculationVariable* findByName(const QString& name) const; RimSummaryCalculationVariable* findByName(const QString& name) const;
QString buildCalculationName() const; QString buildCalculationName() const;
private: private:
caf::PdmField<QString> m_description; caf::PdmField<QString> m_description;
caf::PdmField<QString> m_expression; caf::PdmField<QString> m_expression;
caf::PdmChildArrayField<RimCalculationVariable*> m_variables; caf::PdmChildArrayField<RimSummaryCalculationVariable*> m_variables;
caf::PdmField<std::vector<double>> m_calculatedValues; caf::PdmField<std::vector<double>> m_calculatedValues;
caf::PdmField<std::vector<time_t>> m_timesteps; caf::PdmField<std::vector<time_t>> m_timesteps;

22
ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp → ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

@ -16,20 +16,20 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
#include "RimSummaryCalculation.h"
#include "RimCalculatedSummaryCase.h" #include "RimCalculatedSummaryCase.h"
#include "RimSummaryCalculation.h"
#include "cafPdmUiGroup.h" #include "cafPdmUiGroup.h"
#include "cafPdmUiTreeSelectionEditor.h" #include "cafPdmUiTreeSelectionEditor.h"
CAF_PDM_SOURCE_INIT(RimCalculationCollection, "RimCalculationCollection"); CAF_PDM_SOURCE_INIT(RimSummaryCalculationCollection, "RimSummaryCalculationCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCalculationCollection::RimCalculationCollection() RimSummaryCalculationCollection::RimSummaryCalculationCollection()
{ {
CAF_PDM_InitObject("Calculation Collection", ":/chain.png", "", ""); CAF_PDM_InitObject("Calculation Collection", ":/chain.png", "", "");
@ -44,7 +44,7 @@ RimCalculationCollection::RimCalculationCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCalculation* RimCalculationCollection::addCalculation() RimSummaryCalculation* RimSummaryCalculationCollection::addCalculation()
{ {
RimSummaryCalculation* calculation = new RimSummaryCalculation; RimSummaryCalculation* calculation = new RimSummaryCalculation;
calculation->setDescription(QString("Calculation %1").arg(m_calcuations.size())); calculation->setDescription(QString("Calculation %1").arg(m_calcuations.size()));
@ -59,7 +59,7 @@ RimSummaryCalculation* RimCalculationCollection::addCalculation()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationCollection::deleteCalculation(RimSummaryCalculation* calculation) void RimSummaryCalculationCollection::deleteCalculation(RimSummaryCalculation* calculation)
{ {
m_calcuations.removeChildObject(calculation); m_calcuations.removeChildObject(calculation);
@ -71,7 +71,7 @@ void RimCalculationCollection::deleteCalculation(RimSummaryCalculation* calculat
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCalculation*> RimCalculationCollection::calculations() const std::vector<RimSummaryCalculation*> RimSummaryCalculationCollection::calculations() const
{ {
std::vector<RimSummaryCalculation*> calcs; std::vector<RimSummaryCalculation*> calcs;
@ -86,7 +86,7 @@ std::vector<RimSummaryCalculation*> RimCalculationCollection::calculations() con
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCase* RimCalculationCollection::calculationSummaryCase() RimSummaryCase* RimSummaryCalculationCollection::calculationSummaryCase()
{ {
return m_calcuationSummaryCase(); return m_calcuationSummaryCase();
} }
@ -94,7 +94,7 @@ RimSummaryCase* RimCalculationCollection::calculationSummaryCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationCollection::deleteAllContainedObjects() void RimSummaryCalculationCollection::deleteAllContainedObjects()
{ {
m_calcuations.deleteAllChildObjects(); m_calcuations.deleteAllChildObjects();
@ -104,7 +104,7 @@ void RimCalculationCollection::deleteAllContainedObjects()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationCollection::rebuildCaseMetaData() void RimSummaryCalculationCollection::rebuildCaseMetaData()
{ {
m_calcuationSummaryCase->buildMetaData(); m_calcuationSummaryCase->buildMetaData();
} }
@ -112,7 +112,7 @@ void RimCalculationCollection::rebuildCaseMetaData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationCollection::initAfterRead() void RimSummaryCalculationCollection::initAfterRead()
{ {
rebuildCaseMetaData(); rebuildCaseMetaData();
} }

4
ApplicationCode/ProjectDataModel/RimCalculationCollection.h → ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.h
View File

@ -30,12 +30,12 @@ class RimCalculatedSummaryCase;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimCalculationCollection : public caf::PdmObject class RimSummaryCalculationCollection : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimCalculationCollection(); RimSummaryCalculationCollection();
RimSummaryCalculation* addCalculation(); RimSummaryCalculation* addCalculation();
void deleteCalculation(RimSummaryCalculation* calculation); void deleteCalculation(RimSummaryCalculation* calculation);

28
ApplicationCode/ProjectDataModel/RimCalculationVariable.cpp → ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@ -16,10 +16,11 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimCalculationVariable.h" #include "RimSummaryCalculationVariable.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
@ -28,17 +29,16 @@
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTableView.h" #include "cafPdmUiTableView.h"
#include "RimSummaryCalculation.h"
CAF_PDM_SOURCE_INIT(RimCalculationVariable, "RimCalculationVariable"); CAF_PDM_SOURCE_INIT(RimSummaryCalculationVariable, "RimSummaryCalculationVariable");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCalculationVariable::RimCalculationVariable() RimSummaryCalculationVariable::RimSummaryCalculationVariable()
{ {
CAF_PDM_InitObject("RimCalculationVariable", ":/octave.png", "RimCalculationVariable", ""); CAF_PDM_InitObject("RimSummaryCalculationVariable", ":/octave.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_name, "VariableName", "Variable Name", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_name, "VariableName", "Variable Name", "", "", "");
m_name.uiCapability()->setUiReadOnly(true); m_name.uiCapability()->setUiReadOnly(true);
@ -48,7 +48,7 @@ RimCalculationVariable::RimCalculationVariable()
m_button.xmlCapability()->disableIO(); m_button.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault(&m_summaryAddressUi, "SummaryAddressUi", "Summary Address", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_summaryAddressUi, "SummaryAddressUi", "Summary Address", "", "", "");
m_summaryAddressUi.registerGetMethod(this, &RimCalculationVariable::summaryAddressDisplayString); m_summaryAddressUi.registerGetMethod(this, &RimSummaryCalculationVariable::summaryAddressDisplayString);
m_summaryAddressUi.xmlCapability()->disableIO(); m_summaryAddressUi.xmlCapability()->disableIO();
m_summaryAddressUi.uiCapability()->setUiReadOnly(true); m_summaryAddressUi.uiCapability()->setUiReadOnly(true);
@ -61,7 +61,7 @@ RimCalculationVariable::RimCalculationVariable()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimCalculationVariable::name() const QString RimSummaryCalculationVariable::name() const
{ {
return m_name; return m_name;
} }
@ -69,7 +69,7 @@ QString RimCalculationVariable::name() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationVariable::setName(const QString& name) void RimSummaryCalculationVariable::setName(const QString& name)
{ {
m_name = name; m_name = name;
} }
@ -77,7 +77,7 @@ void RimCalculationVariable::setName(const QString& name)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimSummaryCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (changedField == &m_button) if (changedField == &m_button)
{ {
@ -126,7 +126,7 @@ void RimCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle* changed
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimCalculationVariable::summaryAddressDisplayString() const QString RimSummaryCalculationVariable::summaryAddressDisplayString() const
{ {
QString caseName; QString caseName;
if (m_case()) caseName = m_case->shortName(); if (m_case()) caseName = m_case->shortName();
@ -148,7 +148,7 @@ QString RimCalculationVariable::summaryAddressDisplayString() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCase* RimCalculationVariable::summaryCase() RimSummaryCase* RimSummaryCalculationVariable::summaryCase()
{ {
return m_case(); return m_case();
} }
@ -156,7 +156,7 @@ RimSummaryCase* RimCalculationVariable::summaryCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryAddress* RimCalculationVariable::summaryAddress() RimSummaryAddress* RimSummaryCalculationVariable::summaryAddress()
{ {
return m_summaryAddress(); return m_summaryAddress();
} }
@ -164,7 +164,7 @@ RimSummaryAddress* RimCalculationVariable::summaryAddress()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationVariable::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimSummaryCalculationVariable::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&m_name); uiOrdering.add(&m_name);
uiOrdering.add(&m_summaryAddressUi); uiOrdering.add(&m_summaryAddressUi);
@ -176,7 +176,7 @@ void RimCalculationVariable::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationVariable::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void RimSummaryCalculationVariable::defineObjectEditorAttribute(QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{ {
caf::PdmUiTableViewEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>(attribute); caf::PdmUiTableViewEditorAttribute* attr = dynamic_cast<caf::PdmUiTableViewEditorAttribute*>(attribute);
if (attr) if (attr)

4
ApplicationCode/ProjectDataModel/RimCalculationVariable.h → ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h
View File

@ -33,12 +33,12 @@ class RimSummaryAddress;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimCalculationVariable : public caf::PdmObject class RimSummaryCalculationVariable : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimCalculationVariable(); RimSummaryCalculationVariable();
QString name() const; QString name() const;
void setName(const QString& name); void setName(const QString& name);

6
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
View File

@ -19,7 +19,7 @@
#include "RimCalculatedSummaryCase.h" #include "RimCalculatedSummaryCase.h"
#include "RimSummaryCalculation.h" #include "RimSummaryCalculation.h"
#include "RimCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
CAF_PDM_SOURCE_INIT(RimCalculatedSummaryCase,"CalculatedSummaryCase"); CAF_PDM_SOURCE_INIT(RimCalculatedSummaryCase,"CalculatedSummaryCase");
@ -55,7 +55,7 @@ void RimCalculatedSummaryCase::createSummaryReaderInterface()
{ {
if (!m_calculatedCurveReader) if (!m_calculatedCurveReader)
{ {
RimCalculationCollection* calculationCollection = nullptr; RimSummaryCalculationCollection* calculationCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(calculationCollection); this->firstAncestorOrThisOfTypeAsserted(calculationCollection);
m_calculatedCurveReader = new RifCalculatedSummaryCurveReader(calculationCollection); m_calculatedCurveReader = new RifCalculatedSummaryCurveReader(calculationCollection);
@ -100,7 +100,7 @@ void RimCalculatedSummaryCase::buildMetaData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryCurveReader(RimCalculationCollection* calculationCollection) RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection)
: m_calculationCollection(calculationCollection) : m_calculationCollection(calculationCollection)
{ {

6
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.h
View File

@ -21,7 +21,7 @@
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RifSummaryReaderInterface.h" #include "RifSummaryReaderInterface.h"
class RimCalculationCollection; class RimSummaryCalculationCollection;
class RimSummaryCalculation; class RimSummaryCalculation;
@ -39,7 +39,7 @@ private:
class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface class RifCalculatedSummaryCurveReader : public RifSummaryReaderInterface
{ {
public: public:
explicit RifCalculatedSummaryCurveReader(RimCalculationCollection* calculationCollection); explicit RifCalculatedSummaryCurveReader(RimSummaryCalculationCollection* calculationCollection);
virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override; virtual const std::vector<time_t>& timeSteps(const RifEclipseSummaryAddress& resultAddress) const override;
virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override; virtual bool values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const override;
@ -51,7 +51,7 @@ private:
RimSummaryCalculation* findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const; RimSummaryCalculation* findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const;
private: private:
caf::PdmPointer<RimCalculationCollection> m_calculationCollection; caf::PdmPointer<RimSummaryCalculationCollection> m_calculationCollection;
}; };
public: public:

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -23,7 +23,7 @@
#include "RifReaderEclipseSummary.h" #include "RifReaderEclipseSummary.h"
#include "RimCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"

6
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@ -24,13 +24,13 @@
#include "RifEclipseSummaryAddress.h" #include "RifEclipseSummaryAddress.h"
#include "RifSummaryReaderInterface.h" #include "RifSummaryReaderInterface.h"
#include "RimSummaryCalculation.h"
#include "RimCalculatedSummaryCase.h" #include "RimCalculatedSummaryCase.h"
#include "RimCalculationCollection.h"
#include "RimObservedData.h" #include "RimObservedData.h"
#include "RimObservedDataCollection.h" #include "RimObservedDataCollection.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h" #include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h" #include "RimSummaryCaseMainCollection.h"
@ -880,7 +880,7 @@ std::vector<RimSummaryCase*> RiuSummaryCurveDefSelection::summaryCases() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCase* RiuSummaryCurveDefSelection::calculatedSummaryCase() RimSummaryCase* RiuSummaryCurveDefSelection::calculatedSummaryCase()
{ {
RimCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection(); RimSummaryCalculationCollection* calcColl = RiaApplication::instance()->project()->calculationCollection();
return calcColl->calculationSummaryCase(); return calcColl->calculationSummaryCase();
} }