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

Profile2: add use of the isGrayscale flag when getting a color

Browse source 
getColor() has a default argument for grayscale set to false.
With this patch we pass it the local isGrayscale flag, which
can only be set during printing.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2014-03-25 23:34:10 +02:00 • committed by Dirk Hohndel
parent 06a1cb0975
commit b3f6a4f994
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/profile/profilewidget2.cpp
View file

@ -178,7 +178,7 @@ void ProfileWidget2::setupItemOnScene()
meanDepth->setAxis(profileYAxis); meanDepth->setAxis(profileYAxis);
diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignTop); diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignTop);
diveComputerText->setBrush(getColor(TIME_TEXT)); diveComputerText->setBrush(getColor(TIME_TEXT, isGrayscale));
rulerItem->setAxis(timeAxis, profileYAxis); rulerItem->setAxis(timeAxis, profileYAxis);
@ -198,7 +198,7 @@ void ProfileWidget2::setupItemOnScene()
setupItem(ITEM, timeAxis, gasYAxis, dataModel, DivePlotDataModel::VERTICAL_COLUMN, DivePlotDataModel::TIME, 0); \ setupItem(ITEM, timeAxis, gasYAxis, dataModel, DivePlotDataModel::VERTICAL_COLUMN, DivePlotDataModel::TIME, 0); \
ITEM->setThreshouldSettingsKey(THRESHOULD_SETTINGS); \ ITEM->setThreshouldSettingsKey(THRESHOULD_SETTINGS); \
ITEM->setVisibilitySettingsKey(VISIBILITY_SETTINGS); \ ITEM->setVisibilitySettingsKey(VISIBILITY_SETTINGS); \
ITEM->setColors(getColor(COLOR), getColor(COLOR_ALERT)); \ ITEM->setColors(getColor(COLOR, isGrayscale), getColor(COLOR_ALERT, isGrayscale)); \
ITEM->preferencesChanged(); \ ITEM->preferencesChanged(); \
ITEM->setZValue(99); ITEM->setZValue(99);
@ -606,7 +606,7 @@ void ProfileWidget2::setProfileState()
currentState = PROFILE; currentState = PROFILE;
MainWindow::instance()->setToolButtonsEnabled(true); MainWindow::instance()->setToolButtonsEnabled(true);
toolTipItem->readPos(); toolTipItem->readPos();
setBackgroundBrush(getColor(::BACKGROUND)); setBackgroundBrush(getColor(::BACKGROUND, isGrayscale));
background->setVisible(false); background->setVisible(false);
toolTipItem->setVisible(true); toolTipItem->setVisible(true);