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

Group dives by trips

Browse source 
Group dives according to the allocated dive trips.

Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Grace Karanja 2015-06-11 09:39:32 +03:00 • committed by Dirk Hohndel
parent f0c7779753
commit ee9452ae8a
3 changed files with 51 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

21
qt-models/divelistmodel.cpp
View file

@ -5,6 +5,14 @@ Dive::Dive(dive *d)
{
m_thisDive = d;
setDiveNumber(QString::number(d->number));
dive_trip *trip = d->divetrip;
if(trip) {
//trip is valid
setTrip(trip->location);
}
setDate(get_dive_date_string(d->when));
setDepth(get_depth_string(d->maxdepth));
setDuration(get_dive_duration_string(d->duration.seconds, "h:","min"));
@ -153,6 +161,16 @@ void Dive::setNotes(const QString &notes)
{
m_notes = notes;
}
QString Dive::trip() const
{
return m_trip;
}
void Dive::setTrip(const QString &trip)
{
m_trip = trip;
}
@ -184,6 +202,8 @@ QVariant DiveListModel::data(const QModelIndex &index, int role) const
if (role == DiveNumberRole)
return dive.diveNumber();
else if (role == DiveTripRole)
return dive.trip();
else if (role == DiveDateRole)
return dive.date();
else if (role == DiveRatingRole)
@ -217,6 +237,7 @@ QHash<int, QByteArray> DiveListModel::roleNames() const
{
QHash<int, QByteArray> roles;
roles[DiveNumberRole] = "diveNumber";
roles[DiveTripRole] = "trip";
roles[DiveDateRole] = "date";
roles[DiveRatingRole] = "rating";
roles[DiveDepthRole] = "depth";