1 - Fix the ruler leaving artifacts on the profile
2 - Fix the notification area not getting it's pos from the settings
3 - Fix the creation of a dive via the add-dive menu load the wrong dive on
the planner.
weeeha
From f9651adde887ed1a0c4d559572e5de4e658d5c0f Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabr...@intel.com>
Date: Sun, 9 Mar 2014 11:08:01 -0300
Subject: [PATCH 2/2] Fix retrieving the initial position of the Notification
Area.
We had all in place, all that was missing was to actually load
the position stored on the settings for the tooltips.
Signed-off-by: Tomaz Canabrava <tomaz.canabr...@intel.com>
---
qt-ui/profile/profilewidget2.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index d78b420..990e248 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -567,6 +567,7 @@ void ProfileWidget2::setProfileState()
return;
currentState = PROFILE;
+ toolTipItem->readPos();
setBackgroundBrush(getColor(::BACKGROUND));
background->setVisible(false);
--
1.9.0
From 1c6212d3261c93b1c77508c2a5a8bda50a57cdf2 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabr...@intel.com>
Date: Sun, 9 Mar 2014 10:59:31 -0300
Subject: [PATCH 1/2] Code Cleanup ( that fix 2 bugs )
This code cleanup fixes the two issues that I raised on
my last e-mail. hurrah.
Signed-off-by: Tomaz Canabrava <tomaz.canabr...@intel.com>
---
qt-ui/maintab.cpp | 2 ++
qt-ui/profile/profilewidget2.cpp | 16 ++++++++-------
qt-ui/profile/profilewidget2.h | 1 +
qt-ui/profile/ruleritem.cpp | 42 +++++-----------------------------------
qt-ui/profile/ruleritem.h | 6 +-----
5 files changed, 18 insertions(+), 49 deletions(-)
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index c2acaa7..847cf5e 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -671,6 +671,8 @@ void MainTab::acceptChanges()
editMode = NONE;
MainWindow::instance()->refreshDisplay();
MainWindow::instance()->dive_list()->selectDive(i, true);
+ MainWindow::instance()->graphics()->replot();
+
} else {
editMode = NONE;
MainWindow::instance()->dive_list()->rememberSelection();
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 3b8a3d1..d78b420 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -209,6 +209,13 @@ void ProfileWidget2::setupItemOnScene()
heartBeatAxis->setLinesVisible(true);
}
+void ProfileWidget2::replot()
+{
+ int diveId = dataModel->id();
+ dataModel->clear();
+ plotDives(QList<dive *>() << getDiveById(diveId));
+}
+
void ProfileWidget2::setupItemSizes()
{
// Scene is *always* (double) 100 / 100.
@@ -431,9 +438,7 @@ void ProfileWidget2::settingsChanged()
}
if (s.value("zoomed_plot").toBool() != isPlotZoomed) {
isPlotZoomed = s.value("zoomed_plot").toBool();
- int diveId = dataModel->id();
- dataModel->clear();
- plotDives(QList<dive *>() << getDiveById(diveId));
+ replot();
}
if (currentState == PROFILE) {
@@ -681,8 +686,5 @@ void ProfileWidget2::changeGas()
fixup_dive(d);
MainWindow::instance()->information()->updateDiveInfo(selected_dive);
mark_divelist_changed(true);
- // force the redraw of the dive.
- //TODO: find a way to make this do not need a full redraw
- dataModel->clear();
- plotDives(QList<dive *>() << getDiveById(diveId));
+ replot();
}
diff --git a/qt-ui/profile/profilewidget2.h b/qt-ui/profile/profilewidget2.h
index c22d2b1..5d4e98d 100644
--- a/qt-ui/profile/profilewidget2.h
+++ b/qt-ui/profile/profilewidget2.h
@@ -64,6 +64,7 @@ public:
ProfileWidget2(QWidget *parent = 0);
void plotDives(QList<dive *> dives);
+ void replot();
virtual bool eventFilter(QObject *, QEvent *);
void setupItem(AbstractProfilePolygonItem *item, DiveCartesianAxis *hAxis, DiveCartesianAxis *vAxis, DivePlotDataModel *model, int vData, int hData, int zValue);
diff --git a/qt-ui/profile/ruleritem.cpp b/qt-ui/profile/ruleritem.cpp
index a21a9a0..99a0443 100644
--- a/qt-ui/profile/ruleritem.cpp
+++ b/qt-ui/profile/ruleritem.cpp
@@ -16,10 +16,10 @@
RulerNodeItem2::RulerNodeItem2() : entry(NULL), ruler(NULL)
{
memset(&pInfo, 0, sizeof(pInfo));
- setRect(QRect(QPoint(-8, 8), QPoint(8, -8)));
+ setRect(-8, -8, 16, 16);
setBrush(QColor(0xff, 0, 0, 127));
- setPen(QColor("#FF0000"));
- setFlag(QGraphicsItem::ItemIsMovable);
+ setPen(QColor(Qt::red));
+ setFlag(ItemIsMovable);
setFlag(ItemSendsGeometryChanges);
setFlag(ItemIgnoresTransformations);
}
@@ -59,8 +59,7 @@ QVariant RulerNodeItem2::itemChange(GraphicsItemChange change, const QVariant &v
{
if (change == ItemPositionHasChanged) {
recalculate();
- if (ruler != NULL)
- ruler->recalculate();
+ ruler->recalculate();
}
return QGraphicsEllipseItem::itemChange(change, value);
}
@@ -97,7 +96,7 @@ void RulerItem2::recalculate()
startPoint = tmp;
}
QLineF line(startPoint, endPoint);
-
+ setLine(line);
compare_samples(source->entry, dest->entry, buffer, 500, 1);
text = QString(buffer);
@@ -127,37 +126,6 @@ RulerNodeItem2 *RulerItem2::destNode() const
return dest;
}
-void RulerItem2::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
-{
- Q_UNUSED(option);
- Q_UNUSED(widget);
- QLineF line(startPoint, endPoint);
- painter->setPen(QColor(Qt::black));
- painter->setBrush(Qt::NoBrush);
- painter->drawLine(line);
-}
-
-QRectF RulerItem2::boundingRect() const
-{
- return shape().controlPointRect();
-}
-
-QPainterPath RulerItem2::shape() const
-{
- QPainterPath path;
- QLineF line(startPoint, endPoint);
- QLineF line_n = line.normalVector();
- line_n.setLength(height);
- if (paint_direction == 1)
- line_n.setAngle(line_n.angle() + 180);
- path.moveTo(startPoint);
- path.lineTo(line_n.p2());
- path.lineTo(line_n.p2() + QPointF(line.dx(), line.dy()));
- path.lineTo(endPoint);
- path.lineTo(startPoint);
- return path;
-}
-
void RulerItem2::setPlotInfo(plot_info info)
{
pInfo = info;
diff --git a/qt-ui/profile/ruleritem.h b/qt-ui/profile/ruleritem.h
index 61eda1e..6ab86f4 100644
--- a/qt-ui/profile/ruleritem.h
+++ b/qt-ui/profile/ruleritem.h
@@ -31,8 +31,7 @@ private:
DiveCartesianAxis *depthAxis;
};
-class RulerItem2 : public QGraphicsObject {
- Q_OBJECT
+class RulerItem2 : public QGraphicsLineItem {
public:
explicit RulerItem2();
void recalculate();
@@ -40,9 +39,6 @@ public:
void setPlotInfo(struct plot_info pInfo);
RulerNodeItem2 *sourceNode() const;
RulerNodeItem2 *destNode() const;
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
- QRectF boundingRect() const;
- QPainterPath shape() const;
void setAxis(DiveCartesianAxis *time, DiveCartesianAxis *depth);
private:
--
1.9.0
_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
