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

Amend divetrip model to use int units

Browse source 
Amend the DiveItem class to avoid float in favour of int. Add getters
which return display friendly QStrings reflecting user preferences for
(e.g.) depth.

Modify DiveTripModel to support controlled alignment by column; right
align for depth and duration.

Fix problems with utf8 encoding on rating stars, degree symbols and
O2 subscript.

Signed-off-by: Amit Chaudhuri <amit.k.chaudhuri@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Amit Chaudhuri 2013-04-24 16:57:30 +01:00 • committed by Dirk Hohndel
parent 17c4120143
commit edab566105
2 changed files with 85 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
qt-ui/divelistview.cpp
View file

@ -8,4 +8,5 @@
DiveListView::DiveListView(QWidget *parent) : QTreeView(parent) DiveListView::DiveListView(QWidget *parent) : QTreeView(parent)
{ {
setUniformRowHeights(true);
} }

110
qt-ui/models.cpp
View file

@ -8,6 +8,8 @@
#include "../dive.h" #include "../dive.h"
#include "../divelist.h" #include "../divelist.h"
#include <QtDebug>
extern struct tank_info tank_info[100]; extern struct tank_info tank_info[100];
CylindersModel::CylindersModel(QObject* parent): QAbstractTableModel(parent) CylindersModel::CylindersModel(QObject* parent): QAbstractTableModel(parent)
@ -292,14 +294,16 @@ void TankInfoModel::update()
class DiveItem class DiveItem
{ {
public: public:
explicit DiveItem(): number(0), dateTime(QString()), duration(0.0), depth(0.0), location(QString()) {parentItem = 0;} explicit DiveItem(): number(0), dateTime(QString()), seconds(0), mm(0), location(QString()) { parentItem = 0; }
explicit DiveItem(int num, QString dt, float, float, QString loc, DiveItem *parent = 0); explicit DiveItem(int num, QString dt, int, int, QString loc, DiveItem *parent = 0);
~DiveItem() { qDeleteAll(childlist); } ~DiveItem() { qDeleteAll(childlist); }
int diveNumber() const { return number; } int diveNumber() const { return number; }
const QString& diveDateTime() const { return dateTime; } const QString& diveDateTime() const { return dateTime; }
float diveDuration() const { return duration; } int diveDuration() const { return seconds; }
float diveDepth() const { return depth; } int diveDepth() const { return mm; }
QString displayDuration() const;
QString displayDepth() const;
const QString& diveLocation() const { return location; } const QString& diveLocation() const { return location; }
DiveItem *parent() const { return parentItem; } DiveItem *parent() const { return parentItem; }
const QList<DiveItem *>& children() const { return childlist; } const QList<DiveItem *>& children() const { return childlist; }
@ -312,8 +316,8 @@ public:
private: private:
int number; int number;
QString dateTime; QString dateTime;
float duration; int seconds;
float depth; int mm;
QString location; QString location;
DiveItem *parentItem; DiveItem *parentItem;
@ -321,13 +325,49 @@ private:
}; };
DiveItem::DiveItem(int num, QString dt, float dur, float dep, QString loc, DiveItem *p): DiveItem::DiveItem(int num, QString dt, int dur, int dep, QString loc, DiveItem *p):
number(num), dateTime(dt), duration(dur), depth(dep), location(loc), parentItem(p) number(num), dateTime(dt), seconds(dur), mm(dep), location(loc), parentItem(p)
{ {
if (parentItem) if (parentItem)
parentItem->addChild(this); parentItem->addChild(this);
} }
QString DiveItem::displayDepth() const
{
const int scale = 1000;
QString fract, str;
if (get_units()->length == units::METERS) {
fract = QString::number((unsigned)(mm % scale) / 10);
str = QString("%1.%2").arg((unsigned)(mm / scale)).arg(fract);
}
if (get_units()->length == units::FEET) {
str = QString::number(mm_to_feet(mm),'f',2);
}
return str;
}
QString DiveItem::displayDuration() const
{
int hrs, mins, secs, val;
const int minutes_hour = 60;
const int seconds_minute= 60;
val = seconds;
secs = seconds % seconds_minute;
val /= seconds_minute;
mins = val % seconds_minute;
val /= minutes_hour;
hrs = val % minutes_hour;
QString displayTime;
if (hrs > 0)
displayTime = QString("%1:%2:%3").arg(hrs).arg(mins).arg(secs);
else
displayTime = QString("%1:%2").arg(mins).arg(secs);
return displayTime;
}
DiveTripModel::DiveTripModel(QObject *parent) : QAbstractItemModel(parent) DiveTripModel::DiveTripModel(QObject *parent) : QAbstractItemModel(parent)
{ {
rootItem = new DiveItem; rootItem = new DiveItem;
@ -341,8 +381,8 @@ DiveTripModel::DiveTripModel(QObject *parent) : QAbstractItemModel(parent)
buffer = get_dive_date_string(&tm); buffer = get_dive_date_string(&tm);
new DiveItem(d->number, new DiveItem(d->number,
buffer, buffer,
d->duration.seconds/60.0, d->duration.seconds,
d->maxdepth.mm/1000.0 , d->maxdepth.mm,
d->location, d->location,
rootItem); rootItem);
free(buffer); free(buffer);
@ -368,7 +408,17 @@ QVariant DiveTripModel::data(const QModelIndex &index, int role) const
DiveItem *item = static_cast<DiveItem*>(index.internalPointer()); DiveItem *item = static_cast<DiveItem*>(index.internalPointer());
QVariant retVal; QVariant retVal;
if (role == Qt::DisplayRole){ if (role == Qt::TextAlignmentRole) {
switch (index.column()) {
case DURATION: /* fall through */
case DEPTH:
retVal = Qt::AlignRight;
break;
default:
retVal = Qt::AlignLeft;
}
}
if (role == Qt::DisplayRole) {
switch (index.column()) { switch (index.column()) {
case NR: case NR:
retVal = item->diveNumber(); retVal = item->diveNumber();
@ -377,10 +427,12 @@ QVariant DiveTripModel::data(const QModelIndex &index, int role) const
retVal = item->diveDateTime(); retVal = item->diveDateTime();
break; break;
case DURATION: case DURATION:
retVal = item->diveDuration(); retVal = item->displayDuration();
//retVal = item->diveDuration();
break; break;
case DEPTH: case DEPTH:
retVal = item->diveDepth(); retVal = item->displayDepth();
//retVal = item->diveDepth();
break; break;
case LOCATION: case LOCATION:
retVal = item->diveLocation(); retVal = item->diveLocation();
@ -394,12 +446,11 @@ QVariant DiveTripModel::data(const QModelIndex &index, int role) const
QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int role) const QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int role) const
{ {
QVariant ret; QVariant ret;
if (orientation != Qt::Horizontal){ if (orientation != Qt::Horizontal)
return ret; return ret;
}
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
switch(section){ switch(section) {
case NR: case NR:
ret = tr("#"); ret = tr("#");
break; break;
@ -407,19 +458,28 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Date"); ret = tr("Date");
break; break;
case RATING: case RATING:
ret = UTF8_BLACKSTAR; ret = QString::fromUtf8(UTF8_BLACKSTAR);
break; break;
case DEPTH: case DEPTH:
ret = tr("ft"); if (get_units()->length == units::METERS)
ret = tr("Depth (m)");
else
ret = tr("Depth (ft)");
break; break;
case DURATION: case DURATION:
ret = tr("min"); ret = tr("Duration (h:mm:ss)");
break; break;
case TEMPERATURE: case TEMPERATURE:
ret = UTF8_DEGREE "F"; if (get_units()->temperature == units::CELSIUS)
ret = QString("%1%2").arg(QString::fromUtf8(UTF8_DEGREE)).arg("C");
else
ret = QString("%1%2").arg(QString::fromUtf8(UTF8_DEGREE)).arg("F");
break; break;
case TOTALWEIGHT: case TOTALWEIGHT:
ret = tr("lbs"); if (get_units()->weight == units::KG)
ret = tr("Weight (kg)");
else
ret = tr("Weight (lbs)");
break; break;
case SUIT: case SUIT:
ret = tr("Suit"); ret = tr("Suit");
@ -428,7 +488,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
ret = tr("Cyl"); ret = tr("Cyl");
break; break;
case NITROX: case NITROX:
ret = "O" UTF8_SUBSCRIPT_2 "%"; ret = QString("O%1%").arg(QString::fromUtf8(UTF8_SUBSCRIPT_2));
break; break;
case SAC: case SAC:
ret = tr("SAC"); ret = tr("SAC");
@ -450,9 +510,8 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int
int DiveTripModel::rowCount(const QModelIndex &parent) const int DiveTripModel::rowCount(const QModelIndex &parent) const
{ {
/* only allow kids in column 0 */ /* only allow kids in column 0 */
if (parent.isValid() && parent.column() > 0){ if (parent.isValid() && parent.column() > 0)
return 0; return 0;
}
DiveItem *item = itemForIndex(parent); DiveItem *item = itemForIndex(parent);
return item ? item->children().count() : 0; return item ? item->children().count() : 0;
} }
@ -474,9 +533,8 @@ QModelIndex DiveTripModel::index(int row, int column, const QModelIndex &parent)
DiveItem *parentItem = itemForIndex(parent); DiveItem *parentItem = itemForIndex(parent);
Q_ASSERT(parentItem); Q_ASSERT(parentItem);
if (DiveItem *item = parentItem->children().at(row)){ if (DiveItem *item = parentItem->children().at(row))
return createIndex(row, column, item); return createIndex(row, column, item);
}
return QModelIndex(); return QModelIndex();
} }