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 : Rename to RimRegularLegendConfig

Browse Source
This commit is contained in:
Magne Sjaastad
2018-04-18 10:10:39 +02:00
parent f85c1de330
commit 3bc85ce794
41 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimTensorResults.cpp
View File

@@ -63,7 +63,7 @@ RimTensorResults::RimTensorResults()
CAF_PDM_InitObject("Element Tensor Results", ":/CellResult.png", "", "");
CAF_PDM_InitFieldNoDefault(&arrowColorLegendConfig, "LegendDefinition", "Legend Definition", "", "", "");
this->arrowColorLegendConfig = new RimLegendConfig();
this->arrowColorLegendConfig = new RimRegularLegendConfig();
arrowColorLegendConfig.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_resultFieldName, "ResultVariable", QString("ST"), "Value", "", "", "");
@@ -86,7 +86,7 @@ RimTensorResults::RimTensorResults()
CAF_PDM_InitField(&m_sizeScale, "SizeScale", 1.0f, "Size Scale", "", "", "");
CAF_PDM_InitField(&m_rangeMode,
"RangeType",
RimLegendConfig::RangeModeEnum(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS),
RimRegularLegendConfig::RangeModeEnum(RimRegularLegendConfig::AUTOMATIC_ALLTIMESTEPS),
"Range Type",
"",
"Switches between automatic and user defined range",
@@ -203,11 +203,11 @@ void RimTensorResults::mappingRange(double* min, double* max) const
RigFemPartResultsCollection* resultCollection = geoMechView->geoMechCase()->geoMechData()->femPartResults();
if (!resultCollection) return;
if (m_rangeMode == RimLegendConfig::AUTOMATIC_ALLTIMESTEPS)
if (m_rangeMode == RimRegularLegendConfig::AUTOMATIC_ALLTIMESTEPS)
{
resultCollection->minMaxScalarValuesOverAllTensorComponents(selectedTensorResult(), min, max);
}
else if (m_rangeMode == RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP)
else if (m_rangeMode == RimRegularLegendConfig::AUTOMATIC_CURRENT_TIMESTEP)
{
resultCollection->minMaxScalarValuesOverAllTensorComponents(selectedTensorResult(), currentTimeStep, min, max);
}
@@ -293,11 +293,11 @@ QList<caf::PdmOptionItemInfo> RimTensorResults::calculateValueOptions(const caf:
}
else if (fieldNeedingOptions == &m_rangeMode)
{
options.push_back(caf::PdmOptionItemInfo(RimLegendConfig::RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS),
RimLegendConfig::AUTOMATIC_ALLTIMESTEPS));
options.push_back(caf::PdmOptionItemInfo(RimRegularLegendConfig::RangeModeEnum::uiText(RimRegularLegendConfig::AUTOMATIC_ALLTIMESTEPS),
RimRegularLegendConfig::AUTOMATIC_ALLTIMESTEPS));
options.push_back(
caf::PdmOptionItemInfo(RimLegendConfig::RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP),
RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP));
caf::PdmOptionItemInfo(RimRegularLegendConfig::RangeModeEnum::uiText(RimRegularLegendConfig::AUTOMATIC_CURRENT_TIMESTEP),
RimRegularLegendConfig::AUTOMATIC_CURRENT_TIMESTEP));
}
return options;