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

profile: move printing-related variables to ProfileScene

Browse source 
Since the ProfileScene does the actual rendering, it needs
access to the "printMode", "isGrayScale" and "fontPrintScale"
variables. Move them down from ProfileView to ProfileScene.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-07-29 06:50:59 +02:00 • committed by Dirk Hohndel
parent f8fbff9f7d
commit bf12756819
4 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
profile-widget/profilescene.cpp
View file

@ -30,6 +30,9 @@ const static struct ProfileItemPos {
} itemPos; } itemPos;
ProfileScene::ProfileScene(double fontPrintScale) : ProfileScene::ProfileScene(double fontPrintScale) :
fontPrintScale(fontPrintScale),
printMode(false),
isGrayscale(false),
dataModel(new DivePlotDataModel(this)), dataModel(new DivePlotDataModel(this)),
profileYAxis(new DepthAxis(fontPrintScale, *this)), profileYAxis(new DepthAxis(fontPrintScale, *this)),
gasYAxis(new PartialGasPressureAxis(*dataModel, fontPrintScale, *this)), gasYAxis(new PartialGasPressureAxis(*dataModel, fontPrintScale, *this)),

4
profile-widget/profilescene.h
View file

@ -25,6 +25,10 @@ public:
int animSpeed; int animSpeed;
private: private:
friend class ProfileWidget2; // For now, give the ProfileWidget full access to the objects on the scene friend class ProfileWidget2; // For now, give the ProfileWidget full access to the objects on the scene
double fontPrintScale;
bool printMode;
bool isGrayscale;
DivePlotDataModel *dataModel; DivePlotDataModel *dataModel;
DepthAxis *profileYAxis; DepthAxis *profileYAxis;
PartialGasPressureAxis *gasYAxis; PartialGasPressureAxis *gasYAxis;

39
profile-widget/profilewidget2.cpp
View file

