mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Rename SummaryYAxisFormatter (it isn't just for the Y-axis)
This commit is contained in:
parent
ec4194c0b0
commit
4029953c24
@ -10,7 +10,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveFilter.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesCalculator.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotAxisFormatter.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryFilter.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.h
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.h
|
||||
@ -50,7 +50,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveFilter.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurvesCalculator.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlotAxisFormatter.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryFilter.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.cpp
|
||||
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.cpp
|
||||
|
@ -40,7 +40,7 @@
|
||||
#include "RimSummaryCurve.h"
|
||||
#include "RimSummaryCurveCollection.h"
|
||||
#include "RimSummaryCurveFilter.h"
|
||||
#include "RimSummaryCurvesCalculator.h"
|
||||
#include "RimSummaryPlotAxisFormatter.h"
|
||||
#include "RimSummaryPlotCollection.h"
|
||||
#include "RimSummaryPlotFilterTextCurveSetEditor.h"
|
||||
#include "RimSummaryPlotNameHelper.h"
|
||||
@ -807,11 +807,11 @@ void RimSummaryPlot::updateYAxis( RiaDefines::PlotAxis plotAxis )
|
||||
timeHistoryQuantities.insert( c->quantityName() );
|
||||
}
|
||||
|
||||
RimSummaryPlotYAxisFormatter calc( yAxisProperties,
|
||||
visibleSummaryCurvesForAxis( plotAxis ),
|
||||
visibleAsciiDataCurvesForAxis( plotAxis ),
|
||||
timeHistoryQuantities );
|
||||
calc.applyYAxisPropertiesToPlot( m_plotWidget );
|
||||
RimSummaryPlotAxisFormatter calc( yAxisProperties,
|
||||
visibleSummaryCurvesForAxis( plotAxis ),
|
||||
visibleAsciiDataCurvesForAxis( plotAxis ),
|
||||
timeHistoryQuantities );
|
||||
calc.applyAxisPropertiesToPlot( m_plotWidget );
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1108,11 +1108,11 @@ void RimSummaryPlot::updateBottomXAxis()
|
||||
|
||||
std::set<QString> timeHistoryQuantities;
|
||||
|
||||
RimSummaryPlotYAxisFormatter calc( bottomAxisProperties,
|
||||
visibleSummaryCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
|
||||
visibleAsciiDataCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
|
||||
timeHistoryQuantities );
|
||||
calc.applyYAxisPropertiesToPlot( m_plotWidget );
|
||||
RimSummaryPlotAxisFormatter calc( bottomAxisProperties,
|
||||
visibleSummaryCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
|
||||
visibleAsciiDataCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
|
||||
timeHistoryQuantities );
|
||||
calc.applyAxisPropertiesToPlot( m_plotWidget );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -16,7 +16,7 @@
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "RimSummaryCurvesCalculator.h"
|
||||
#include "RimSummaryPlotAxisFormatter.h"
|
||||
|
||||
#include "RiaDefines.h"
|
||||
|
||||
@ -92,10 +92,10 @@ private:
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter( RimPlotAxisProperties* axisProperties,
|
||||
const std::vector<RimSummaryCurve*>& summaryCurves,
|
||||
const std::vector<RimAsciiDataCurve*>& asciiCurves,
|
||||
const std::set<QString>& timeHistoryCurveQuantities )
|
||||
RimSummaryPlotAxisFormatter::RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
|
||||
const std::vector<RimSummaryCurve*>& summaryCurves,
|
||||
const std::vector<RimAsciiDataCurve*>& asciiCurves,
|
||||
const std::set<QString>& timeHistoryCurveQuantities )
|
||||
: m_axisProperties( axisProperties )
|
||||
, m_summaryCurves( summaryCurves )
|
||||
, m_asciiDataCurves( asciiCurves )
|
||||
@ -106,7 +106,7 @@ RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter( RimPlotAxisPropertie
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimSummaryPlotYAxisFormatter::applyYAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot )
|
||||
void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot )
|
||||
{
|
||||
if ( !qwtPlot ) return;
|
||||
|
||||
@ -180,7 +180,7 @@ void RimSummaryPlotYAxisFormatter::applyYAxisPropertiesToPlot( RiuSummaryQwtPlot
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
|
||||
QString RimSummaryPlotAxisFormatter::autoAxisTitle() const
|
||||
{
|
||||
std::map<std::string, std::set<std::string>> unitToQuantityNameMap;
|
||||
|
||||
@ -289,7 +289,7 @@ QString RimSummaryPlotYAxisFormatter::autoAxisTitle() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::string RimSummaryPlotYAxisFormatter::shortCalculationName( const std::string& calculationName )
|
||||
std::string RimSummaryPlotAxisFormatter::shortCalculationName( const std::string& calculationName )
|
||||
{
|
||||
QString calculationShortName = QString::fromStdString( calculationName );
|
||||
|
@ -32,15 +32,15 @@ class RiuSummaryQwtPlot;
|
||||
|
||||
class QwtPlotCurve;
|
||||
|
||||
class RimSummaryPlotYAxisFormatter
|
||||
class RimSummaryPlotAxisFormatter
|
||||
{
|
||||
public:
|
||||
RimSummaryPlotYAxisFormatter( 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<RimAsciiDataCurve*>& asciiCurves,
|
||||
const std::set<QString>& timeHistoryCurveQuantities );
|
||||
|
||||
void applyYAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot );
|
||||
void applyAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot );
|
||||
|
||||
private:
|
||||
QString autoAxisTitle() const;
|
Loading…
Reference in New Issue
Block a user