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

#5599

Browse Source
This commit is contained in:
Jacob Støren
2020-02-28 14:51:21 +01:00
parent a1cbfa5175
commit 186332e707
7 changed files with 197 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -827,6 +827,7 @@ void RimSummaryPlot::updateYAxis( RiaDefines::PlotAxis plotAxis )
RimSummaryPlotAxisFormatter calc( yAxisProperties,
visibleSummaryCurvesForAxis( plotAxis ),
{},
visibleAsciiDataCurvesForAxis( plotAxis ),
timeHistoryQuantities );
calc.applyAxisPropertiesToPlot( m_plotWidget );
@@ -1154,6 +1155,7 @@ void RimSummaryPlot::updateBottomXAxis()
RimSummaryPlotAxisFormatter calc( bottomAxisProperties,
visibleSummaryCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
{},
visibleAsciiDataCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
timeHistoryQuantities );
calc.applyAxisPropertiesToPlot( m_plotWidget );

105
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@@ -20,8 +20,12 @@
#include "RiaDefines.h"
#include "RifSummaryReaderInterface.h"
#include "RimAsciiDataCurve.h"
#include "RimPlotAxisProperties.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RiuSummaryQuantityNameInfoProvider.h"
@@ -90,12 +94,14 @@ private:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlotAxisFormatter::RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RimAsciiDataCurve*>& asciiCurves,
RimSummaryPlotAxisFormatter::RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RiaSummaryCurveDefinition>& curveDefinitions,
const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities )
: m_axisProperties( axisProperties )
, m_summaryCurves( summaryCurves )
, m_curveDefinitions( curveDefinitions )
, m_asciiDataCurves( asciiCurves )
, m_timeHistoryCurveQuantities( timeHistoryCurveQuantities )
{
@@ -104,7 +110,7 @@ RimSummaryPlotAxisFormatter::RimSummaryPlotAxisFormatter( RimPlotAxisProperties*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot )
void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuQwtPlotWidget* qwtPlot )
{
if ( !qwtPlot ) return;
@@ -176,6 +182,46 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const
{
std::map<std::string, std::set<std::string>> unitToQuantityNameMap;
// clang-format off
auto addToUnitToQuantityMap =[&]( const std::string& unitText,
const RifEclipseSummaryAddress& sumAddress )
{
std::string quantityNameForDisplay;
const std::string& quantityName = sumAddress.quantityName();
if ( sumAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
{
quantityNameForDisplay = shortCalculationName( quantityName );
}
else
{
if ( m_axisProperties->showDescription() )
{
quantityNameForDisplay =
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( quantityName );
}
if ( m_axisProperties->showAcronym() )
{
if ( !quantityNameForDisplay.empty() )
{
quantityNameForDisplay += " (";
quantityNameForDisplay += quantityName;
quantityNameForDisplay += ")";
}
}
if ( quantityNameForDisplay.empty() )
{
quantityNameForDisplay = quantityName;
}
}
unitToQuantityNameMap[unitText].insert( quantityNameForDisplay );
};
// clang-format on
for ( RimSummaryCurve* rimCurve : m_summaryCurves )
{
RifEclipseSummaryAddress sumAddress;
@@ -200,40 +246,27 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const
continue;
}
std::string quantityNameForDisplay;
addToUnitToQuantityMap( unitText, sumAddress );
}
for ( const RiaSummaryCurveDefinition& curveDef : m_curveDefinitions )
{
RifEclipseSummaryAddress sumAddress = curveDef.summaryAddress();
std::string unitText;
if ( curveDef.summaryCase() && curveDef.summaryCase()->summaryReader() )
{
const std::string& quantityName = sumAddress.quantityName();
if ( sumAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED )
{
quantityNameForDisplay = shortCalculationName( quantityName );
}
else
{
if ( m_axisProperties->showDescription() )
{
quantityNameForDisplay =
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( quantityName );
}
if ( m_axisProperties->showAcronym() )
{
if ( !quantityNameForDisplay.empty() )
{
quantityNameForDisplay += " (";
quantityNameForDisplay += quantityName;
quantityNameForDisplay += ")";
}
}
if ( quantityNameForDisplay.empty() )
{
quantityNameForDisplay = quantityName;
}
}
unitToQuantityNameMap[unitText].insert( quantityNameForDisplay );
unitText = curveDef.summaryCase()->summaryReader()->unitName( sumAddress );
}
else if ( curveDef.ensemble() )
{
std::vector<RimSummaryCase*> sumCases = curveDef.ensemble()->allSummaryCases();
if ( sumCases.size() && sumCases[0] && sumCases[0]->summaryReader() )
{
unitText = sumCases[0]->summaryReader()->unitName( sumAddress );
}
}
addToUnitToQuantityMap( unitText, sumAddress );
}
QString assembledYAxisText;

24
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
View File

@@ -24,23 +24,26 @@
#include <qwt_plot.h>
#include "RiaSummaryCurveDefinition.h"
class RimAsciiDataCurve;
class RimSummaryCurve;
class RimPlotAxisProperties;
class RiuSummaryQwtPlot;
class RiuQwtPlotWidget;
class QwtPlotCurve;
class RimSummaryPlotAxisFormatter
{
public:
RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities );
RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RiaSummaryCurveDefinition>& curveDefinitions,
const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities );
void applyAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot );
void applyAxisPropertiesToPlot( RiuQwtPlotWidget* qwtPlot );
private:
QString autoAxisTitle() const;
@@ -48,8 +51,9 @@ private:
static std::string shortCalculationName( const std::string& calculationName );
private:
RimPlotAxisProperties* m_axisProperties;
const std::vector<RimSummaryCurve*> m_summaryCurves;
const std::vector<RimAsciiDataCurve*> m_asciiDataCurves;
const std::set<QString> m_timeHistoryCurveQuantities;
RimPlotAxisProperties* m_axisProperties;
const std::vector<RimSummaryCurve*> m_summaryCurves;
const std::vector<RiaSummaryCurveDefinition> m_curveDefinitions;
const std::vector<RimAsciiDataCurve*> m_asciiDataCurves;
const std::set<QString> m_timeHistoryCurveQuantities;
};