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

#2727 Legends : Move enum to RimLegendConfig

Browse Source
This commit is contained in:
Magne Sjaastad 2018-04-19 08:37:37 +02:00
parent cdbfed9f36
commit dcde9ccf72
7 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp
View File

@ -22,8 +22,6 @@
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimRegularLegendConfig.h"
#include "RimTernaryLegendConfig.h"
#include "RiuMainWindow.h"

11
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -21,6 +21,17 @@
// NB! Special macro for pure virtual class
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimLegendConfig, "LegendConfig");
namespace caf {
template<>
void AppEnum<RimLegendConfig::RangeModeType>::setUp()
{
addItem(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS, "AUTOMATIC_ALLTIMESTEPS", "Min and Max for All Timesteps");
addItem(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP, "AUTOMATIC_CURRENT_TIMESTEP", "Min and Max for Current Timestep");
addItem(RimLegendConfig::USER_DEFINED, "USER_DEFINED_MAX_MIN", "User Defined Range");
setDefault(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

9
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@ -38,6 +38,15 @@ public:
RimLegendConfig();
virtual ~RimLegendConfig();
enum RangeModeType
{
AUTOMATIC_ALLTIMESTEPS,
AUTOMATIC_CURRENT_TIMESTEP,
USER_DEFINED
};
typedef caf::AppEnum<RangeModeType> RangeModeEnum;
virtual const caf::TitledOverlayFrame* titledOverlayFrame() const = 0;
virtual caf::TitledOverlayFrame* titledOverlayFrame() = 0;
};

10
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@ -54,16 +54,6 @@
CAF_PDM_SOURCE_INIT(RimRegularLegendConfig, "Legend");
namespace caf {
template<>
void AppEnum<RimRegularLegendConfig::RangeModeType>::setUp()
{
addItem(RimRegularLegendConfig::AUTOMATIC_ALLTIMESTEPS, "AUTOMATIC_ALLTIMESTEPS", "Min and Max for All Timesteps");
addItem(RimRegularLegendConfig::AUTOMATIC_CURRENT_TIMESTEP,"AUTOMATIC_CURRENT_TIMESTEP", "Min and Max for Current Timestep");
addItem(RimRegularLegendConfig::USER_DEFINED, "USER_DEFINED_MAX_MIN", "User Defined Range");
setDefault(RimRegularLegendConfig::AUTOMATIC_ALLTIMESTEPS);
}
}
namespace caf {
template<>

9
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h
View File

@ -62,15 +62,6 @@ public:
caf::PdmField<QString> resultVariableName; // Used internally to describe the variable this legend setup is used for
enum RangeModeType
{
AUTOMATIC_ALLTIMESTEPS,
AUTOMATIC_CURRENT_TIMESTEP,
USER_DEFINED
};
typedef caf::AppEnum<RangeModeType> RangeModeEnum;
enum ColorRangesType
{
NORMAL,

10
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@ -40,16 +40,6 @@
CAF_PDM_SOURCE_INIT(RimTernaryLegendConfig, "RimTernaryLegendConfig");
namespace caf {
template<>
void AppEnum<RimTernaryLegendConfig::RangeModeType>::setUp()
{
addItem(RimTernaryLegendConfig::AUTOMATIC_ALLTIMESTEPS, "AUTOMATIC_ALLTIMESTEPS", "Global range");
addItem(RimTernaryLegendConfig::AUTOMATIC_CURRENT_TIMESTEP,"AUTOMATIC_CURRENT_TIMESTEP", "Local range");
addItem(RimTernaryLegendConfig::USER_DEFINED, "USER_DEFINED_MAX_MIN", "User defined range");
setDefault(RimTernaryLegendConfig::AUTOMATIC_ALLTIMESTEPS);
}
}
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h
View File

@ -51,14 +51,6 @@ public:
TERNARY_SWAT_IDX
};
enum RangeModeType
{
AUTOMATIC_ALLTIMESTEPS,
AUTOMATIC_CURRENT_TIMESTEP,
USER_DEFINED
};
typedef caf::AppEnum<RangeModeType> RangeModeEnum;
public:
RimTernaryLegendConfig();
virtual ~RimTernaryLegendConfig();