diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | qt-models/divetripmodel.cpp | 544 | ||||
| -rw-r--r-- | qt-models/divetripmodel.h | 92 | ||||
| -rw-r--r-- | qt-models/models.cpp | 543 | ||||
| -rw-r--r-- | qt-models/models.h | 85 | ||||
| -rw-r--r-- | qt-ui/divelistview.h | 1 | ||||
| -rw-r--r-- | qt-ui/modeldelegates.cpp | 2 | ||||
| -rw-r--r-- | qt-ui/printlayout.cpp | 1 |
8 files changed, 643 insertions, 626 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21221d772..f63e779fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,6 +258,7 @@ set(SUBSURFACE_MODELS_LIB_SRCS qt-models/divecomputermodel.cpp qt-models/treemodel.cpp qt-models/yearlystatisticsmodel.cpp + qt-models/divetripmodel.cpp qt-models/divecomputerextradatamodel.cpp qt-models/completionmodels.cpp ) diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp new file mode 100644 index 000000000..4934b8b20 --- /dev/null +++ b/qt-models/divetripmodel.cpp @@ -0,0 +1,544 @@ +#include "divetripmodel.h" +#include "gettextfromc.h" +#include "metrics.h" +#include "divelist.h" +#include "helpers.h" + +static int nitrox_sort_value(struct dive *dive) +{ + int o2, he, o2max; + get_dive_gas(dive, &o2, &he, &o2max); + return he * 1000 + o2; +} + +static QVariant dive_table_alignment(int column) +{ + QVariant retVal; + switch (column) { + case DiveTripModel::DEPTH: + case DiveTripModel::DURATION: + case DiveTripModel::TEMPERATURE: + case DiveTripModel::TOTALWEIGHT: + case DiveTripModel::SAC: + case DiveTripModel::OTU: + case DiveTripModel::MAXCNS: + // Right align numeric columns + retVal = int(Qt::AlignRight | Qt::AlignVCenter); + break; + // NR needs to be left aligned becase its the indent marker for trips too + case DiveTripModel::NR: + case DiveTripModel::DATE: + case DiveTripModel::RATING: + case DiveTripModel::SUIT: + case DiveTripModel::CYLINDER: + case DiveTripModel::GAS: + case DiveTripModel::LOCATION: + retVal = int(Qt::AlignLeft | Qt::AlignVCenter); + break; + } + return retVal; +} + +QVariant TripItem::data(int column, int role) const +{ + QVariant ret; + + if (role == DiveTripModel::TRIP_ROLE) + return QVariant::fromValue<void *>(trip); + + if (role == DiveTripModel::SORT_ROLE) + return (qulonglong)trip->when; + + if (role == Qt::DisplayRole) { + switch (column) { + case DiveTripModel::NR: + QString shownText; + struct dive *d = trip->dives; + int countShown = 0; + while (d) { + if (!d->hidden_by_filter) + countShown++; + d = d->next; + } + if (countShown < trip->nrdives) + shownText = tr(" (%1 shown)").arg(countShown); + if (trip->location && *trip->location) + ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives) + shownText; + else + ret = get_trip_date_string(trip->when, trip->nrdives) + shownText; + break; + } + } + + return ret; +} + + +QVariant DiveItem::data(int column, int role) const +{ + QVariant retVal; + struct dive *dive = get_dive_by_uniq_id(diveId); + if (!dive) + return QVariant(); + + switch (role) { + case Qt::TextAlignmentRole: + retVal = dive_table_alignment(column); + break; + case DiveTripModel::SORT_ROLE: + Q_ASSERT(dive != NULL); + switch (column) { + case NR: + retVal = (qulonglong)dive->when; + break; + case DATE: + retVal = (qulonglong)dive->when; + break; + case RATING: + retVal = dive->rating; + break; + case DEPTH: + retVal = dive->maxdepth.mm; + break; + case DURATION: + retVal = dive->duration.seconds; + break; + case TEMPERATURE: + retVal = dive->watertemp.mkelvin; + break; + case TOTALWEIGHT: + retVal = total_weight(dive); + break; + case SUIT: + retVal = QString(dive->suit); + break; + case CYLINDER: + retVal = QString(dive->cylinder[0].type.description); + break; + case GAS: + retVal = nitrox_sort_value(dive); + break; + case SAC: + retVal = dive->sac; + break; + case OTU: + retVal = dive->otu; + break; + case MAXCNS: + retVal = dive->maxcns; + break; + case LOCATION: + retVal = QString(get_dive_location(dive)); + break; + } + break; + case Qt::DisplayRole: + Q_ASSERT(dive != NULL); + switch (column) { + case NR: + retVal = dive->number; + break; + case DATE: + retVal = displayDate(); + break; + case DEPTH: + retVal = displayDepth(); + break; + case DURATION: + retVal = displayDuration(); + break; + case TEMPERATURE: + retVal = displayTemperature(); + break; + case TOTALWEIGHT: + retVal = displayWeight(); + break; + case SUIT: + retVal = QString(dive->suit); + break; + case CYLINDER: + retVal = QString(dive->cylinder[0].type.description); + break; + case SAC: + retVal = displaySac(); + break; + case OTU: + retVal = dive->otu; + break; + case MAXCNS: + retVal = dive->maxcns; + break; + case LOCATION: + retVal = QString(get_dive_location(dive)); + break; + case GAS: + const char *gas_string = get_dive_gas_string(dive); + retVal = QString(gas_string); + free((void*)gas_string); + break; + } + break; + case Qt::ToolTipRole: + switch (column) { + case NR: + retVal = tr("#"); + break; + case DATE: + retVal = tr("Date"); + break; + case RATING: + retVal = tr("Rating"); + break; + case DEPTH: + retVal = tr("Depth(%1)").arg((get_units()->length == units::METERS) ? tr("m") : tr("ft")); + break; + case DURATION: + retVal = tr("Duration"); + break; + case TEMPERATURE: + retVal = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F"); + break; + case TOTALWEIGHT: + retVal = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs")); + break; + case SUIT: + retVal = tr("Suit"); + break; + case CYLINDER: + retVal = tr("Cyl"); + break; + case GAS: + retVal = tr("Gas"); + break; + case SAC: + const char *unit; + get_volume_units(0, NULL, &unit); + retVal = tr("SAC(%1)").arg(QString(unit).append(tr("/min"))); + break; + case OTU: + retVal = tr("OTU"); + break; + case MAXCNS: + retVal = tr("Max CNS"); + break; + case LOCATION: + retVal = tr("Location"); + break; + } + break; + } + + if (role == DiveTripModel::STAR_ROLE) { + Q_ASSERT(dive != NULL); + retVal = dive->rating; + } + if (role == DiveTripModel::DIVE_ROLE) { + retVal = QVariant::fromValue<void *>(dive); + } + if (role == DiveTripModel::DIVE_IDX) { + Q_ASSERT(dive != NULL); + retVal = get_divenr(dive); + } + return retVal; +} + +Qt::ItemFlags DiveItem::flags(const QModelIndex &index) const +{ + if (index.column() == NR) { + return TreeItem::flags(index) | Qt::ItemIsEditable; + } + return TreeItem::flags(index); +} + +bool DiveItem::setData(const QModelIndex &index, const QVariant &value, int role) +{ + if (role != Qt::EditRole) + return false; + if (index.column() != NR) + return false; + + int v = value.toInt(); + if (v == 0) + return false; + + int i; + struct dive *d; + for_each_dive (i, d) { + if (d->number == v) + return false; + } + d = get_dive_by_uniq_id(diveId); + d->number = value.toInt(); + mark_divelist_changed(true); + return true; +} + +QString DiveItem::displayDate() const +{ + struct dive *dive = get_dive_by_uniq_id(diveId); + return get_dive_date_string(dive->when); +} + +QString DiveItem::displayDepth() const +{ + struct dive *dive = get_dive_by_uniq_id(diveId); + return get_depth_string(dive->maxdepth); +} + +QString DiveItem::displayDepthWithUnit() const +{ + struct dive *dive = get_dive_by_uniq_id(diveId); + return get_depth_string(dive->maxdepth, true); +} + +QString DiveItem::displayDuration() const +{ + int hrs, mins, fullmins, secs; + struct dive *dive = get_dive_by_uniq_id(diveId); + mins = (dive->duration.seconds + 59) / 60; + fullmins = dive->duration.seconds / 60; + secs = dive->duration.seconds - 60 * fullmins; + hrs = mins / 60; + mins -= hrs * 60; + + QString displayTime; + if (hrs) + displayTime = QString("%1:%2").arg(hrs).arg(mins, 2, 10, QChar('0')); + else if (mins < 15 || dive->dc.divemode == FREEDIVE) + displayTime = QString("%1m%2s").arg(fullmins).arg(secs, 2, 10, QChar('0')); + else + displayTime = QString("%1").arg(mins); + return displayTime; +} + +QString DiveItem::displayTemperature() const +{ + QString str; + struct dive *dive = get_dive_by_uniq_id(diveId); + if (!dive->watertemp.mkelvin) + return str; + if (get_units()->temperature == units::CELSIUS) + str = QString::number(mkelvin_to_C(dive->watertemp.mkelvin), 'f', 1); + else + str = QString::number(mkelvin_to_F(dive->watertemp.mkelvin), 'f', 1); + return str; +} + +QString DiveItem::displaySac() const +{ + QString str; + struct dive *dive = get_dive_by_uniq_id(diveId); + if (dive->sac) { + const char *unit; + int decimal; + double value = get_volume_units(dive->sac, &decimal, &unit); + return QString::number(value, 'f', decimal); + } + return QString(""); +} + +QString DiveItem::displayWeight() const +{ + QString str = weight_string(weight()); + return str; +} + +int DiveItem::weight() const +{ + struct dive *dive = get_dive_by_uniq_id(diveId); + weight_t tw = { total_weight(dive) }; + return tw.grams; +} + +DiveTripModel::DiveTripModel(QObject *parent) : TreeModel(parent) +{ + columns = COLUMNS; +} + +Qt::ItemFlags DiveTripModel::flags(const QModelIndex &index) const +{ + if (!index.isValid()) + return 0; + + TripItem *item = static_cast<TripItem *>(index.internalPointer()); + return item->flags(index); +} + +QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + QVariant ret; + if (orientation == Qt::Vertical) + return ret; + + switch (role) { + case Qt::TextAlignmentRole: + ret = dive_table_alignment(section); + break; + case Qt::FontRole: + ret = defaultModelFont(); + break; + case Qt::DisplayRole: + switch (section) { + case NR: + ret = tr("#"); + break; + case DATE: + ret = tr("Date"); + break; + case RATING: + ret = tr("Rating"); + break; + case DEPTH: + ret = tr("Depth"); + break; + case DURATION: + ret = tr("Duration"); + break; + case TEMPERATURE: + ret = tr("Temp"); + break; + case TOTALWEIGHT: + ret = tr("Weight"); + break; + case SUIT: + ret = tr("Suit"); + break; + case CYLINDER: + ret = tr("Cyl"); + break; + case GAS: + ret = tr("Gas"); + break; + case SAC: + ret = tr("SAC"); + break; + case OTU: + ret = tr("OTU"); + break; + case MAXCNS: + ret = tr("Max CNS"); + break; + case LOCATION: + ret = tr("Location"); + break; + } + break; + case Qt::ToolTipRole: + switch (section) { + case NR: + ret = tr("#"); + break; + case DATE: + ret = tr("Date"); + break; + case RATING: + ret = tr("Rating"); + break; + case DEPTH: + ret = tr("Depth(%1)").arg((get_units()->length == units::METERS) ? tr("m") : tr("ft")); + break; + case DURATION: + ret = tr("Duration"); + break; + case TEMPERATURE: + ret = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F"); + break; + case TOTALWEIGHT: + ret = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs")); + break; + case SUIT: + ret = tr("Suit"); + break; + case CYLINDER: + ret = tr("Cyl"); + break; + case GAS: + ret = tr("Gas"); + break; + case SAC: + const char *unit; + get_volume_units(0, NULL, &unit); + ret = tr("SAC(%1)").arg(QString(unit).append(tr("/min"))); + break; + case OTU: + ret = tr("OTU"); + break; + case MAXCNS: + ret = tr("Max CNS"); + break; + case LOCATION: + ret = tr("Location"); + break; + } + break; + } + + return ret; +} + +void DiveTripModel::setupModelData() +{ + int i = dive_table.nr; + + if (rowCount()) { + beginRemoveRows(QModelIndex(), 0, rowCount() - 1); + endRemoveRows(); + } + + if (autogroup) + autogroup_dives(); + dive_table.preexisting = dive_table.nr; + while (--i >= 0) { + struct dive *dive = get_dive(i); + update_cylinder_related_info(dive); + dive_trip_t *trip = dive->divetrip; + + DiveItem *diveItem = new DiveItem(); + diveItem->diveId = dive->id; + + if (!trip || currentLayout == LIST) { + diveItem->parent = rootItem; + rootItem->children.push_back(diveItem); + continue; + } + if (currentLayout == LIST) + continue; + + if (!trips.keys().contains(trip)) { + TripItem *tripItem = new TripItem(); + tripItem->trip = trip; + tripItem->parent = rootItem; + tripItem->children.push_back(diveItem); + trips[trip] = tripItem; + rootItem->children.push_back(tripItem); + continue; + } + TripItem *tripItem = trips[trip]; + tripItem->children.push_back(diveItem); + } + + if (rowCount()) { + beginInsertRows(QModelIndex(), 0, rowCount() - 1); + endInsertRows(); + } +} + +DiveTripModel::Layout DiveTripModel::layout() const +{ + return currentLayout; +} + +void DiveTripModel::setLayout(DiveTripModel::Layout layout) +{ + currentLayout = layout; + setupModelData(); +} + +bool DiveTripModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + TreeItem *item = static_cast<TreeItem *>(index.internalPointer()); + DiveItem *diveItem = dynamic_cast<DiveItem *>(item); + if (!diveItem) + return false; + return diveItem->setData(index, value, role); +} diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h new file mode 100644 index 000000000..63dc806e7 --- /dev/null +++ b/qt-models/divetripmodel.h @@ -0,0 +1,92 @@ +#ifndef DIVETRIPMODEL_H +#define DIVETRIPMODEL_H + +#include "treemodel.h" +#include "dive.h" + +struct DiveItem : public TreeItem { + enum Column { + NR, + DATE, + RATING, + DEPTH, + DURATION, + TEMPERATURE, + TOTALWEIGHT, + SUIT, + CYLINDER, + GAS, + SAC, + OTU, + MAXCNS, + LOCATION, + COLUMNS + }; + + virtual QVariant data(int column, int role) const; + int diveId; + virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + virtual Qt::ItemFlags flags(const QModelIndex &index) const; + QString displayDate() const; + QString displayDuration() const; + QString displayDepth() const; + QString displayDepthWithUnit() const; + QString displayTemperature() const; + QString displayWeight() const; + QString displaySac() const; + int weight() const; +}; + +struct TripItem : public TreeItem { + virtual QVariant data(int column, int role) const; + dive_trip_t *trip; +}; + +class DiveTripModel : public TreeModel { + Q_OBJECT +public: + enum Column { + NR, + DATE, + RATING, + DEPTH, + DURATION, + TEMPERATURE, + TOTALWEIGHT, + SUIT, + CYLINDER, + GAS, + SAC, + OTU, + MAXCNS, + LOCATION, + COLUMNS + }; + + enum ExtraRoles { + STAR_ROLE = Qt::UserRole + 1, + DIVE_ROLE, + TRIP_ROLE, + SORT_ROLE, + DIVE_IDX + }; + enum Layout { + TREE, + LIST, + CURRENT + }; + + Qt::ItemFlags flags(const QModelIndex &index) const; + virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + DiveTripModel(QObject *parent = 0); + Layout layout() const; + void setLayout(Layout layout); + +private: + void setupModelData(); + QMap<dive_trip_t *, TripItem *> trips; + Layout currentLayout; +}; + +#endif diff --git a/qt-models/models.cpp b/qt-models/models.cpp index 85b26922d..f2aba0b1b 100644 --- a/qt-models/models.cpp +++ b/qt-models/models.cpp @@ -15,6 +15,8 @@ #include "gettextfromc.h" #include "display.h" #include "color.h" +#include "divetripmodel.h" + #include "cleanertablemodel.h" #include "weigthsysteminfomodel.h" #include <QCoreApplication> @@ -41,548 +43,7 @@ const QPixmap &trashIcon() * Implementation of the Dive List. * * ############################################################### */ -struct TripItem : public TreeItem { - virtual QVariant data(int column, int role) const; - dive_trip_t *trip; -}; - -QVariant TripItem::data(int column, int role) const -{ - QVariant ret; - - if (role == DiveTripModel::TRIP_ROLE) - return QVariant::fromValue<void *>(trip); - - if (role == DiveTripModel::SORT_ROLE) - return (qulonglong)trip->when; - - if (role == Qt::DisplayRole) { - switch (column) { - case DiveTripModel::NR: - QString shownText; - struct dive *d = trip->dives; - int countShown = 0; - while (d) { - if (!d->hidden_by_filter) - countShown++; - d = d->next; - } - if (countShown < trip->nrdives) - shownText = tr(" (%1 shown)").arg(countShown); - if (trip->location && *trip->location) - ret = QString(trip->location) + ", " + get_trip_date_string(trip->when, trip->nrdives) + shownText; - else - ret = get_trip_date_string(trip->when, trip->nrdives) + shownText; - break; - } - } - - return ret; -} - -static int nitrox_sort_value(struct dive *dive) -{ - int o2, he, o2max; - get_dive_gas(dive, &o2, &he, &o2max); - return he * 1000 + o2; -} - -static QVariant dive_table_alignment(int column) -{ - QVariant retVal; - switch (column) { - case DiveTripModel::DEPTH: - case DiveTripModel::DURATION: - case DiveTripModel::TEMPERATURE: - case DiveTripModel::TOTALWEIGHT: - case DiveTripModel::SAC: - case DiveTripModel::OTU: - case DiveTripModel::MAXCNS: - // Right align numeric columns - retVal = int(Qt::AlignRight | Qt::AlignVCenter); - break; - // NR needs to be left aligned becase its the indent marker for trips too - case DiveTripModel::NR: - case DiveTripModel::DATE: - case DiveTripModel::RATING: - case DiveTripModel::SUIT: - case DiveTripModel::CYLINDER: - case DiveTripModel::GAS: - case DiveTripModel::LOCATION: - retVal = int(Qt::AlignLeft | Qt::AlignVCenter); - break; - } - return retVal; -} - -QVariant DiveItem::data(int column, int role) const -{ - QVariant retVal; - struct dive *dive = get_dive_by_uniq_id(diveId); - if (!dive) - return QVariant(); - - switch (role) { - case Qt::TextAlignmentRole: - retVal = dive_table_alignment(column); - break; - case DiveTripModel::SORT_ROLE: - Q_ASSERT(dive != NULL); - switch (column) { - case NR: - retVal = (qulonglong)dive->when; - break; - case DATE: - retVal = (qulonglong)dive->when; - break; - case RATING: - retVal = dive->rating; - break; - case DEPTH: - retVal = dive->maxdepth.mm; - break; - case DURATION: - retVal = dive->duration.seconds; - break; - case TEMPERATURE: - retVal = dive->watertemp.mkelvin; - break; - case TOTALWEIGHT: - retVal = total_weight(dive); - break; - case SUIT: - retVal = QString(dive->suit); - break; - case CYLINDER: - retVal = QString(dive->cylinder[0].type.description); - break; - case GAS: - retVal = nitrox_sort_value(dive); - break; - case SAC: - retVal = dive->sac; - break; - case OTU: - retVal = dive->otu; - break; - case MAXCNS: - retVal = dive->maxcns; - break; - case LOCATION: - retVal = QString(get_dive_location(dive)); - break; - } - break; - case Qt::DisplayRole: - Q_ASSERT(dive != NULL); - switch (column) { - case NR: - retVal = dive->number; - break; - case DATE: - retVal = displayDate(); - break; - case DEPTH: - retVal = displayDepth(); - break; - case DURATION: - retVal = displayDuration(); - break; - case TEMPERATURE: - retVal = displayTemperature(); - break; - case TOTALWEIGHT: - retVal = displayWeight(); - break; - case SUIT: - retVal = QString(dive->suit); - break; - case CYLINDER: - retVal = QString(dive->cylinder[0].type.description); - break; - case SAC: - retVal = displaySac(); - break; - case OTU: - retVal = dive->otu; - break; - case MAXCNS: - retVal = dive->maxcns; - break; - case LOCATION: - retVal = QString(get_dive_location(dive)); - break; - case GAS: - const char *gas_string = get_dive_gas_string(dive); - retVal = QString(gas_string); - free((void*)gas_string); - break; - } - break; - case Qt::ToolTipRole: - switch (column) { - case NR: - retVal = tr("#"); - break; - case DATE: - retVal = tr("Date"); - break; - case RATING: - retVal = tr("Rating"); - break; - case DEPTH: - retVal = tr("Depth(%1)").arg((get_units()->length == units::METERS) ? tr("m") : tr("ft")); - break; - case DURATION: - retVal = tr("Duration"); - break; - case TEMPERATURE: - retVal = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F"); - break; - case TOTALWEIGHT: - retVal = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs")); - break; - case SUIT: - retVal = tr("Suit"); - break; - case CYLINDER: - retVal = tr("Cyl"); - break; - case GAS: - retVal = tr("Gas"); - break; - case SAC: - const char *unit; - get_volume_units(0, NULL, &unit); - retVal = tr("SAC(%1)").arg(QString(unit).append(tr("/min"))); - break; - case OTU: - retVal = tr("OTU"); - break; - case MAXCNS: - retVal = tr("Max CNS"); - break; - case LOCATION: - retVal = tr("Location"); - break; - } - break; - } - - if (role == DiveTripModel::STAR_ROLE) { - Q_ASSERT(dive != NULL); - retVal = dive->rating; - } - if (role == DiveTripModel::DIVE_ROLE) { - retVal = QVariant::fromValue<void *>(dive); - } - if (role == DiveTripModel::DIVE_IDX) { - Q_ASSERT(dive != NULL); - retVal = get_divenr(dive); - } - return retVal; -} - -Qt::ItemFlags DiveItem::flags(const QModelIndex &index) const -{ - if (index.column() == NR) { - return TreeItem::flags(index) | Qt::ItemIsEditable; - } - return TreeItem::flags(index); -} - -bool DiveItem::setData(const QModelIndex &index, const QVariant &value, int role) -{ - if (role != Qt::EditRole) - return false; - if (index.column() != NR) - return false; - - int v = value.toInt(); - if (v == 0) - return false; - - int i; - struct dive *d; - for_each_dive (i, d) { - if (d->number == v) - return false; - } - d = get_dive_by_uniq_id(diveId); - d->number = value.toInt(); - mark_divelist_changed(true); - return true; -} - -QString DiveItem::displayDate() const -{ - struct dive *dive = get_dive_by_uniq_id(diveId); - return get_dive_date_string(dive->when); -} - -QString DiveItem::displayDepth() const -{ - struct dive *dive = get_dive_by_uniq_id(diveId); - return get_depth_string(dive->maxdepth); -} - -QString DiveItem::displayDepthWithUnit() const -{ - struct dive *dive = get_dive_by_uniq_id(diveId); - return get_depth_string(dive->maxdepth, true); -} - -QString DiveItem::displayDuration() const -{ - int hrs, mins, fullmins, secs; - struct dive *dive = get_dive_by_uniq_id(diveId); - mins = (dive->duration.seconds + 59) / 60; - fullmins = dive->duration.seconds / 60; - secs = dive->duration.seconds - 60 * fullmins; - hrs = mins / 60; - mins -= hrs * 60; - - QString displayTime; - if (hrs) - displayTime = QString("%1:%2").arg(hrs).arg(mins, 2, 10, QChar('0')); - else if (mins < 15 || dive->dc.divemode == FREEDIVE) - displayTime = QString("%1m%2s").arg(fullmins).arg(secs, 2, 10, QChar('0')); - else - displayTime = QString("%1").arg(mins); - return displayTime; -} -QString DiveItem::displayTemperature() const -{ - QString str; - struct dive *dive = get_dive_by_uniq_id(diveId); - if (!dive->watertemp.mkelvin) - return str; - if (get_units()->temperature == units::CELSIUS) - str = QString::number(mkelvin_to_C(dive->watertemp.mkelvin), 'f', 1); - else - str = QString::number(mkelvin_to_F(dive->watertemp.mkelvin), 'f', 1); - return str; -} - -QString DiveItem::displaySac() const -{ - QString str; - struct dive *dive = get_dive_by_uniq_id(diveId); - if (dive->sac) { - const char *unit; - int decimal; - double value = get_volume_units(dive->sac, &decimal, &unit); - return QString::number(value, 'f', decimal); - } - return QString(""); -} - -QString DiveItem::displayWeight() const -{ - QString str = weight_string(weight()); - return str; -} - -int DiveItem::weight() const -{ - struct dive *dive = get_dive_by_uniq_id(diveId); - weight_t tw = { total_weight(dive) }; - return tw.grams; -} - -DiveTripModel::DiveTripModel(QObject *parent) : TreeModel(parent) -{ - columns = COLUMNS; -} - -Qt::ItemFlags DiveTripModel::flags(const QModelIndex &index) const -{ - if (!index.isValid()) - return 0; - - TripItem *item = static_cast<TripItem *>(index.internalPointer()); - return item->flags(index); -} - -QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - QVariant ret; - if (orientation == Qt::Vertical) - return ret; - - switch (role) { - case Qt::TextAlignmentRole: - ret = dive_table_alignment(section); - break; - case Qt::FontRole: - ret = defaultModelFont(); - break; - case Qt::DisplayRole: - switch (section) { - case NR: - ret = tr("#"); - break; - case DATE: - ret = tr("Date"); - break; - case RATING: - ret = tr("Rating"); - break; - case DEPTH: - ret = tr("Depth"); - break; - case DURATION: - ret = tr("Duration"); - break; - case TEMPERATURE: - ret = tr("Temp"); - break; - case TOTALWEIGHT: - ret = tr("Weight"); - break; - case SUIT: - ret = tr("Suit"); - break; - case CYLINDER: - ret = tr("Cyl"); - break; - case GAS: - ret = tr("Gas"); - break; - case SAC: - ret = tr("SAC"); - break; - case OTU: - ret = tr("OTU"); - break; - case MAXCNS: - ret = tr("Max CNS"); - break; - case LOCATION: - ret = tr("Location"); - break; - } - break; - case Qt::ToolTipRole: - switch (section) { - case NR: - ret = tr("#"); - break; - case DATE: - ret = tr("Date"); - break; - case RATING: - ret = tr("Rating"); - break; - case DEPTH: - ret = tr("Depth(%1)").arg((get_units()->length == units::METERS) ? tr("m") : tr("ft")); - break; - case DURATION: - ret = tr("Duration"); - break; - case TEMPERATURE: - ret = tr("Temp(%1%2)").arg(UTF8_DEGREE).arg((get_units()->temperature == units::CELSIUS) ? "C" : "F"); - break; - case TOTALWEIGHT: - ret = tr("Weight(%1)").arg((get_units()->weight == units::KG) ? tr("kg") : tr("lbs")); - break; - case SUIT: - ret = tr("Suit"); - break; - case CYLINDER: - ret = tr("Cyl"); - break; - case GAS: - ret = tr("Gas"); - break; - case SAC: - const char *unit; - get_volume_units(0, NULL, &unit); - ret = tr("SAC(%1)").arg(QString(unit).append(tr("/min"))); - break; - case OTU: - ret = tr("OTU"); - break; - case MAXCNS: - ret = tr("Max CNS"); - break; - case LOCATION: - ret = tr("Location"); - break; - } - break; - } - - return ret; -} - -void DiveTripModel::setupModelData() -{ - int i = dive_table.nr; - - if (rowCount()) { - beginRemoveRows(QModelIndex(), 0, rowCount() - 1); - endRemoveRows(); - } - - if (autogroup) - autogroup_dives(); - dive_table.preexisting = dive_table.nr; - while (--i >= 0) { - struct dive *dive = get_dive(i); - update_cylinder_related_info(dive); - dive_trip_t *trip = dive->divetrip; - - DiveItem *diveItem = new DiveItem(); - diveItem->diveId = dive->id; - - if (!trip || currentLayout == LIST) { - diveItem->parent = rootItem; - rootItem->children.push_back(diveItem); - continue; - } - if (currentLayout == LIST) - continue; - - if (!trips.keys().contains(trip)) { - TripItem *tripItem = new TripItem(); - tripItem->trip = trip; - tripItem->parent = rootItem; - tripItem->children.push_back(diveItem); - trips[trip] = tripItem; - rootItem->children.push_back(tripItem); - continue; - } - TripItem *tripItem = trips[trip]; - tripItem->children.push_back(diveItem); - } - - if (rowCount()) { - beginInsertRows(QModelIndex(), 0, rowCount() - 1); - endInsertRows(); - } -} - -DiveTripModel::Layout DiveTripModel::layout() const -{ - return currentLayout; -} - -void DiveTripModel::setLayout(DiveTripModel::Layout layout) -{ - currentLayout = layout; - setupModelData(); -} - -bool DiveTripModel::setData(const QModelIndex &index, const QVariant &value, int role) -{ - TreeItem *item = static_cast<TreeItem *>(index.internalPointer()); - DiveItem *diveItem = dynamic_cast<DiveItem *>(item); - if (!diveItem) - return false; - return diveItem->setData(index, value, role); -} /*################################################################# * # diff --git a/qt-models/models.h b/qt-models/models.h index e6a3e5919..32f0f4321 100644 --- a/qt-models/models.h +++ b/qt-models/models.h @@ -21,91 +21,6 @@ #include "../divecomputer.h" #include "cleanertablemodel.h" #include "treemodel.h" -/*! An AbstractItemModel for recording dive trip information such as a list of dives. -* -*/ - -struct DiveItem : public TreeItem { - enum Column { - NR, - DATE, - RATING, - DEPTH, - DURATION, - TEMPERATURE, - TOTALWEIGHT, - SUIT, - CYLINDER, - GAS, - SAC, - OTU, - MAXCNS, - LOCATION, - COLUMNS - }; - - virtual QVariant data(int column, int role) const; - int diveId; - virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - virtual Qt::ItemFlags flags(const QModelIndex &index) const; - QString displayDate() const; - QString displayDuration() const; - QString displayDepth() const; - QString displayDepthWithUnit() const; - QString displayTemperature() const; - QString displayWeight() const; - QString displaySac() const; - int weight() const; -}; - -struct TripItem; - -class DiveTripModel : public TreeModel { - Q_OBJECT -public: - enum Column { - NR, - DATE, - RATING, - DEPTH, - DURATION, - TEMPERATURE, - TOTALWEIGHT, - SUIT, - CYLINDER, - GAS, - SAC, - OTU, - MAXCNS, - LOCATION, - COLUMNS - }; - - enum ExtraRoles { - STAR_ROLE = Qt::UserRole + 1, - DIVE_ROLE, - TRIP_ROLE, - SORT_ROLE, - DIVE_IDX - }; - enum Layout { - TREE, - LIST, - CURRENT - }; - - Qt::ItemFlags flags(const QModelIndex &index) const; - virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; - virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - DiveTripModel(QObject *parent = 0); - Layout layout() const; - void setLayout(Layout layout); - -private: - void setupModelData(); - QMap<dive_trip_t *, TripItem *> trips; - Layout currentLayout; -}; /* TablePrintModel: * for now we use a blank table model with row items TablePrintItem. diff --git a/qt-ui/divelistview.h b/qt-ui/divelistview.h index 6e9a18215..65f98eff8 100644 --- a/qt-ui/divelistview.h +++ b/qt-ui/divelistview.h @@ -15,6 +15,7 @@ #include <QLineEdit> #include <QNetworkAccessManager> #include "models.h" +#include "divetripmodel.h" class DiveListView : public QTreeView { Q_OBJECT diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 84d2db1d5..827e6ab27 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -9,6 +9,8 @@ #include "tankinfomodel.h" #include "weigthsysteminfomodel.h" #include "weightmodel.h" +#include "divetripmodel.h" + #include <QCompleter> #include <QKeyEvent> #include <QTextDocument> diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index 8123ba07a..637612e41 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -11,6 +11,7 @@ #include "modeldelegates.h" #include "models.h" #include "profile/profilewidget2.h" +#include "divetripmodel.h" PrintLayout::PrintLayout(PrintDialog *dialogPtr, QPrinter *printerPtr, struct print_options *optionsPtr) { |