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

12
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@@ -40,7 +40,7 @@
#include "RivExtrudedCurveIntersectionPartMgr.h"
#include "RigAllenDiagramData.h"
#include "RigAllanDiagramData.h"
#include "RimIntersectionResultDefinition.h"
#include "cafDisplayCoordTransform.h"
@@ -323,7 +323,7 @@ QString RiuResultTextBuilder::faultResultDetails()
if ( m_viewWithFaultsSettings && m_viewWithFaultsSettings->faultResultSettings()->hasValidCustomResult() )
{
if ( m_viewWithFaultsSettings->faultResultSettings()->customFaultResult()->resultType() !=
RiaDefines::ResultCatType::ALLEN_DIAGRAMS )
RiaDefines::ResultCatType::ALLAN_DIAGRAMS )
{
text += "Fault result data:\n";
this->appendTextFromResultColors( eclipseCaseData,
@@ -478,16 +478,16 @@ QString RiuResultTextBuilder::nncResultText()
text = QString( "%1 : %2" ).arg( resultVar ).arg( scalarValue );
}
if ( resultType == RiaDefines::ResultCatType::ALLEN_DIAGRAMS )
if ( resultType == RiaDefines::ResultCatType::ALLAN_DIAGRAMS )
{
nncValues = nncData->staticConnectionScalarResult( eclipseResultAddress );
QString resultValueText;
if ( m_viewWithFaultsSettings->currentFaultResultColors()->resultVariable() ==
RiaDefines::formationAllenResultName() )
RiaDefines::formationAllanResultName() )
{
std::pair<int, int> fmIndexPair =
eclipseCase->allenDiagramData()->formationIndexCombinationFromCategory(
eclipseCase->allanDiagramData()->formationIndexCombinationFromCategory(
( *nncValues )[m_nncIndex] );
std::vector<QString> fmNames = eclipseCase->formationNames();
@@ -503,7 +503,7 @@ QString RiuResultTextBuilder::nncResultText()
// clang-format on
}
else if ( m_viewWithFaultsSettings->currentFaultResultColors()->resultVariable() ==
RiaDefines::formationBinaryAllenResultName() )
RiaDefines::formationBinaryAllanResultName() )
{
resultValueText = ( *nncValues )[m_nncIndex] == 0 ? "Same formation" : "Different formation";
}