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

Show dive computer ceiling

Browse source 
This patch adds dive computer calculated ceiling on the profile graph as a
'hole' on it. There's an item that paints it in red - maybe we shouldn't
offer an option here and show that only in red?

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-01-21 17:07:22 -02:00 • committed by Dirk Hohndel
parent 162d674c5b
commit 58d9282955
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
qt-ui/profile/diveprofileitem.cpp
View file

@ -6,6 +6,7 @@
#include "profile.h" #include "profile.h"
#include "dive.h" #include "dive.h"
#include "profilegraphics.h" #include "profilegraphics.h"
#include "preferences.h"
#include <QPen> #include <QPen>
#include <QPainter> #include <QPainter>
@ -17,7 +18,7 @@
AbstractProfilePolygonItem::AbstractProfilePolygonItem(): QObject(), QGraphicsPolygonItem(), AbstractProfilePolygonItem::AbstractProfilePolygonItem(): QObject(), QGraphicsPolygonItem(),
hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1) hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1)
{ {
connect(PreferencesDialog::instance(), SIGNAL(settingsChanged()), this, SLOT(modelDataChanged()));
} }
void AbstractProfilePolygonItem::setHorizontalAxis(DiveCartesianAxis* horizontal) void AbstractProfilePolygonItem::setHorizontalAxis(DiveCartesianAxis* horizontal)
@ -79,7 +80,7 @@ void DiveProfileItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
// This paints the Polygon + Background. I'm setting the pen to QPen() so we don't get a black line here, // This paints the Polygon + Background. I'm setting the pen to QPen() so we don't get a black line here,
// after all we need to plot the correct velocities colors later. // after all we need to plot the correct velocities colors later.
setPen(QPen()); setPen(Qt::NoPen);
QGraphicsPolygonItem::paint(painter, option, widget); QGraphicsPolygonItem::paint(painter, option, widget);
// Here we actually paint the boundaries of the Polygon using the colors that the model provides. // Here we actually paint the boundaries of the Polygon using the colors that the model provides.
@ -100,6 +101,24 @@ void DiveProfileItem::modelDataChanged(){
AbstractProfilePolygonItem::modelDataChanged(); AbstractProfilePolygonItem::modelDataChanged();
if(polygon().isEmpty()) if(polygon().isEmpty())
return; return;
/* Show any ceiling we may have encountered */
if (prefs.profile_dc_ceiling) {
QPolygonF p = polygon();
plot_data *entry = dataModel->data() + dataModel->rowCount()-1;
for (int i = dataModel->rowCount() - 1; i >= 0; i--, entry--) {
if (!entry->in_deco) {
/* not in deco implies this is a safety stop, no ceiling */
p.append(QPointF(hAxis->posAtValue(entry->sec), vAxis->posAtValue(0)));
} else if (entry->stopdepth < entry->depth) {
p.append(QPointF(hAxis->posAtValue(entry->sec), vAxis->posAtValue(entry->stopdepth)));
} else {
p.append(QPointF(hAxis->posAtValue(entry->sec), vAxis->posAtValue(entry->depth)));
}
}
setPolygon(p);
}
// This is the blueish gradient that the Depth Profile should have. // This is the blueish gradient that the Depth Profile should have.
// It's a simple QLinearGradient with 2 stops, starting from top to bottom. // It's a simple QLinearGradient with 2 stops, starting from top to bottom.
QLinearGradient pat(0, polygon().boundingRect().top(), 0, polygon().boundingRect().bottom()); QLinearGradient pat(0, polygon().boundingRect().top(), 0, polygon().boundingRect().bottom());