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

Corrected spelling of ensemble

Browse Source
This commit is contained in:
Jacob Støren
2018-05-04 17:21:06 +02:00
parent 7421a3f7cd
commit 4108c72680
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -127,7 +127,7 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
CAF_PDM_InitFieldNoDefault(&m_legendConfig, "LegendConfig", "", "", "", "");
m_legendConfig = new RimRegularLegendConfig();
CAF_PDM_InitField(&m_userDefinedName, "UserDefinedName", QString("Ensamble Curve Set"), "Curve Set Name", "", "", "");
CAF_PDM_InitField(&m_userDefinedName, "UserDefinedName", QString("Ensemble Curve Set"), "Curve Set Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_autoGeneratedName, "AutoGeneratedName", "Curve Set Name", "", "", "");
m_autoGeneratedName.registerGetMethod(this, &RimEnsembleCurveSet::createAutoName);

14
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@@ -85,11 +85,11 @@ QString RimSummaryCurveAutoName::curveNameY(const RifEclipseSummaryAddress& summ
QString caseName;
{
RimEnsembleCurveSet* ensambleCurveSet = nullptr;
this->firstAncestorOrThisOfType(ensambleCurveSet);
if (ensambleCurveSet && ensambleCurveSet->summaryCaseCollection())
RimEnsembleCurveSet* ensembleCurveSet = nullptr;
this->firstAncestorOrThisOfType(ensembleCurveSet);
if (ensembleCurveSet && ensembleCurveSet->summaryCaseCollection())
{
caseName = ensambleCurveSet->summaryCaseCollection()->name();
caseName = ensembleCurveSet->summaryCaseCollection()->name();
}
}
@@ -359,10 +359,10 @@ void RimSummaryCurveAutoName::fieldChangedByUi(const caf::PdmFieldHandle* change
}
{
auto ensambleCurveSet = dynamic_cast<RimEnsembleCurveSet*>(this->parentField()->ownerObject());
if (ensambleCurveSet)
auto ensembleCurveSet = dynamic_cast<RimEnsembleCurveSet*>(this->parentField()->ownerObject());
if (ensembleCurveSet)
{
ensambleCurveSet->updateConnectedEditors();
ensembleCurveSet->updateConnectedEditors();
return;
}

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

@@ -1460,7 +1460,7 @@ QString RimSummaryPlot::generatePlotTitle(RimSummaryPlotNameHelper* nameHelper)
std::vector<RifEclipseSummaryAddress> addresses;
std::vector<RimSummaryCase*> sumCases;
std::vector<RimSummaryCaseCollection*> ensambleCases;
std::vector<RimSummaryCaseCollection*> ensembleCases;
if (m_summaryCurveCollection && m_summaryCurveCollection->isCurvesVisible())
{
@@ -1489,14 +1489,14 @@ QString RimSummaryPlot::generatePlotTitle(RimSummaryPlotNameHelper* nameHelper)
if (curveSet->isCurvesVisible())
{
addresses.push_back(curveSet->summaryAddress());
ensambleCases.push_back(curveSet->summaryCaseCollection());
ensembleCases.push_back(curveSet->summaryCaseCollection());
}
}
nameHelper->clear();
nameHelper->appendAddresses(addresses);
nameHelper->appendSummaryCases(sumCases);
nameHelper->appendEnsembleCases(ensambleCases);
nameHelper->appendEnsembleCases(ensembleCases);
return nameHelper->plotTitle();
}