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

Fixed item visibility on emptyState after being on profileState.

Browse source 
Background was not correctly back to it's original position
and a few other items kept their visibility when it shouldn't.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-02-10 15:01:04 -02:00 • committed by Dirk Hohndel
parent cafc7e4b13
commit bb71707321
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/profile/divecartesianaxis.cpp
View file

@ -391,9 +391,9 @@ void DiveCartesianPlane::setup()
// DEPTH is M_OR_FEET(10,30), Minutes are 600, per line. // DEPTH is M_OR_FEET(10,30), Minutes are 600, per line.
for (int i = leftAxis->minimum(), max = leftAxis->maximum(); i < max; i += M_OR_FT(10,30)) { for (int i = leftAxis->minimum(), max = leftAxis->maximum(); i < max; i += M_OR_FT(10,30)) {
DiveLineItem *line = new DiveLineItem(); DiveLineItem *line = new DiveLineItem(this);
line->setLine(0, 0, horizontalSize, 0); line->setLine(0, 0, horizontalSize, 0);
line->setPos(left,leftAxis->posAtValue(i)); line->setPos(0,leftAxis->posAtValue(i)-top);
line->setZValue(-1); line->setZValue(-1);
line->setPen(gridPen()); line->setPen(gridPen());
horizontalLines.push_back(line); horizontalLines.push_back(line);
@ -401,9 +401,9 @@ void DiveCartesianPlane::setup()
} }
for (int i = bottomAxis->minimum(), max = bottomAxis->maximum(); i < max; i += 600) { // increments by 10 minutes. for (int i = bottomAxis->minimum(), max = bottomAxis->maximum(); i < max; i += 600) { // increments by 10 minutes.
DiveLineItem *line = new DiveLineItem(); DiveLineItem *line = new DiveLineItem(this);
line->setLine(0, 0, 0, verticalSize); line->setLine(0, 0, 0, verticalSize);
line->setPos(bottomAxis->posAtValue(i), top); line->setPos(bottomAxis->posAtValue(i)-left, 0);
line->setZValue(-1); line->setZValue(-1);
line->setPen(gridPen()); line->setPen(gridPen());
verticalLines.push_back(line); verticalLines.push_back(line);

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

@ -147,6 +147,7 @@ void ProfileWidget2::setupItemOnScene()
cartesianPlane->setBottomAxis(timeAxis); cartesianPlane->setBottomAxis(timeAxis);
cartesianPlane->setLeftAxis(profileYAxis); cartesianPlane->setLeftAxis(profileYAxis);
cartesianPlane->setZValue(-1);
diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignBottom); diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignBottom);
diveComputerText->setBrush(getColor(TIME_TEXT)); diveComputerText->setBrush(getColor(TIME_TEXT));
@ -440,14 +441,15 @@ void ProfileWidget2::setEmptyState()
gasYAxis->setPos(itemPos.partialgas.pos.off); gasYAxis->setPos(itemPos.partialgas.pos.off);
timeAxis->setPos(itemPos.time.pos.off); timeAxis->setPos(itemPos.time.pos.off);
background->setY( itemPos.background.on.y()); background->setY( itemPos.background.on.y());
background->setVisible(true);
toolTipItem->setVisible(false); toolTipItem->setVisible(false);
temperatureAxis->setPos(itemPos.temperature.pos.off); temperatureAxis->setPos(itemPos.temperature.pos.off);
cylinderPressureAxis->setPos(itemPos.cylinder.pos.off); cylinderPressureAxis->setPos(itemPos.cylinder.pos.off);
cartesianPlane->setVisible(false);
meanDepth->setVisible(false); meanDepth->setVisible(false);
diveComputerText->setVisible(false); diveComputerText->setVisible(false);
diveCeiling->setVisible(false); diveCeiling->setVisible(false);
reportedCeiling->setVisible(false); reportedCeiling->setVisible(false);
cartesianPlane->setVisible(false);
Q_FOREACH(DiveCalculatedTissue *tissue, allTissues){ Q_FOREACH(DiveCalculatedTissue *tissue, allTissues){
tissue->setVisible(false); tissue->setVisible(false);
} }