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

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,8 +66,7 @@ bool isExcplicitHandled( char secondChar )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator(
const std::set<RiaSummaryCurveDefinition>& curveDefinitions )
RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator( const std::set<RiaSummaryCurveDefinition>& curveDefinitions )
{
m_allSummaryCaseNames = getAllSummaryCaseNames();
m_allSummaryWellNames = getAllSummaryWellNames();
@@ -191,17 +190,17 @@ void RimSummaryCurveAppearanceCalculator::assignDimensions( CurveAppearanceType
void RimSummaryCurveAppearanceCalculator::updateApperanceIndices()
{
{
std::map<std::string, size_t> caseAppearanceIndices = mapNameToAppearanceIndex( m_caseAppearanceType,
m_allSummaryCaseNames );
std::map<std::string, size_t> caseAppearanceIndices =
mapNameToAppearanceIndex( m_caseAppearanceType, m_allSummaryCaseNames );
for ( auto& pair : m_caseToAppearanceIdxMap )
{
pair.second = static_cast<int>(
caseAppearanceIndices[pair.first->summaryHeaderFilename().toUtf8().constData()] );
pair.second =
static_cast<int>( caseAppearanceIndices[pair.first->summaryHeaderFilename().toUtf8().constData()] );
}
}
{
std::map<std::string, size_t> wellAppearanceIndices = mapNameToAppearanceIndex( m_wellAppearanceType,
m_allSummaryWellNames );
std::map<std::string, size_t> wellAppearanceIndices =
mapNameToAppearanceIndex( m_wellAppearanceType, m_allSummaryWellNames );
for ( auto& pair : m_welToAppearanceIdxMap )
{
pair.second = static_cast<int>( wellAppearanceIndices[pair.first] );
@@ -247,13 +246,13 @@ std::map<std::string, size_t>
}
else if ( appearance == CurveAppearanceType::SYMBOL )
{
numOptions = caf::AppEnum<RiuQwtSymbol::PointSymbolEnum>::size() -
1; // -1 since the No symbol option is not counted see cycledSymbol()
numOptions = caf::AppEnum<RiuQwtSymbol::PointSymbolEnum>::size() - 1; // -1 since the No symbol option is not
// counted see cycledSymbol()
}
else if ( appearance == CurveAppearanceType::LINE_STYLE )
{
numOptions = caf::AppEnum<RiuQwtPlotCurve::LineStyleEnum>::size() -
1; // -1 since the No symbol option is not counted see cycledLineStyle()
numOptions = caf::AppEnum<RiuQwtPlotCurve::LineStyleEnum>::size() - 1; // -1 since the No symbol option is not
// counted see cycledLineStyle()
}
else
{