mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-12 14:36:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: silence clang missing braces warning in core/color.cpp

Browse source 
C++11 initializer lists should be passed via {{ ... }}.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-09-01 18:39:41 +02:00 • committed by Dirk Hohndel
parent 23067e5dd8
commit 19f7b5279a
1 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
core/color.cpp
View file

@ -6,67 +6,67 @@
// Note that std::array<QColor, 2> is in every respect equivalent to QColor[2], // Note that std::array<QColor, 2> is in every respect equivalent to QColor[2],
// but allows assignment, comparison, can be returned from functions, etc. // but allows assignment, comparison, can be returned from functions, etc.
static QMap<color_index_t, std::array<QColor, 2>> profile_color = { static QMap<color_index_t, std::array<QColor, 2>> profile_color = {
{ SAC_1, { FUNGREEN1, BLACK1_LOW_TRANS } }, { SAC_1, {{ FUNGREEN1, BLACK1_LOW_TRANS }} },
{ SAC_2, { APPLE1, BLACK1_LOW_TRANS } }, { SAC_2, {{ APPLE1, BLACK1_LOW_TRANS }} },
{ SAC_3, { ATLANTIS1, BLACK1_LOW_TRANS } }, { SAC_3, {{ ATLANTIS1, BLACK1_LOW_TRANS }} },
{ SAC_4, { ATLANTIS2, BLACK1_LOW_TRANS } }, { SAC_4, {{ ATLANTIS2, BLACK1_LOW_TRANS }} },
{ SAC_5, { EARLSGREEN1, BLACK1_LOW_TRANS } }, { SAC_5, {{ EARLSGREEN1, BLACK1_LOW_TRANS }} },
{ SAC_6, { HOKEYPOKEY1, BLACK1_LOW_TRANS } }, { SAC_6, {{ HOKEYPOKEY1, BLACK1_LOW_TRANS }} },
{ SAC_7, { TUSCANY1, BLACK1_LOW_TRANS } }, { SAC_7, {{ TUSCANY1, BLACK1_LOW_TRANS }} },
{ SAC_8, { CINNABAR1, BLACK1_LOW_TRANS } }, { SAC_8, {{ CINNABAR1, BLACK1_LOW_TRANS }} },
{ SAC_9, { REDORANGE1, BLACK1_LOW_TRANS } }, { SAC_9, {{ REDORANGE1, BLACK1_LOW_TRANS }} },
{ VELO_STABLE, { CAMARONE1, BLACK1_LOW_TRANS } }, { VELO_STABLE, {{ CAMARONE1, BLACK1_LOW_TRANS }} },
{ VELO_SLOW, { LIMENADE1, BLACK1_LOW_TRANS } }, { VELO_SLOW, {{ LIMENADE1, BLACK1_LOW_TRANS }} },
{ VELO_MODERATE, { RIOGRANDE1, BLACK1_LOW_TRANS } }, { VELO_MODERATE, {{ RIOGRANDE1, BLACK1_LOW_TRANS }} },
{ VELO_FAST, { PIRATEGOLD1, BLACK1_LOW_TRANS } }, { VELO_FAST, {{ PIRATEGOLD1, BLACK1_LOW_TRANS }} },
{ VELO_CRAZY, { RED1, BLACK1_LOW_TRANS } }, { VELO_CRAZY, {{ RED1, BLACK1_LOW_TRANS }} },
{ PO2, { APPLE1, BLACK1_LOW_TRANS } }, { PO2, {{ APPLE1, BLACK1_LOW_TRANS }} },
{ PO2_ALERT, { RED1, BLACK1_LOW_TRANS } }, { PO2_ALERT, {{ RED1, BLACK1_LOW_TRANS }} },
{ PN2, { BLACK1_LOW_TRANS, BLACK1_LOW_TRANS } }, { PN2, {{ BLACK1_LOW_TRANS, BLACK1_LOW_TRANS }} },
{ PN2_ALERT, { RED1, BLACK1_LOW_TRANS } }, { PN2_ALERT, {{ RED1, BLACK1_LOW_TRANS }} },
{ PHE, { PEANUT, BLACK1_LOW_TRANS } }, { PHE, {{ PEANUT, BLACK1_LOW_TRANS }} },
{ PHE_ALERT, { RED1, BLACK1_LOW_TRANS } }, { PHE_ALERT, {{ RED1, BLACK1_LOW_TRANS }} },
{ O2SETPOINT, { PIRATEGOLD1_MED_TRANS, BLACK1_LOW_TRANS } }, { O2SETPOINT, {{ PIRATEGOLD1_MED_TRANS, BLACK1_LOW_TRANS }} },
{ CCRSENSOR1, { TUNDORA1_MED_TRANS, BLACK1_LOW_TRANS } }, { CCRSENSOR1, {{ TUNDORA1_MED_TRANS, BLACK1_LOW_TRANS }} },
{ CCRSENSOR2, { ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS } }, { CCRSENSOR2, {{ ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS }} },
{ CCRSENSOR3, { PEANUT, BLACK1_LOW_TRANS } }, { CCRSENSOR3, {{ PEANUT, BLACK1_LOW_TRANS }} },
{ SCR_OCPO2, { PIRATEGOLD1_MED_TRANS, BLACK1_LOW_TRANS } }, { SCR_OCPO2, {{ PIRATEGOLD1_MED_TRANS, BLACK1_LOW_TRANS }} },
{ PP_LINES, { BLACK1_HIGH_TRANS, BLACK1_LOW_TRANS } }, { PP_LINES, {{ BLACK1_HIGH_TRANS, BLACK1_LOW_TRANS }} },
{ TEXT_BACKGROUND, { CONCRETE1_LOWER_TRANS, WHITE1 } }, { TEXT_BACKGROUND, {{ CONCRETE1_LOWER_TRANS, WHITE1 }} },
{ ALERT_BG, { BROOM1_LOWER_TRANS, BLACK1_LOW_TRANS } }, { ALERT_BG, {{ BROOM1_LOWER_TRANS, BLACK1_LOW_TRANS }} },
{ ALERT_FG, { BLACK1_LOW_TRANS, WHITE1 } }, { ALERT_FG, {{ BLACK1_LOW_TRANS, WHITE1 }} },
{ EVENTS, { REDORANGE1, BLACK1_LOW_TRANS } }, { EVENTS, {{ REDORANGE1, BLACK1_LOW_TRANS }} },
{ SAMPLE_DEEP, { QColor(Qt::red).darker(), BLACK1 } }, { SAMPLE_DEEP, {{ QColor(Qt::red).darker(), BLACK1 }} },
{ SAMPLE_SHALLOW, { QColor(Qt::red).lighter(), BLACK1_LOW_TRANS } }, { SAMPLE_SHALLOW, {{ QColor(Qt::red).lighter(), BLACK1_LOW_TRANS }} },
{ SMOOTHED, { REDORANGE1_HIGH_TRANS, BLACK1_LOW_TRANS } }, { SMOOTHED, {{ REDORANGE1_HIGH_TRANS, BLACK1_LOW_TRANS }} },
{ MINUTE, { MEDIUMREDVIOLET1_HIGHER_TRANS, BLACK1_LOW_TRANS } }, { MINUTE, {{ MEDIUMREDVIOLET1_HIGHER_TRANS, BLACK1_LOW_TRANS }} },
{ TIME_GRID, { WHITE1, BLACK1_HIGH_TRANS } }, { TIME_GRID, {{ WHITE1, BLACK1_HIGH_TRANS }} },
{ TIME_TEXT, { FORESTGREEN1, BLACK1 } }, { TIME_TEXT, {{ FORESTGREEN1, BLACK1 }} },
{ DEPTH_GRID, { WHITE1, BLACK1_HIGH_TRANS } }, { DEPTH_GRID, {{ WHITE1, BLACK1_HIGH_TRANS }} },
{ MEAN_DEPTH, { REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS } }, { MEAN_DEPTH, {{ REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS }} },
{ HR_PLOT, { REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS } }, { HR_PLOT, {{ REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS }} },
{ HR_TEXT, { REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS } }, { HR_TEXT, {{ REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS }} },
{ HR_AXIS, { MED_GRAY_HIGH_TRANS, MED_GRAY_HIGH_TRANS } }, { HR_AXIS, {{ MED_GRAY_HIGH_TRANS, MED_GRAY_HIGH_TRANS }} },
{ DEPTH_BOTTOM, { GOVERNORBAY1_MED_TRANS, BLACK1_HIGH_TRANS } }, { DEPTH_BOTTOM, {{ GOVERNORBAY1_MED_TRANS, BLACK1_HIGH_TRANS }} },
{ DEPTH_TOP, { MERCURY1_MED_TRANS, WHITE1_MED_TRANS } }, { DEPTH_TOP, {{ MERCURY1_MED_TRANS, WHITE1_MED_TRANS }} },
{ TEMP_TEXT, { GOVERNORBAY2, BLACK1_LOW_TRANS } }, { TEMP_TEXT, {{ GOVERNORBAY2, BLACK1_LOW_TRANS }} },
{ TEMP_PLOT, { ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS } }, { TEMP_PLOT, {{ ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS }} },
{ SAC_DEFAULT, { WHITE1, BLACK1_LOW_TRANS } }, { SAC_DEFAULT, {{ WHITE1, BLACK1_LOW_TRANS }} },
{ BOUNDING_BOX, { WHITE1, BLACK1_LOW_TRANS } }, { BOUNDING_BOX, {{ WHITE1, BLACK1_LOW_TRANS }} },
{ PRESSURE_TEXT, { KILLARNEY1, BLACK1_LOW_TRANS } }, { PRESSURE_TEXT, {{ KILLARNEY1, BLACK1_LOW_TRANS }} },
{ BACKGROUND, { SPRINGWOOD1, WHITE1 } }, { BACKGROUND, {{ SPRINGWOOD1, WHITE1 }} },
{ BACKGROUND_TRANS, { SPRINGWOOD1_MED_TRANS, WHITE1_MED_TRANS } }, { BACKGROUND_TRANS, {{ SPRINGWOOD1_MED_TRANS, WHITE1_MED_TRANS }} },
{ CEILING_SHALLOW, { REDORANGE1_HIGH_TRANS, BLACK1_HIGH_TRANS } }, { CEILING_SHALLOW, {{ REDORANGE1_HIGH_TRANS, BLACK1_HIGH_TRANS }} },
{ CEILING_DEEP, { RED1_MED_TRANS, BLACK1_HIGH_TRANS } }, { CEILING_DEEP, {{ RED1_MED_TRANS, BLACK1_HIGH_TRANS }} },
{ CALC_CEILING_SHALLOW, { FUNGREEN1_HIGH_TRANS, BLACK1_HIGH_TRANS } }, { CALC_CEILING_SHALLOW, {{ FUNGREEN1_HIGH_TRANS, BLACK1_HIGH_TRANS }} },
{ CALC_CEILING_DEEP, { APPLE1_HIGH_TRANS, BLACK1_HIGH_TRANS } }, { CALC_CEILING_DEEP, {{ APPLE1_HIGH_TRANS, BLACK1_HIGH_TRANS }} },
{ TISSUE_PERCENTAGE, { GOVERNORBAY2, BLACK1_LOW_TRANS } }, { TISSUE_PERCENTAGE, {{ GOVERNORBAY2, BLACK1_LOW_TRANS }} },
{ GF_LINE, { BLACK1, BLACK1_LOW_TRANS } }, { GF_LINE, {{ BLACK1, BLACK1_LOW_TRANS }} },
{ AMB_PRESSURE_LINE, { TUNDORA1_MED_TRANS, BLACK1_LOW_TRANS } } { AMB_PRESSURE_LINE, {{ TUNDORA1_MED_TRANS, BLACK1_LOW_TRANS }} }
}; };
QColor getColor(const color_index_t i, bool isGrayscale) QColor getColor(const color_index_t i, bool isGrayscale)