diff options
| -rw-r--r-- | core/color.cpp | 6 | ||||
| -rw-r--r-- | core/color.h | 8 | ||||
| -rw-r--r-- | profile-widget/divecartesianaxis.cpp | 4 | ||||
| -rw-r--r-- | profile-widget/divecartesianaxis.h | 4 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.h | 2 | ||||
| -rw-r--r-- | qt-models/diveplotdatamodel.cpp | 2 |
7 files changed, 14 insertions, 14 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; }; diff --git a/profile-widget/divecartesianaxis.cpp b/profile-widget/divecartesianaxis.cpp index 60c1f1365..3ca87dd10 100644 --- a/profile-widget/divecartesianaxis.cpp +++ b/profile-widget/divecartesianaxis.cpp @@ -137,7 +137,7 @@ void emptyList(QList<T *> &list, double steps) } } -void DiveCartesianAxis::updateTicks(color_indice_t color) +void DiveCartesianAxis::updateTicks(color_index_t color) { if (!scene() || (!changed && !profileWidget->getPrintMode())) return; @@ -398,7 +398,7 @@ QString TimeAxis::textForValue(double value) return QString::number(nr); } -void TimeAxis::updateTicks(color_indice_t color) +void TimeAxis::updateTicks(color_index_t color) { DiveCartesianAxis::updateTicks(color); if (maximum() > 600) { diff --git a/profile-widget/divecartesianaxis.h b/profile-widget/divecartesianaxis.h index 835567411..a53324e9d 100644 --- a/profile-widget/divecartesianaxis.h +++ b/profile-widget/divecartesianaxis.h @@ -52,7 +52,7 @@ public: int unitSystem; public slots: - virtual void updateTicks(color_indice_t color = TIME_GRID); + virtual void updateTicks(color_index_t color = TIME_GRID); signals: void sizeChanged(); @@ -93,7 +93,7 @@ class TimeAxis : public DiveCartesianAxis { Q_OBJECT public: TimeAxis(ProfileWidget2 *widget); - void updateTicks(color_indice_t color = TIME_GRID); + void updateTicks(color_index_t color = TIME_GRID); protected: QString textForValue(double value); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 1fb4f5f7e..3dd595caa 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -355,7 +355,7 @@ void ProfileWidget2::replot(struct dive *d) plotDive(d, true); } -void ProfileWidget2::createPPGas(PartialPressureGasItem *item, int verticalColumn, color_indice_t color, color_indice_t colorAlert, +void ProfileWidget2::createPPGas(PartialPressureGasItem *item, int verticalColumn, color_index_t color, color_index_t colorAlert, double *thresholdSettingsMin, double *thresholdSettingsMax) { setupItem(item, gasYAxis, verticalColumn, DivePlotDataModel::TIME, 0); diff --git a/profile-widget/profilewidget2.h b/profile-widget/profilewidget2.h index 4ce3baabb..5e64b369f 100644 --- a/profile-widget/profilewidget2.h +++ b/profile-widget/profilewidget2.h @@ -162,7 +162,7 @@ private: /*methods*/ void disconnectTemporaryConnections(); struct plot_data *getEntryFromPos(QPointF pos); void addActionShortcut(const Qt::Key shortcut, void (ProfileWidget2::*slot)()); - void createPPGas(PartialPressureGasItem *item, int verticalColumn, color_indice_t color, color_indice_t colorAlert, + void createPPGas(PartialPressureGasItem *item, int verticalColumn, color_index_t color, color_index_t colorAlert, double *thresholdSettingsMin, double *thresholdSettingsMax); private: DivePlotDataModel *dataModel; diff --git a/qt-models/diveplotdatamodel.cpp b/qt-models/diveplotdatamodel.cpp index 922cf349c..a2b411bdf 100644 --- a/qt-models/diveplotdatamodel.cpp +++ b/qt-models/diveplotdatamodel.cpp @@ -85,7 +85,7 @@ QVariant DivePlotDataModel::data(const QModelIndex &index, int role) const if (role == Qt::BackgroundRole) { switch (index.column()) { case COLOR: - return getColor((color_indice_t)(VELOCITY_COLORS_START_IDX + item.velocity)); + return getColor((color_index_t)(VELOCITY_COLORS_START_IDX + item.velocity)); } } return QVariant(); |