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

Revert "2108 summary plot. Display short name in plot for calculated curves"

Browse Source 
This reverts commit 83a272296c.
This commit is contained in:
Bjørn Erik Jensen
2017-12-01 15:14:47 +01:00
committed by Magne Sjaastad
parent 574c5ec466
commit c1537664e3
4 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,18 +357,6 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(const std::
curve->applyCurveAutoNameSettings(*m_curveNameConfig()); curve->applyCurveAutoNameSettings(*m_curveNameConfig());
m_previewPlot->addCurveNoUpdate(curve); m_previewPlot->addCurveNoUpdate(curve);
curveLookCalc.setupCurveLook(curve); curveLookCalc.setupCurveLook(curve);
if (curveDef.summaryAddress().category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED)
{
// Use short version of calculated curves name
std::string fullName = curveDef.summaryAddress().quantityName();
size_t firstSpace = fullName.find_first_of(' ');
QString shortName = firstSpace != std::string::npos ?
QString::fromStdString(fullName.substr(0, firstSpace)) :
QString::fromStdString(fullName);
curve->setCustomCurveName(shortName);
}
} }
m_previewPlot->loadDataAndUpdate(); m_previewPlot->loadDataAndUpdate();

9
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -552,15 +552,6 @@ void RimPlotCurve::setZOrder(double z)
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::setCustomCurveName(const QString& customName)
{
m_isUsingAutoName = false;
m_customCurveName = customName;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@@ -99,7 +99,6 @@ public:
void showLegend(bool show); void showLegend(bool show);
void setZOrder(double z); void setZOrder(double z);
void setCustomCurveName(const QString& customName);
protected: protected:

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
View File

@@ -206,7 +206,7 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
{ {
for (RimSummaryCurve* rimCurve : m_summaryCurves) for (RimSummaryCurve* rimCurve : m_summaryCurves)
{ {
unitToQuantityNameMap[rimCurve->unitNameX()].insert(rimCurve->curveName().toStdString()); unitToQuantityNameMap[rimCurve->unitNameX()].insert(rimCurve->summaryAddressX().quantityName());
} }
} }
else else
@@ -215,7 +215,7 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
{ {
if ( rimCurve->axisY() == this->m_axisProperties->plotAxisType() ) if ( rimCurve->axisY() == this->m_axisProperties->plotAxisType() )
{ {
unitToQuantityNameMap[rimCurve->unitNameY()].insert(rimCurve->curveName().toStdString()); unitToQuantityNameMap[rimCurve->unitNameY()].insert(rimCurve->summaryAddressY().quantityName());
} }
} }
} }