@ -82,8 +82,6 @@ ProfileWidget2::ProfileWidget2(DivePlannerPointsModel *plannerModelIn, double fo
plannerModel(plannerModelIn), plannerModel(plannerModelIn),
zoomLevel(0), zoomLevel(0),
zoomFactor(1.15), zoomFactor(1.15),
isGrayscale(false),
printMode(false),
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
toolTipItem(new ToolTipItem()), toolTipItem(new ToolTipItem()),
#endif #endif
@ -112,8 +110,7 @@ ProfileWidget2::ProfileWidget2(DivePlannerPointsModel *plannerModelIn, double fo
rulerItem(new RulerItem2()), rulerItem(new RulerItem2()),
#endif #endif
tankItem(new TankItem(*profileScene->timeAxis, fontPrintScale)), tankItem(new TankItem(*profileScene->timeAxis, fontPrintScale)),
shouldCalculateMax(true), shouldCalculateMax(true)
fontPrintScale(fontPrintScale)
{ {
init_plot_info(&plotInfo); init_plot_info(&plotInfo);
@ -221,7 +218,7 @@ void ProfileWidget2::setupItemOnScene()
tankItem->setZValue(100); tankItem->setZValue(100);
diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignTop); diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignTop);
diveComputerText->setBrush(getColor(TIME_TEXT, isGrayscale)); diveComputerText->setBrush(getColor(TIME_TEXT, profileScene->isGrayscale));
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
rulerItem->setAxis(profileScene->timeAxis, profileScene->profileYAxis); rulerItem->setAxis(profileScene->timeAxis, profileScene->profileYAxis);
@ -233,9 +230,9 @@ void ProfileWidget2::setupItemOnScene()
decoModelParameters->setAlignment(Qt::AlignHCenter | Qt::AlignBottom); decoModelParameters->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
for (int i = 0; i < 16; i++) { for (int i = 0; i < 16; i++) {
DiveCalculatedTissue *tissueItem = createItem<DiveCalculatedTissue>(*profileScene->profileYAxis, DivePlotDataModel::TISSUE_1 + i, i + 1, fontPrintScale); DiveCalculatedTissue *tissueItem = createItem<DiveCalculatedTissue>(*profileScene->profileYAxis, DivePlotDataModel::TISSUE_1 + i, i + 1, profileScene->fontPrintScale);
allTissues.append(tissueItem); allTissues.append(tissueItem);
DivePercentageItem *percentageItem = createItem<DivePercentageItem>(*profileScene->percentageAxis, DivePlotDataModel::PERCENTAGE_1 + i, i + 1, i, fontPrintScale); DivePercentageItem *percentageItem = createItem<DivePercentageItem>(*profileScene->percentageAxis, DivePlotDataModel::PERCENTAGE_1 + i, i + 1, i, profileScene->fontPrintScale);
allPercentages.append(percentageItem); allPercentages.append(percentageItem);
} }
#endif #endif
@ -249,9 +246,9 @@ void ProfileWidget2::replot()
PartialPressureGasItem *ProfileWidget2::createPPGas(int column, color_index_t color, color_index_t colorAlert, PartialPressureGasItem *ProfileWidget2::createPPGas(int column, color_index_t color, color_index_t colorAlert,
const double *thresholdSettingsMin, const double *thresholdSettingsMax) const double *thresholdSettingsMin, const double *thresholdSettingsMax)
{ {
PartialPressureGasItem *item = createItem<PartialPressureGasItem>(*profileScene->gasYAxis, column, 99, fontPrintScale); PartialPressureGasItem *item = createItem<PartialPressureGasItem>(*profileScene->gasYAxis, column, 99, profileScene->fontPrintScale);
item->setThresholdSettingsKey(thresholdSettingsMin, thresholdSettingsMax); item->setThresholdSettingsKey(thresholdSettingsMin, thresholdSettingsMax);
item->setColors(getColor(color, isGrayscale), getColor(colorAlert, isGrayscale)); item->setColors(getColor(color, profileScene->isGrayscale), getColor(colorAlert, profileScene->isGrayscale));
return item; return item;
} }
@ -337,15 +334,15 @@ void ProfileWidget2::plotDive(const struct dive *dIn, int dcIn, bool doClearPict
return; return;
} }
profileScene->animSpeed = instant || printMode ? 0 : qPrefDisplay::animation_speed(); profileScene->animSpeed = instant || profileScene->printMode ? 0 : qPrefDisplay::animation_speed();
// restore default zoom level // restore default zoom level
resetZoom(); resetZoom();
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
// reset some item visibility on printMode changes // reset some item visibility on printMode changes
toolTipItem->setVisible(!printMode); toolTipItem->setVisible(!profileScene->printMode);
rulerItem->setVisible(prefs.rulergraph && !printMode && currentState != PLAN && currentState != EDIT); rulerItem->setVisible(prefs.rulergraph && !profileScene->printMode && currentState != PLAN && currentState != EDIT);
#endif #endif
updateVisibility(); updateVisibility();
@ -509,7 +506,7 @@ void ProfileWidget2::plotDive(const struct dive *dIn, int dcIn, bool doClearPict
while (event) { while (event) {
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
// if print mode is selected only draw headings, SP change, gas events or bookmark event // if print mode is selected only draw headings, SP change, gas events or bookmark event
if (printMode) { if (profileScene->printMode) {
if (empty_string(event->name) || if (empty_string(event->name) ||
!(strcmp(event->name, "heading") == 0 || !(strcmp(event->name, "heading") == 0 ||
(same_string(event->name, "SP change") && event->time.seconds == 0) || (same_string(event->name, "SP change") && event->time.seconds == 0) ||
@ -525,7 +522,7 @@ void ProfileWidget2::plotDive(const struct dive *dIn, int dcIn, bool doClearPict
#endif #endif
DiveEventItem *item = new DiveEventItem(d, event, lastgasmix, profileScene->dataModel, DiveEventItem *item = new DiveEventItem(d, event, lastgasmix, profileScene->dataModel,
profileScene->timeAxis, profileScene->profileYAxis, profileScene->animSpeed, profileScene->timeAxis, profileScene->profileYAxis, profileScene->animSpeed,
fontPrintScale); profileScene->fontPrintScale);
item->setZValue(2); item->setZValue(2);
scene()->addItem(item); scene()->addItem(item);
eventItems.push_back(item); eventItems.push_back(item);
@ -817,7 +814,7 @@ void ProfileWidget2::setProfileState()
disconnectTemporaryConnections(); disconnectTemporaryConnections();
currentState = PROFILE; currentState = PROFILE;
setBackgroundBrush(getColor(::BACKGROUND, isGrayscale)); setBackgroundBrush(getColor(::BACKGROUND, profileScene->isGrayscale));
profileScene->updateAxes(); profileScene->updateAxes();
@ -1202,7 +1199,7 @@ void ProfileWidget2::changeGas(int tank, int seconds)
void ProfileWidget2::setPrintMode(bool grayscale) void ProfileWidget2::setPrintMode(bool grayscale)
{ {
printMode = true; profileScene->printMode = true;
resetZoom(); resetZoom();
// set printMode for axes // set printMode for axes
@ -1211,7 +1208,7 @@ void ProfileWidget2::setPrintMode(bool grayscale)
profileScene->temperatureAxis->setPrintMode(); profileScene->temperatureAxis->setPrintMode();
profileScene->timeAxis->setPrintMode(); profileScene->timeAxis->setPrintMode();
profileScene->cylinderPressureAxis->setPrintMode(); profileScene->cylinderPressureAxis->setPrintMode();
isGrayscale = grayscale; profileScene->isGrayscale = grayscale;
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
profileScene->heartBeatAxis->setPrintMode(); profileScene->heartBeatAxis->setPrintMode();
profileScene->percentageAxis->setPrintMode(); profileScene->percentageAxis->setPrintMode();
@ -1509,8 +1506,8 @@ 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(DURATION_LINE, isGrayscale), durationLinePenWidth)); e.durationLine->setPen(QPen(getColor(DURATION_LINE, profileScene->isGrayscale), durationLinePenWidth));
e.durationLine->setBrush(getColor(::BACKGROUND, isGrayscale)); e.durationLine->setBrush(getColor(::BACKGROUND, profileScene->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());
} else { } else {
@ -1829,7 +1826,7 @@ QImage ProfileWidget2::toImage(QSize size)
QRectF sceneRect(0.0, 0.0, 100.0, 102.0); QRectF sceneRect(0.0, 0.0, 100.0, 102.0);
QImage image(size, QImage::Format_ARGB32); QImage image(size, QImage::Format_ARGB32);
image.fill(getColor(::BACKGROUND, isGrayscale)); image.fill(getColor(::BACKGROUND, profileScene->isGrayscale));
QPainter imgPainter(&image); QPainter imgPainter(&image);
imgPainter.setRenderHint(QPainter::Antialiasing); imgPainter.setRenderHint(QPainter::Antialiasing);
@ -1837,7 +1834,7 @@ QImage ProfileWidget2::toImage(QSize size)
scene()->render(&imgPainter, QRect(QPoint(), size), sceneRect, Qt::IgnoreAspectRatio); scene()->render(&imgPainter, QRect(QPoint(), size), sceneRect, Qt::IgnoreAspectRatio);
imgPainter.end(); imgPainter.end();
if (isGrayscale) { if (profileScene->isGrayscale) {
// convert QImage to grayscale before rendering // convert QImage to grayscale before rendering
for (int i = 0; i < image.height(); i++) { for (int i = 0; i < image.height(); i++) {
QRgb *pixel = reinterpret_cast<QRgb *>(image.scanLine(i)); QRgb *pixel = reinterpret_cast<QRgb *>(image.scanLine(i));

3
profile-widget/profilewidget2.h
View file

@ -161,8 +161,6 @@ private:
DivePlannerPointsModel *plannerModel; // If null, no planning supported. DivePlannerPointsModel *plannerModel; // If null, no planning supported.
int zoomLevel; int zoomLevel;
qreal zoomFactor; qreal zoomFactor;
bool isGrayscale;
bool printMode;
#ifndef SUBSURFACE_MOBILE #ifndef SUBSURFACE_MOBILE
ToolTipItem *toolTipItem; ToolTipItem *toolTipItem;
#endif #endif
@ -237,7 +235,6 @@ private:
bool shouldCalculateMax; // Calculate maximum time and depth (default). False when dragging handles. bool shouldCalculateMax; // Calculate maximum time and depth (default). False when dragging handles.
int maxtime; int maxtime;
int maxdepth; int maxdepth;
double fontPrintScale;
// We store a const pointer to the shown dive. However, the undo commands want // We store a const pointer to the shown dive. However, the undo commands want
// (understandably) a non-const pointer. Since the profile has a context-menu // (understandably) a non-const pointer. Since the profile has a context-menu