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

Dive site: show distance to current dive using extra data

Browse source 
Currently, in the dive-site selection widget the distance to
the dive site of the current dive is shown. Instead, use the
recently introduced dive_get_gps_location() function. Thus,
the actual GPS coordinates extracted by libdivecomputer are
used.

The function is only called when the current dive changes
and the location is stored in the item delegate.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-04-25 09:35:46 +02:00 • committed by Dirk Hohndel
parent c7e1c40b0e
commit e76298a8a7
4 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop-widgets/locationinformation.cpp
View file

@ -371,7 +371,7 @@ DiveLocationLineEdit::DiveLocationLineEdit(QWidget *parent) : QLineEdit(parent),
view->setModel(proxy); view->setModel(proxy);
view->setModelColumn(LocationInformationModel::NAME); view->setModelColumn(LocationInformationModel::NAME);
view->setItemDelegate(new LocationFilterDelegate()); view->setItemDelegate(&delegate);
view->setEditTriggers(QAbstractItemView::NoEditTriggers); view->setEditTriggers(QAbstractItemView::NoEditTriggers);
view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
view->setSelectionBehavior(QAbstractItemView::SelectRows); view->setSelectionBehavior(QAbstractItemView::SelectRows);
@ -570,6 +570,7 @@ void DiveLocationLineEdit::setCurrentDiveSite(struct dive *d)
location_t currentLocation = d ? dive_get_gps_location(d) : location_t{0, 0}; location_t currentLocation = d ? dive_get_gps_location(d) : location_t{0, 0};
proxy->setCurrentLocation(currentLocation); proxy->setCurrentLocation(currentLocation);
delegate.setCurrentLocation(currentLocation);
} }
void DiveLocationLineEdit::showPopup() void DiveLocationLineEdit::showPopup()

2
desktop-widgets/locationinformation.h
View file

@ -5,6 +5,7 @@
#include "core/units.h" #include "core/units.h"
#include "core/divesite.h" #include "core/divesite.h"
#include "ui_locationinformation.h" #include "ui_locationinformation.h"
#include "modeldelegates.h"
#include "qt-models/divelocationmodel.h" #include "qt-models/divelocationmodel.h"
#include <stdint.h> #include <stdint.h>
#include <QAbstractListModel> #include <QAbstractListModel>
@ -108,6 +109,7 @@ private:
DiveLocationFilterProxyModel *proxy; DiveLocationFilterProxyModel *proxy;
DiveLocationModel *model; DiveLocationModel *model;
DiveLocationListView *view; DiveLocationListView *view;
LocationFilterDelegate delegate;
DiveSiteType currType; DiveSiteType currType;
struct dive_site *currDs; struct dive_site *currDs;
}; };

18
desktop-widgets/modeldelegates.cpp
View file

@ -441,10 +441,15 @@ QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOption
return w; return w;
} }
LocationFilterDelegate::LocationFilterDelegate(QObject*) LocationFilterDelegate::LocationFilterDelegate(QObject *) : currentLocation({0, 0})
{ {
} }
void LocationFilterDelegate::setCurrentLocation(location_t loc)
{
currentLocation = loc;
}
void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &origIdx) const void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &origIdx) const
{ {
QFont fontBigger = qApp->font(); QFont fontBigger = qApp->font();
@ -461,8 +466,7 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
QIcon icon = index.data(Qt::DecorationRole).value<QIcon>(); QIcon icon = index.data(Qt::DecorationRole).value<QIcon>();
struct dive_site *ds = struct dive_site *ds =
index.model()->data(index.model()->index(index.row(), LocationInformationModel::DIVESITE)).value<dive_site *>(); index.model()->data(index.model()->index(index.row(), LocationInformationModel::DIVESITE)).value<dive_site *>();
struct dive_site *currentDiveSite = current_dive ? get_dive_site_for_dive(current_dive) : nullptr; bool currentDiveHasGPS = has_location(&currentLocation);
bool currentDiveSiteHasGPS = currentDiveSite && dive_site_has_gps_location(currentDiveSite);
//Special case: do not show name, but instead, show //Special case: do not show name, but instead, show
if (index.row() < 2) { if (index.row() < 2) {
diveSiteName = index.data().toString(); diveSiteName = index.data().toString();
@ -487,13 +491,13 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
if (bottomText.isEmpty()) if (bottomText.isEmpty())
bottomText = printGPSCoords(&ds->location); bottomText = printGPSCoords(&ds->location);
if (dive_site_has_gps_location(ds) && currentDiveSiteHasGPS) { if (dive_site_has_gps_location(ds) && currentDiveHasGPS) {
// so we are showing a completion and both the current dive site and the completion // so we are showing a completion and both the current dive site and the completion
// have a GPS fix... so let's show the distance // have a GPS fix... so let's show the distance
if (same_location(&ds->location, &currentDiveSite->location)) { if (same_location(&ds->location, &currentLocation)) {
bottomText += tr(" (same GPS fix)"); bottomText += tr(" (same GPS fix)");
} else { } else {
int distanceMeters = get_distance(&ds->location, &currentDiveSite->location); int distanceMeters = get_distance(&ds->location, &currentLocation);
QString distance = distance_string(distanceMeters); QString distance = distance_string(distanceMeters);
int nr = nr_of_dives_at_dive_site(ds); int nr = nr_of_dives_at_dive_site(ds);
bottomText += tr(" (~%1 away").arg(distance); bottomText += tr(" (~%1 away").arg(distance);
@ -501,7 +505,7 @@ void LocationFilterDelegate::paint(QPainter *painter, const QStyleOptionViewItem
} }
} }
if (bottomText.isEmpty()) { if (bottomText.isEmpty()) {
if (currentDiveSiteHasGPS) if (currentDiveHasGPS)
bottomText = tr("(no existing GPS data, add GPS fix from this dive)"); bottomText = tr("(no existing GPS data, add GPS fix from this dive)");
else else
bottomText = tr("(no GPS data)"); bottomText = tr("(no GPS data)");

5
desktop-widgets/modeldelegates.h
View file

@ -2,6 +2,8 @@
#ifndef MODELDELEGATES_H #ifndef MODELDELEGATES_H
#define MODELDELEGATES_H #define MODELDELEGATES_H
#include "core/units.h"
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QComboBox> #include <QComboBox>
class QPainter; class QPainter;
@ -130,6 +132,9 @@ public:
LocationFilterDelegate(QObject *parent = 0); LocationFilterDelegate(QObject *parent = 0);
void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
void setCurrentLocation(location_t loc);
private:
location_t currentLocation;
}; };
#endif // MODELDELEGATES_H #endif // MODELDELEGATES_H