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

Fix misspelled Allan diagram (#5906)

Browse Source 
Closes #5816
This commit is contained in:
Magne Sjaastad
2020-05-12 12:48:50 +02:00
parent c016c02e40
commit 3d2ac4b573
21 changed files with 153 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@@ -541,6 +541,15 @@ void RimRegularLegendConfig::setAutomaticRanges( double globalMin, double global
//--------------------------------------------------------------------------------------------------
void RimRegularLegendConfig::initAfterRead()
{
if ( resultVariableName == "Binary Formation Allen" )
{
resultVariableName = RiaDefines::formationBinaryAllanResultName();
}
else if ( resultVariableName == "Formation Allen" )
{
resultVariableName = RiaDefines::formationAllanResultName();
}
updateFieldVisibility();
this->updateUiIconFromToggleField();
@@ -961,7 +970,7 @@ QList<caf::PdmOptionItemInfo>
if ( rftCurveSet ) hasRftPlotParent = true;
bool isCategoryResult = false;
bool isAllenDiagram = false;
bool isAllanDiagram = false;
{
RimEclipseCellColors* eclCellColors = nullptr;
this->firstAncestorOrThisOfType( eclCellColors );
@@ -983,9 +992,9 @@ QList<caf::PdmOptionItemInfo>
isCategoryResult = true;
}
if ( eclCellColors && eclCellColors->resultType() == RiaDefines::ResultCatType::ALLEN_DIAGRAMS )
if ( eclCellColors && eclCellColors->resultType() == RiaDefines::ResultCatType::ALLAN_DIAGRAMS )
{
isAllenDiagram = true;
isAllanDiagram = true;
}
}
@@ -996,7 +1005,7 @@ QList<caf::PdmOptionItemInfo>
// This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of
// this type
std::vector<MappingType> mappingTypes;
if ( !isAllenDiagram )
if ( !isAllanDiagram )
{
mappingTypes.push_back( LINEAR_DISCRETE );
@@ -1023,7 +1032,7 @@ QList<caf::PdmOptionItemInfo>
// This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of
// this type
std::vector<ColorRangesType> rangeTypes;
if ( !isAllenDiagram )
if ( !isAllanDiagram )
{
if ( !hasEnsembleCurveSetParent && !hasRftPlotParent )
{