From 4029953c24b715def52be7386a784648f29aeb7d Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Fri, 29 Nov 2019 14:00:22 +0100
Subject: [PATCH] Rename SummaryYAxisFormatter (it isn't just for the Y-axis)

---
 .../Summary/CMakeLists_files.cmake            |  4 ++--
 .../Summary/RimSummaryPlot.cpp                | 22 +++++++++----------
 ...or.cpp => RimSummaryPlotAxisFormatter.cpp} | 16 +++++++-------
 ...ulator.h => RimSummaryPlotAxisFormatter.h} | 12 +++++-----
 4 files changed, 27 insertions(+), 27 deletions(-)
 rename ApplicationCode/ProjectDataModel/Summary/{RimSummaryCurvesCalculator.cpp => RimSummaryPlotAxisFormatter.cpp} (93%)
 rename ApplicationCode/ProjectDataModel/Summary/{RimSummaryCurvesCalculator.h => RimSummaryPlotAxisFormatter.h} (74%)

diff --git a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
index 27f61f9f4e..2de9d1ed87 100644
--- a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
+++ b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
@@ -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
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
index 865d8edf5b..d62ef1a34b 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/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
     {
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
similarity index 93%
rename from ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
rename to ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
index 1ca8e8b445..c958aa7816 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
@@ -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 );
 
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
similarity index 74%
rename from ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h
rename to ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
index f2cf333380..af835c897e 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.h
@@ -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;