Fixed item visibility on emptyState after being on profileState.

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>

2 files changed, 7 insertions, 5 deletions

diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp
index c45546825..5bb0d9498 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/qt-ui/profile/divecartesianaxis.cpp
@@ -391,9 +391,9 @@ void DiveCartesianPlane::setup()
 
 	// 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)) {
-		DiveLineItem *line = new DiveLineItem();
+		DiveLineItem *line = new DiveLineItem(this);
 		line->setLine(0, 0, horizontalSize, 0);
-		line->setPos(left,leftAxis->posAtValue(i));
+		line->setPos(0,leftAxis->posAtValue(i)-top);
 		line->setZValue(-1);
 		line->setPen(gridPen());
 		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.
-		DiveLineItem *line = new DiveLineItem();
+		DiveLineItem *line = new DiveLineItem(this);
 		line->setLine(0, 0, 0, verticalSize);
-		line->setPos(bottomAxis->posAtValue(i), top);
+		line->setPos(bottomAxis->posAtValue(i)-left, 0);
 		line->setZValue(-1);
 		line->setPen(gridPen());
 		verticalLines.push_back(line);
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 69ec8b9e2..6b53e9bf5 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -147,6 +147,7 @@ void ProfileWidget2::setupItemOnScene()
 
 	cartesianPlane->setBottomAxis(timeAxis);
 	cartesianPlane->setLeftAxis(profileYAxis);
+	cartesianPlane->setZValue(-1);
 
 	diveComputerText->setAlignment(Qt::AlignRight | Qt::AlignBottom);
 	diveComputerText->setBrush(getColor(TIME_TEXT));
@@ -440,14 +441,15 @@ void ProfileWidget2::setEmptyState()
 	gasYAxis->setPos(itemPos.partialgas.pos.off);
 	timeAxis->setPos(itemPos.time.pos.off);
 	background->setY( itemPos.background.on.y());
+	background->setVisible(true);
 	toolTipItem->setVisible(false);
 	temperatureAxis->setPos(itemPos.temperature.pos.off);
 	cylinderPressureAxis->setPos(itemPos.cylinder.pos.off);
-	cartesianPlane->setVisible(false);
 	meanDepth->setVisible(false);
 	diveComputerText->setVisible(false);
 	diveCeiling->setVisible(false);
 	reportedCeiling->setVisible(false);
+	cartesianPlane->setVisible(false);
 	Q_FOREACH(DiveCalculatedTissue *tissue, allTissues){
 		tissue->setVisible(false);
 	}