diff --git a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake index 036c54b2c2..411f26d86c 100644 --- a/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/CMakeLists_files.cmake @@ -120,7 +120,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogCurveCommonDataSource.h ${CMAKE_CURRENT_LIST_DIR}/RimContourMapProjection.h ${CMAKE_CURRENT_LIST_DIR}/RimContourMapView.h ${CMAKE_CURRENT_LIST_DIR}/RimContourMapViewCollection.h -${CMAKE_CURRENT_LIST_DIR}/RimContourMapNameConfig.h +${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.h ${CMAKE_CURRENT_LIST_DIR}/RimScaleLegendConfig.h ) @@ -246,7 +246,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RimWellLogCurveCommonDataSource.cpp ${CMAKE_CURRENT_LIST_DIR}/RimContourMapProjection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimContourMapView.cpp ${CMAKE_CURRENT_LIST_DIR}/RimContourMapViewCollection.cpp -${CMAKE_CURRENT_LIST_DIR}/RimContourMapNameConfig.cpp +${CMAKE_CURRENT_LIST_DIR}/RimViewNameConfig.cpp ${CMAKE_CURRENT_LIST_DIR}/RimScaleLegendConfig.cpp ) diff --git a/ApplicationCode/ProjectDataModel/RimContourMapView.cpp b/ApplicationCode/ProjectDataModel/RimContourMapView.cpp index 4b6157112e..2adda7923f 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapView.cpp +++ b/ApplicationCode/ProjectDataModel/RimContourMapView.cpp @@ -25,7 +25,7 @@ #include "RimAnnotationInViewCollection.h" #include "RimCase.h" #include "RimCellRangeFilterCollection.h" -#include "RimContourMapNameConfig.h" +#include "RimViewNameConfig.h" #include "RimContourMapProjection.h" #include "RimEclipseCellColors.h" #include "RimEclipseFaultColors.h" @@ -62,7 +62,7 @@ RimContourMapView::RimContourMapView() setFaultVisParameters(); CAF_PDM_InitFieldNoDefault(&m_nameConfig, "NameConfig", "", "", "", ""); - m_nameConfig = new RimContourMapNameConfig(this); + m_nameConfig = new RimViewNameConfig(this); m_contourMapProjectionPartMgr = new RivContourMapProjectionPartMgr(contourMapProjection(), this); diff --git a/ApplicationCode/ProjectDataModel/RimContourMapView.h b/ApplicationCode/ProjectDataModel/RimContourMapView.h index b0503135d7..7146ce15dd 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapView.h +++ b/ApplicationCode/ProjectDataModel/RimContourMapView.h @@ -21,7 +21,7 @@ #include "RimEclipseView.h" #include "RimNameConfig.h" -class RimContourMapNameConfig; +class RimViewNameConfig; class RimScaleLegendConfig; class RivContourMapProjectionPartMgr; @@ -61,6 +61,6 @@ private: caf::PdmChildField m_contourMapProjection; caf::PdmField m_showAxisLines; caf::PdmField m_showScaleLegend; - caf::PdmChildField m_nameConfig; + caf::PdmChildField m_nameConfig; }; diff --git a/ApplicationCode/ProjectDataModel/RimContourMapNameConfig.cpp b/ApplicationCode/ProjectDataModel/RimViewNameConfig.cpp similarity index 85% rename from ApplicationCode/ProjectDataModel/RimContourMapNameConfig.cpp rename to ApplicationCode/ProjectDataModel/RimViewNameConfig.cpp index d4b8478be0..b9178ff680 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapNameConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewNameConfig.cpp @@ -16,19 +16,19 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimContourMapNameConfig.h" +#include "RimViewNameConfig.h" //================================================================================================== /// /// //================================================================================================== -CAF_PDM_SOURCE_INIT(RimContourMapNameConfig, "RimContourMapNameConfig"); +CAF_PDM_SOURCE_INIT(RimViewNameConfig, "RimViewNameConfig"); //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimContourMapNameConfig::RimContourMapNameConfig(const RimNameConfigHolderInterface* configHolder) +RimViewNameConfig::RimViewNameConfig(const RimNameConfigHolderInterface* configHolder) : RimNameConfig(configHolder) { CAF_PDM_InitObject("Contour Map Name Generator", "", "", ""); @@ -44,7 +44,7 @@ RimContourMapNameConfig::RimContourMapNameConfig(const RimNameConfigHolderInterf //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimContourMapNameConfig::addCaseName() const +bool RimViewNameConfig::addCaseName() const { return m_addCaseName(); } @@ -52,7 +52,7 @@ bool RimContourMapNameConfig::addCaseName() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimContourMapNameConfig::addAggregationType() const +bool RimViewNameConfig::addAggregationType() const { return m_addAggregationType(); } @@ -60,7 +60,7 @@ bool RimContourMapNameConfig::addAggregationType() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimContourMapNameConfig::addProperty() const +bool RimViewNameConfig::addProperty() const { return m_addProperty(); } @@ -68,7 +68,7 @@ bool RimContourMapNameConfig::addProperty() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimContourMapNameConfig::addSampleSpacing() const +bool RimViewNameConfig::addSampleSpacing() const { return m_addSampleSpacing(); } @@ -76,7 +76,7 @@ bool RimContourMapNameConfig::addSampleSpacing() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimContourMapNameConfig::enableAllAutoNameTags(bool enable) +void RimViewNameConfig::enableAllAutoNameTags(bool enable) { m_addCaseName = enable; m_addAggregationType = enable; @@ -87,7 +87,7 @@ void RimContourMapNameConfig::enableAllAutoNameTags(bool enable) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimContourMapNameConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) +void RimViewNameConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { RimNameConfig::defineUiOrdering(uiConfigName, uiOrdering); uiOrdering.add(&m_addCaseName); diff --git a/ApplicationCode/ProjectDataModel/RimContourMapNameConfig.h b/ApplicationCode/ProjectDataModel/RimViewNameConfig.h similarity index 92% rename from ApplicationCode/ProjectDataModel/RimContourMapNameConfig.h rename to ApplicationCode/ProjectDataModel/RimViewNameConfig.h index 9fc9c61a7d..62b37b235a 100644 --- a/ApplicationCode/ProjectDataModel/RimContourMapNameConfig.h +++ b/ApplicationCode/ProjectDataModel/RimViewNameConfig.h @@ -24,12 +24,12 @@ /// /// //================================================================================================== -class RimContourMapNameConfig : public RimNameConfig +class RimViewNameConfig : public RimNameConfig { CAF_PDM_HEADER_INIT; public: - RimContourMapNameConfig(const RimNameConfigHolderInterface* configHolder = nullptr); + RimViewNameConfig(const RimNameConfigHolderInterface* configHolder = nullptr); bool addCaseName() const; bool addAggregationType() const;