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

Rename SummaryYAxisFormatter (it isn't just for the Y-axis)

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-11-29 14:00:22 +01:00
parent ec4194c0b0
commit 4029953c24
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@ -10,7 +10,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurve.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.h ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAppearanceCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.h ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveFilter.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}/RimSummaryFilter.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.h
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.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}/RimSummaryCurveAppearanceCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.cpp ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveAutoName.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveFilter.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}/RimSummaryFilter.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimSummaryCurveCollection.cpp
${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.cpp ${CMAKE_CURRENT_LIST_DIR}/RimSummaryPlot.cpp

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

@ -40,7 +40,7 @@
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h" #include "RimSummaryCurveCollection.h"
#include "RimSummaryCurveFilter.h" #include "RimSummaryCurveFilter.h"
#include "RimSummaryCurvesCalculator.h" #include "RimSummaryPlotAxisFormatter.h"
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
#include "RimSummaryPlotFilterTextCurveSetEditor.h" #include "RimSummaryPlotFilterTextCurveSetEditor.h"
#include "RimSummaryPlotNameHelper.h" #include "RimSummaryPlotNameHelper.h"
@ -807,11 +807,11 @@ void RimSummaryPlot::updateYAxis( RiaDefines::PlotAxis plotAxis )
timeHistoryQuantities.insert( c->quantityName() ); timeHistoryQuantities.insert( c->quantityName() );
} }
RimSummaryPlotYAxisFormatter calc( yAxisProperties, RimSummaryPlotAxisFormatter calc( yAxisProperties,
visibleSummaryCurvesForAxis( plotAxis ), visibleSummaryCurvesForAxis( plotAxis ),
visibleAsciiDataCurvesForAxis( plotAxis ), visibleAsciiDataCurvesForAxis( plotAxis ),
timeHistoryQuantities ); timeHistoryQuantities );
calc.applyYAxisPropertiesToPlot( m_plotWidget ); calc.applyAxisPropertiesToPlot( m_plotWidget );
} }
else else
{ {
@ -1108,11 +1108,11 @@ void RimSummaryPlot::updateBottomXAxis()
std::set<QString> timeHistoryQuantities; std::set<QString> timeHistoryQuantities;
RimSummaryPlotYAxisFormatter calc( bottomAxisProperties, RimSummaryPlotAxisFormatter calc( bottomAxisProperties,
visibleSummaryCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ), visibleSummaryCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
visibleAsciiDataCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ), visibleAsciiDataCurvesForAxis( RiaDefines::PLOT_AXIS_BOTTOM ),
timeHistoryQuantities ); timeHistoryQuantities );
calc.applyYAxisPropertiesToPlot( m_plotWidget ); calc.applyAxisPropertiesToPlot( m_plotWidget );
} }
else else
{ {

16
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp → ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryCurvesCalculator.h" #include "RimSummaryPlotAxisFormatter.h"
#include "RiaDefines.h" #include "RiaDefines.h"
@ -92,10 +92,10 @@ private:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter( RimPlotAxisProperties* axisProperties, RimSummaryPlotAxisFormatter::RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves, const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RimAsciiDataCurve*>& asciiCurves, const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities ) const std::set<QString>& timeHistoryCurveQuantities )
: m_axisProperties( axisProperties ) : m_axisProperties( axisProperties )
, m_summaryCurves( summaryCurves ) , m_summaryCurves( summaryCurves )
, m_asciiDataCurves( asciiCurves ) , m_asciiDataCurves( asciiCurves )
@ -106,7 +106,7 @@ RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter( RimPlotAxisPropertie
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlotYAxisFormatter::applyYAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot ) void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot )
{ {
if ( !qwtPlot ) return; 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; 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 ); QString calculationShortName = QString::fromStdString( calculationName );

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h → ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
View File

@ -32,15 +32,15 @@ class RiuSummaryQwtPlot;
class QwtPlotCurve; class QwtPlotCurve;
class RimSummaryPlotYAxisFormatter class RimSummaryPlotAxisFormatter
{ {
public: public:
RimSummaryPlotYAxisFormatter( RimPlotAxisProperties* axisProperties, RimSummaryPlotAxisFormatter( RimPlotAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves, const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RimAsciiDataCurve*>& asciiCurves, const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities ); const std::set<QString>& timeHistoryCurveQuantities );
void applyYAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot ); void applyAxisPropertiesToPlot( RiuSummaryQwtPlot* qwtPlot );
private: private:
QString autoAxisTitle() const; QString autoAxisTitle() const;