mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 22:03:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

profile: rename GF_LINE color to DURATION_LINE

Browse source 
The color was misnamed, since it has only been used for the
duration line for quite some time (since 893bea700c to be
exact).

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-05-08 13:06:49 +02:00 • committed by Robert C. Helling
parent a7002f4089
commit dc645ce8c6
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/color.cpp
View file

@ -65,7 +65,7 @@ static QMap<color_index_t, std::array<QColor, 2>> profile_color = {
{ 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 }} } { DURATION_LINE, {{ BLACK1, BLACK1_LOW_TRANS }} }
}; };
QColor getColor(const color_index_t i, bool isGrayscale) QColor getColor(const color_index_t i, bool isGrayscale)

2
core/color.h
View file

@ -135,7 +135,7 @@ typedef enum {
CALC_CEILING_SHALLOW, CALC_CEILING_SHALLOW,
CALC_CEILING_DEEP, CALC_CEILING_DEEP,
TISSUE_PERCENTAGE, TISSUE_PERCENTAGE,
GF_LINE DURATION_LINE
} color_index_t; } color_index_t;
QColor getColor(const color_index_t i, bool isGrayscale = false); QColor getColor(const color_index_t i, bool isGrayscale = false);

2
profile-widget/profilewidget2.cpp
View file

@ -1910,7 +1910,7 @@ void ProfileWidget2::updateDurationLine(PictureEntry &e)
double durationLineWidth = unscaledDurationLineWidth / scale; double durationLineWidth = unscaledDurationLineWidth / scale;
double durationLinePenWidth = unscaledDurationLinePenWidth / scale; double durationLinePenWidth = unscaledDurationLinePenWidth / scale;
e.durationLine.reset(new QGraphicsRectItem(begin, y - durationLineWidth - durationLinePenWidth, end - begin, durationLineWidth)); e.durationLine.reset(new QGraphicsRectItem(begin, y - durationLineWidth - durationLinePenWidth, end - begin, durationLineWidth));
e.durationLine->setPen(QPen(getColor(GF_LINE, isGrayscale), durationLinePenWidth)); e.durationLine->setPen(QPen(getColor(DURATION_LINE, isGrayscale), durationLinePenWidth));
e.durationLine->setBrush(getColor(::BACKGROUND, isGrayscale)); e.durationLine->setBrush(getColor(::BACKGROUND, isGrayscale));
e.durationLine->setVisible(prefs.show_pictures_in_profile); e.durationLine->setVisible(prefs.show_pictures_in_profile);
scene()->addItem(e.durationLine.get()); scene()->addItem(e.durationLine.get());