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

#2228 : Curve Creator : Use one group for curve types other han excplicitly handeled

Browse Source
This commit is contained in:
Magne Sjaastad 2017-12-18 14:27:50 +01:00
parent 8ed0393863
commit 679e4c859f
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
View File

@ -43,6 +43,20 @@ void caf::AppEnum< RimSummaryCurveAppearanceCalculator::CurveAppearanceType >::s
setDefault(RimSummaryCurveAppearanceCalculator::NONE);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool isExcplicitHandled(char secondChar)
{
if (secondChar == 'W' || secondChar == 'O' || secondChar == 'G' || secondChar == 'V')
{
return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -66,15 +80,12 @@ RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator(const s
// Indexes for sub color ranges
char secondChar = 0;
if(varname.size() > 1)
{
{
secondChar = varname[1];
if ( secondChar != 'W'
&& secondChar != 'O'
&& secondChar != 'G'
&& secondChar != 'V')
{
secondChar = 0; // Consider all others as one group for coloring
}
if (!isExcplicitHandled(secondChar))
{
secondChar = 0; // Consider all others as one group for coloring
}
}
m_secondCharToVarToAppearanceIdxMap[secondChar][varname] = -1;
}
@ -304,7 +315,14 @@ void RimSummaryCurveAppearanceCalculator::setupCurveLook(RimSummaryCurve* curve)
int subColorIndex = -1;
char secondChar = 0;
std::string varname = curve->summaryAddressY().quantityName();
if (varname.size() > 1) secondChar = varname[1];
if (varname.size() > 1)
{
secondChar = varname[1];
if (!isExcplicitHandled(secondChar))
{
secondChar = 0; // Consider all others as one group for coloring
}
}
subColorIndex = m_secondCharToVarToAppearanceIdxMap[secondChar][varname];