Simplify use of RimContourMapProjection

OPM · Jan 13, 2025 · 4b2798e · 4b2798e
1 parent 36c92dc
commit 4b2798e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp b/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.cpp
@@ -27,9 +27,7 @@
 #include "RigContourMapProjection.h"
 
 #include "RimContourMapProjection.h"
-#include "RimEclipseContourMapProjection.h"
 #include "RimEclipseContourMapView.h"
-#include "RimGeoMechContourMapProjection.h"
 #include "RimGeoMechContourMapView.h"
 #include "RimProject.h"
 #include "RimViewWindow.h"

diff --git a/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.h b/ApplicationLibCode/Commands/RicExportContourMapToTextFeature.h
@@ -41,6 +41,8 @@ class RicExportContourMapToTextFeature : public caf::CmdFeature, public RicfComm
     RicExportContourMapToTextFeature();
     caf::PdmScriptResponse execute() override;
 
+    static std::pair<RimEclipseContourMapView*, RimGeoMechContourMapView*> findContourMapView();
+
 protected:
     bool isCommandEnabled() const override;
     void onActionTriggered( bool isChecked ) override;
@@ -57,9 +59,6 @@ class RicExportContourMapToTextFeature : public caf::CmdFeature, public RicfComm
                                          const QString&                 undefinedValueLabel,
                                          bool                           excludeUndefinedValues );
 
-private:
-    static std::pair<RimEclipseContourMapView*, RimGeoMechContourMapView*> findContourMapView();
-
 private:
     caf::PdmField<QString> m_exportFileName;
     caf::PdmField<bool>    m_exportLocalCoordinates;

diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.cpp
@@ -77,7 +77,7 @@ RimGeoMechContourMapView::RimGeoMechContourMapView()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RimGeoMechContourMapProjection* RimGeoMechContourMapView::contourMapProjection() const
+RimContourMapProjection* RimGeoMechContourMapView::contourMapProjection() const
 {
     return m_contourMapProjection().p();
 }

diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.h b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapView.h
@@ -23,6 +23,7 @@
 
 enum class RimLegendConfigChangeType;
 class RimGeoMechContourMapProjection;
+class RimContourMapProjection;
 class RimRegularLegendConfig;
 class RimViewNameConfig;
 class RimScaleLegendConfig;
@@ -34,7 +35,7 @@ class RimGeoMechContourMapView : public RimGeoMechView
 
 public:
     RimGeoMechContourMapView();
-    RimGeoMechContourMapProjection* contourMapProjection() const;
+    RimContourMapProjection* contourMapProjection() const;
 
     RiaDefines::View3dContent viewContent() const override;
 

diff --git a/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp b/ApplicationLibCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@@ -52,7 +52,6 @@
 #include "RimEclipseView.h"
 #include "RimFaultInViewCollection.h"
 #include "RimGeoMechCase.h"
-#include "RimGeoMechContourMapProjection.h"
 #include "RimGeoMechContourMapView.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGeoMechView.h"

diff --git a/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp b/ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp
@@ -33,7 +33,6 @@
 #include "RimEclipseContourMapView.h"
 #include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
-#include "RimGeoMechContourMapProjection.h"
 #include "RimGeoMechContourMapView.h"
 #include "RimGeoMechResultDefinition.h"
 #include "RimGeoMechView.h"