From 4e06c52f683abe426589035ce472d00b495e2eab Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 16 Sep 2013 11:09:54 -0300 Subject: Position the X and Y labels of the Rulers Position the X and Y labels of the rulers, this way it's a bit more clear the deepness and the length of the trip. It's still not the best approach, but I'm getting close. Signed-off-by: Tomaz Canabrava --- qt-ui/diveplanner.cpp | 19 ++++++++++++++++++- qt-ui/diveplanner.h | 2 ++ 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'qt-ui') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index ab7bda17d..5d0299c88 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -673,21 +673,38 @@ void DiveHandler::mousePressEvent(QGraphicsSceneMouseEvent* event) void Ruler::setMaximum(double maximum) { + maxText->setText(QString::number(maximum)); + if(orientation == Qt::Horizontal) + maxText->setPos( line().x2(), line().y2() -5 ); + else + maxText->setPos( line().x1() - 50, line().y2()); max = maximum; } void Ruler::setMinimum(double minimum) { + minText->setText(QString::number(minimum)); + if(orientation == Qt::Horizontal) + minText->setPos( line().x1(), line().y2() -5 ); + else + minText->setPos( line().x1() - 50, line().y1()); min = minimum; } -Ruler::Ruler() : orientation(Qt::Horizontal) +Ruler::Ruler() : orientation(Qt::Horizontal), +minText(new QGraphicsSimpleTextItem(this)), +maxText(new QGraphicsSimpleTextItem(this)) { + minText->setFlag(QGraphicsItem::ItemIgnoresTransformations); + maxText->setFlag(QGraphicsItem::ItemIgnoresTransformations); } void Ruler::setOrientation(Qt::Orientation o) { orientation = o; + // position the elements on the screen. + setMinimum(minimum()); + setMaximum(maximum()); } void Ruler::updateTicks() diff --git a/qt-ui/diveplanner.h b/qt-ui/diveplanner.h index 091b9f80c..1bcea0c27 100644 --- a/qt-ui/diveplanner.h +++ b/qt-ui/diveplanner.h @@ -99,6 +99,8 @@ public: private: Qt::Orientation orientation; QList ticks; + QGraphicsSimpleTextItem *minText; + QGraphicsSimpleTextItem *maxText; double min; double max; double interval; -- cgit v1.2.3-70-g09d2