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

#2031 Curve Calculator : Consolidate generation of address text

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-24 09:57:32 +02:00
parent 035e2ccaf9
commit 605d3c25d6
4 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Application/RiaSummaryCurveDefinition.h
View File

@ -46,9 +46,10 @@ public:
QString curveDefinitionText() const; QString curveDefinitionText() const;
private:
static QString curveDefinitionText(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& summaryAddress); static QString curveDefinitionText(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& summaryAddress);
private:
private: private:
std::pair<RimSummaryCase*, RifEclipseSummaryAddress> m_curveDefinition; std::pair<RimSummaryCase*, RifEclipseSummaryAddress> m_curveDefinition;
}; };

9
ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@ -49,7 +49,7 @@ RimSummaryCalculation::RimSummaryCalculation()
CAF_PDM_InitFieldNoDefault(&m_description, "Description", "Description", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_description, "Description", "Description", "", "", "");
m_description.uiCapability()->setUiReadOnly(true); m_description.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_expression, "Expression", "Expression", "", "", ""); CAF_PDM_InitField(&m_expression, "Expression", QString("variableName := a"), "Expression", "", "", "");
m_expression.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName()); m_expression.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_variables, "Variables", "Variables", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_variables, "Variables", "Variables", "", "", "");
@ -85,9 +85,11 @@ caf::PdmChildArrayFieldHandle* RimSummaryCalculation::variables()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCalculationVariable* RimSummaryCalculation::addVariable() RimSummaryCalculationVariable* RimSummaryCalculation::addVariable(const QString& name)
{ {
RimSummaryCalculationVariable* v = new RimSummaryCalculationVariable; RimSummaryCalculationVariable* v = new RimSummaryCalculationVariable;
v->setName(name);
m_variables.push_back(v); m_variables.push_back(v);
return v; return v;
@ -176,8 +178,7 @@ bool RimSummaryCalculation::parseExpression()
{ {
if (!findByName(variableName)) if (!findByName(variableName))
{ {
auto v = this->addVariable(); this->addVariable(variableName);
v->setName(variableName);
} }
} }
} }

4
ApplicationCode/ProjectDataModel/RimSummaryCalculation.h
View File

@ -39,8 +39,6 @@ public:
QString description() const; QString description() const;
caf::PdmChildArrayFieldHandle* variables(); caf::PdmChildArrayFieldHandle* variables();
RimSummaryCalculationVariable* addVariable();
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;
@ -55,6 +53,8 @@ public:
private: private:
RimSummaryCalculationVariable* findByName(const QString& name) const; RimSummaryCalculationVariable* findByName(const QString& name) const;
RimSummaryCalculationVariable* addVariable(const QString& name);
void deleteVariable(RimSummaryCalculationVariable* calcVariable);
QString buildCalculationName() const; QString buildCalculationName() const;

16
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@ -129,21 +129,7 @@ void RimSummaryCalculationVariable::fieldChangedByUi(const caf::PdmFieldHandle*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimSummaryCalculationVariable::summaryAddressDisplayString() const QString RimSummaryCalculationVariable::summaryAddressDisplayString() const
{ {
QString caseName; return RiaSummaryCurveDefinition::curveDefinitionText(m_case(), m_summaryAddress()->address());
if (m_case()) caseName = m_case->shortName();
QString summaryCurvename = QString::fromStdString(m_summaryAddress()->address().uiText());
QString txt;
if (!caseName.isEmpty())
{
txt = caseName;
txt += " : ";
}
txt += summaryCurvename;
return txt;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------