diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/color.cpp | 6 | ||||
-rw-r--r-- | core/color.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/color.cpp b/core/color.cpp index e86b9f62b..b5bbc3269 100644 --- a/core/color.cpp +++ b/core/color.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "color.h" -QMap<color_indice_t, QVector<QColor> > profile_color; +QMap<color_index_t, QVector<QColor> > profile_color; void fill_profile_color() { @@ -68,7 +68,7 @@ void fill_profile_color() #undef COLOR } -QColor getColor(const color_indice_t i, bool isGrayscale) +QColor getColor(const color_index_t i, bool isGrayscale) { if (profile_color.count() > i && i >= 0) return profile_color[i].at((isGrayscale) ? 1 : 0); @@ -85,7 +85,7 @@ QColor getSacColor(int sac, int avg_sac) sac_index = 0; if (sac_index > SAC_COLORS - 1) sac_index = SAC_COLORS - 1; - return getColor((color_indice_t)(SAC_COLORS_START_IDX + sac_index), false); + return getColor((color_index_t)(SAC_COLORS_START_IDX + sac_index), false); } QColor getPressureColor(double density) diff --git a/core/color.h b/core/color.h index ef60d17d3..9e2496c8b 100644 --- a/core/color.h +++ b/core/color.h @@ -136,16 +136,16 @@ typedef enum { TISSUE_PERCENTAGE, GF_LINE, AMB_PRESSURE_LINE -} color_indice_t; +} color_index_t; -extern QMap<color_indice_t, QVector<QColor> > profile_color; +extern QMap<color_index_t, QVector<QColor> > profile_color; void fill_profile_color(); -QColor getColor(const color_indice_t i, bool isGrayscale = false); +QColor getColor(const color_index_t i, bool isGrayscale = false); QColor getSacColor(int sac, int diveSac); QColor getPressureColor(double density); struct text_render_options { double size; - color_indice_t color; + color_index_t color; double hpos, vpos; }; |