4 files changed, 14 insertions, 40 deletions

diff --git a/qt-ui/profile/animationfunctions.cpp b/qt-ui/profile/animationfunctions.cpp
index 103af8787..f70468bde 100644
--- a/qt-ui/profile/animationfunctions.cpp
+++ b/qt-ui/profile/animationfunctions.cpp
@@ -35,5 +35,4 @@ void moveTo(QObject* obj, const QPointF& pos, int msecs)
 	moveTo(obj, pos.x(), pos.y(), msecs);
 }
 
-
 }
diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp
index 190a2f799..d2806aa40 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/qt-ui/profile/divecartesianaxis.cpp
@@ -60,7 +60,7 @@ void DiveCartesianAxis::setTextColor(const QColor& color)
 	textColor = color;
 }
 
-DiveCartesianAxis::DiveCartesianAxis() : orientation(LeftToRight), showTicks(true), showText(true)
+DiveCartesianAxis::DiveCartesianAxis() : orientation(LeftToRight)
 {
 	setPen(gridPen());
 }
@@ -90,7 +90,7 @@ void DiveCartesianAxis::updateTicks()
 	double steps = (max - min) / interval;
 	double currValue = min;
 
-	if(!showText && !labels.isEmpty()){
+	if(!labels.isEmpty()){
 			qDeleteAll(labels);
 			labels.clear();
 	}
@@ -145,27 +145,19 @@ void DiveCartesianAxis::updateTicks()
 		} else {
 			childPos = begin - i * stepSize;
 		}
-		DiveTextItem *label = NULL;
-
-		if (showText){
-			label = new DiveTextItem(this);
-			label->setText(textForValue(currValue));
-			label->setBrush(QBrush(textColor));
-			label->setBrush(colorForValue(currValue));
-			labels.push_back(label);
-		}
+		DiveTextItem *label = new DiveTextItem(this);
+		label->setText(textForValue(currValue));
+		label->setBrush(QBrush(textColor));
+		label->setBrush(colorForValue(currValue));
+		labels.push_back(label);
 		if (orientation == RightToLeft || orientation == LeftToRight) {
-			if(showText){
-				label->setAlignment(Qt::AlignBottom | Qt::AlignHCenter);
-				label->setPos(scene()->sceneRect().width() + 10, m.y1() + tick_size); // position it outside of the scene);
-				label->animateMoveTo(childPos, m.y1() + tick_size);
-			}
+			label->setAlignment(Qt::AlignBottom | Qt::AlignHCenter);
+			label->setPos(scene()->sceneRect().width() + 10, m.y1() + tick_size); // position it outside of the scene);
+			label->animateMoveTo(childPos, m.y1() + tick_size);
 		} else {
-			if(showText){
-				label->setAlignment(Qt::AlignVCenter| Qt::AlignLeft);
-				label->setPos(m.x1() - tick_size, scene()->sceneRect().height() + 10);
-				label->animateMoveTo(m.x1() - tick_size, childPos);
-			}
+			label->setAlignment(Qt::AlignVCenter| Qt::AlignLeft);
+			label->setPos(m.x1() - tick_size, scene()->sceneRect().height() + 10);
+			label->animateMoveTo(m.x1() - tick_size, childPos);
 		}
 	}
 }
@@ -177,18 +169,6 @@ void DiveCartesianAxis::animateChangeLine(const QLineF& newLine)
 	sizeChanged();
 }
 
-void DiveCartesianAxis::setShowText(bool show)
-{
-	showText = show;
-	updateTicks();
-}
-
-void DiveCartesianAxis::setShowTicks(bool show)
-{
-	showTicks = show;
-	updateTicks();
-}
-
 QString DiveCartesianAxis::textForValue(double value)
 {
 	return QString::number(value);
diff --git a/qt-ui/profile/divecartesianaxis.h b/qt-ui/profile/divecartesianaxis.h
index a6e94e548..753a3e44d 100644
--- a/qt-ui/profile/divecartesianaxis.h
+++ b/qt-ui/profile/divecartesianaxis.h
@@ -34,8 +34,6 @@ public:
 	qreal posAtValue(qreal value);
 	void setColor(const QColor& color);
 	void setTextColor(const QColor& color);
-	void setShowTicks(bool show);
-	void setShowText(bool show);
 	void animateChangeLine(const QLineF& newLine);
 	int unitSystem;
 public slots:
@@ -53,8 +51,6 @@ protected:
 	double interval;
 	double tick_size;
 	QColor textColor;
-	bool showTicks;
-	bool showText;
 };
 
 class DepthAxis : public DiveCartesianAxis {
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 14a7c3a28..b7970c759 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -120,7 +120,7 @@ void ProfileWidget2::setupItemOnScene()
 	profileYAxis->setOrientation(DiveCartesianAxis::TopToBottom);
 	profileYAxis->setMinimum(0);
 	profileYAxis->setTickInterval(M_OR_FT(10,30));
-	profileYAxis->setTickSize(2);
+	profileYAxis->setTickSize(1);
 
 	gasYAxis->setOrientation(DiveCartesianAxis::BottomToTop);
 	gasYAxis->setTickInterval(1);
@@ -268,7 +268,6 @@ void ProfileWidget2::plotDives(QList<dive*> dives)
 	profileYAxis->setMaximum(maxdepth);
 	profileYAxis->updateTicks();
 
-	qDebug() << "More profile..." << profileYAxis->minimum() << profileYAxis->maximum() << profileYAxis->tickInterval() << profileYAxis->tickSize();
 	temperatureAxis->setMinimum(pInfo.mintemp);
 	temperatureAxis->setMaximum(pInfo.maxtemp);
 	timeAxis->setMaximum(maxtime);