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

Ternary: Added possibility to switch between local and global range

Browse Source
This commit is contained in:
Magne Sjaastad 2014-04-25 16:32:06 +02:00
parent 585f034799
commit 0c3e54b130
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -112,7 +112,7 @@ RimLegendConfig::RimLegendConfig()
CAF_PDM_InitField(&m_colorRangeMode, "ColorRangeMode", ColorRangeEnum(NORMAL) , "Colors", "", "", ""); CAF_PDM_InitField(&m_colorRangeMode, "ColorRangeMode", ColorRangeEnum(NORMAL) , "Colors", "", "", "");
CAF_PDM_InitField(&m_mappingMode, "MappingMode", MappingEnum(LINEAR_CONTINUOUS) , "Mapping", "", "", ""); CAF_PDM_InitField(&m_mappingMode, "MappingMode", MappingEnum(LINEAR_CONTINUOUS) , "Mapping", "", "", "");
CAF_PDM_InitField(&m_rangeMode, "RangeType", caf::AppEnum<RimLegendConfig::RangeModeType>(AUTOMATIC_ALLTIMESTEPS), "Range type", "", "Switches between automatic and user defined range on the legend", ""); CAF_PDM_InitField(&m_rangeMode, "RangeType", RangeModeEnum(AUTOMATIC_ALLTIMESTEPS), "Range type", "", "Switches between automatic and user defined range on the legend", "");
CAF_PDM_InitField(&m_userDefinedMaxValue, "UserDefinedMax", 1.0, "Max", "", "Min value of the legend", ""); CAF_PDM_InitField(&m_userDefinedMaxValue, "UserDefinedMax", 1.0, "Max", "", "Min value of the legend", "");
CAF_PDM_InitField(&m_userDefinedMinValue, "UserDefinedMin", 0.0, "Min", "", "Max value of the legend", ""); CAF_PDM_InitField(&m_userDefinedMinValue, "UserDefinedMin", 0.0, "Min", "", "Max value of the legend", "");
CAF_PDM_InitField(&resultVariableName, "ResultVariableUsage", QString(""), "", "", "", ""); CAF_PDM_InitField(&resultVariableName, "ResultVariableUsage", QString(""), "", "", "", "");
@ -653,6 +653,8 @@ void RimLegendConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
// caf::PdmUiOrdering * formatGr = uiOrdering.addNewGroup("Ternary format"); // caf::PdmUiOrdering * formatGr = uiOrdering.addNewGroup("Ternary format");
// formatGr->add(&m_mappingMode); // formatGr->add(&m_mappingMode);
// formatGr->add(&m_numLevels); // formatGr->add(&m_numLevels);
caf::PdmUiOrdering * mappingGr = uiOrdering.addNewGroup("Mapping");
mappingGr->add(&m_rangeMode);
uiOrdering.setForgetRemainingFields(true); uiOrdering.setForgetRemainingFields(true);
} }
@ -700,8 +702,25 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
return optionList; return optionList;
} }
if (fieldNeedingOptions == &m_rangeMode)
{
QList<caf::PdmOptionItemInfo> optionList;
optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum(AUTOMATIC_ALLTIMESTEPS).uiText(), AUTOMATIC_ALLTIMESTEPS));
optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum(AUTOMATIC_CURRENT_TIMESTEP).uiText(), AUTOMATIC_CURRENT_TIMESTEP));
return optionList;
}
} }
return QList<caf::PdmOptionItemInfo>(); return QList<caf::PdmOptionItemInfo>();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimLegendConfig::RangeModeType RimLegendConfig::rangeMode() const
{
return m_rangeMode();
}

10
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@ -54,12 +54,14 @@ public:
caf::PdmField<QString> resultVariableName; // Used internally to describe the variable this legend setup is used for caf::PdmField<QString> resultVariableName; // Used internally to describe the variable this legend setup is used for
enum RangeModeType enum RangeModeType
{ {
AUTOMATIC_ALLTIMESTEPS, AUTOMATIC_ALLTIMESTEPS,
AUTOMATIC_CURRENT_TIMESTEP, AUTOMATIC_CURRENT_TIMESTEP,
USER_DEFINED USER_DEFINED
}; };
typedef caf::AppEnum<RangeModeType> RangeModeEnum;
enum ColorRangesType enum ColorRangesType
{ {
@ -95,6 +97,8 @@ public:
cvf::OverlayScalarMapperLegend* legend() { return m_legend.p(); } cvf::OverlayScalarMapperLegend* legend() { return m_legend.p(); }
int linearDiscreteLevelCount() const; int linearDiscreteLevelCount() const;
RangeModeType rangeMode() const;
protected: protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
@ -106,7 +110,7 @@ private:
cvf::ref<cvf::Color3ubArray> interpolateColorArray(const cvf::Color3ubArray& colorArray, cvf::uint targetColorCount); cvf::ref<cvf::Color3ubArray> interpolateColorArray(const cvf::Color3ubArray& colorArray, cvf::uint targetColorCount);
double roundToNumSignificantDigits(double value, double precision); double roundToNumSignificantDigits(double value, double precision);
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly ); virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
private: private:
@ -136,7 +140,7 @@ private:
caf::PdmField<int> m_numLevels; caf::PdmField<int> m_numLevels;
caf::PdmField<int> m_precision; caf::PdmField<int> m_precision;
caf::PdmField<caf::AppEnum<NumberFormatType> > m_tickNumberFormat; caf::PdmField<caf::AppEnum<NumberFormatType> > m_tickNumberFormat;
caf::PdmField<caf::AppEnum<RangeModeType> > m_rangeMode; caf::PdmField<RangeModeEnum> m_rangeMode;
caf::PdmField<double> m_userDefinedMaxValue; caf::PdmField<double> m_userDefinedMaxValue;
caf::PdmField<double> m_userDefinedMinValue; caf::PdmField<double> m_userDefinedMinValue;
caf::PdmField<caf::AppEnum<ColorRangesType> > m_colorRangeMode; caf::PdmField<caf::AppEnum<ColorRangesType> > m_colorRangeMode;