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

#3793 Views. Rename RimContourMapNameConfig to RimViewNameConfig

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-12-11 15:35:04 +01:00
parent b43ef3dc0b
commit fa55e1b3f5
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -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
)

4
ApplicationCode/ProjectDataModel/RimContourMapView.cpp
View File

@ -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);

4
ApplicationCode/ProjectDataModel/RimContourMapView.h
View File

@ -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<RimContourMapProjection*> m_contourMapProjection;
caf::PdmField<bool> m_showAxisLines;
caf::PdmField<bool> m_showScaleLegend;
caf::PdmChildField<RimContourMapNameConfig*> m_nameConfig;
caf::PdmChildField<RimViewNameConfig*> m_nameConfig;
};

18
ApplicationCode/ProjectDataModel/RimContourMapNameConfig.cpp → ApplicationCode/ProjectDataModel/RimViewNameConfig.cpp
View File

@ -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);

4
ApplicationCode/ProjectDataModel/RimContourMapNameConfig.h → ApplicationCode/ProjectDataModel/RimViewNameConfig.h
View File

@ -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;