OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-07-30 16:28:16 -05: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 08:26:22 +02:00
committed by GitHub
parent cc803b5c38
commit 00cd16ed4f
21 changed files with 154 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
+19 -8
View File
@@ -28,7 +28,7 @@
#include "RicfCommandObject.h"
#include "RigActiveCellInfo.h"
#include "RigAllenDiagramData.h"
#include "RigAllanDiagramData.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigEclipseResultInfo.h"
@@ -693,7 +693,7 @@ QList<caf::PdmOptionItemInfo>
continue;
}
if ( resType == RiaDefines::ALLEN_DIAGRAMS && !isSeparateFaultResult )
if ( resType == RiaDefines::ALLAN_DIAGRAMS && !isSeparateFaultResult )
{
continue;
}
@@ -1234,6 +1234,17 @@ void RimEclipseResultDefinition::initAfterRead()
assignFlowSolutionFromCase();
}
if ( m_resultVariable == "Formation Allen" )
{
m_resultVariable = RiaDefines::formationAllanResultName();
m_resultType = RiaDefines::ResultCatType::ALLAN_DIAGRAMS;
}
else if ( m_resultVariable == "Binary Formation Allen" )
{
m_resultVariable = RiaDefines::formationBinaryAllanResultName();
m_resultType = RiaDefines::ResultCatType::ALLAN_DIAGRAMS;
}
m_porosityModelUiField = m_porosityModel;
m_resultTypeUiField = m_resultType;
m_resultVariableUiField = m_resultVariable;
@@ -1406,8 +1417,8 @@ bool RimEclipseResultDefinition::hasCategoryResult() const
if ( this->m_resultType() == RiaDefines::FLOW_DIAGNOSTICS && m_resultVariable() == RIG_FLD_MAX_FRACTION_TRACER_RESNAME )
return true;
if ( this->resultVariable() == RiaDefines::formationAllenResultName() ||
this->resultVariable() == RiaDefines::formationBinaryAllenResultName() )
if ( this->resultVariable() == RiaDefines::formationAllanResultName() ||
this->resultVariable() == RiaDefines::formationBinaryAllanResultName() )
{
return true;
}
@@ -1891,9 +1902,9 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen
std::vector<QString> fnVector = eclipseCaseData->formationNames();
legendConfigToUpdate->setNamedCategoriesInverse( fnVector );
}
else if ( this->resultType() == RiaDefines::ALLEN_DIAGRAMS )
else if ( this->resultType() == RiaDefines::ALLAN_DIAGRAMS )
{
if ( this->resultVariable() == RiaDefines::formationAllenResultName() )
if ( this->resultVariable() == RiaDefines::formationAllanResultName() )
{
const std::vector<QString> fnVector = eclipseCaseData->formationNames();
std::vector<int> fnameIdxes;
@@ -1907,7 +1918,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen
formationColorMapper->setInterpolateColors( legendBaseColors );
const std::map<std::pair<int, int>, int>& formationCombToCathegory =
eclipseCaseData->allenDiagramData()->formationCombinationToCategory();
eclipseCaseData->allanDiagramData()->formationCombinationToCategory();
std::vector<std::tuple<QString, int, cvf::Color3ub>> categories;
for ( int frmNameIdx : fnameIdxes )
@@ -1937,7 +1948,7 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen
legendConfigToUpdate->setCategoryItems( categories );
}
else if ( this->resultVariable() == RiaDefines::formationBinaryAllenResultName() )
else if ( this->resultVariable() == RiaDefines::formationBinaryAllanResultName() )
{
std::vector<std::tuple<QString, int, cvf::Color3ub>> categories;
categories.emplace_back( std::make_tuple( "Same formation", 0, cvf::Color3ub::BROWN ) );
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+1 -1
View File
@@ -2192,7 +2192,7 @@ bool RimEclipseView::isUsingFormationNames() const
{
if ( cellResult()->resultType() == RiaDefines::FORMATION_NAMES ) return true;
if ( faultResultSettings()->customFaultResult()->resultType() == RiaDefines::ALLEN_DIAGRAMS ) return true;
if ( faultResultSettings()->customFaultResult()->resultType() == RiaDefines::ALLAN_DIAGRAMS ) return true;
return eclipsePropertyFilterCollection()->isUsingFormationNames();
}
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
+14 -5
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::ALLEN_DIAGRAMS )
if ( eclCellColors && eclCellColors->resultType() == RiaDefines::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 )
{