summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/divelistview.cpp5
-rw-r--r--qt-ui/divelistview.h19
-rw-r--r--qt-ui/divetripmodel.cpp136
-rw-r--r--qt-ui/divetripmodel.h80
-rw-r--r--qt-ui/mainwindow.cpp29
-rw-r--r--qt-ui/mainwindow.h2
-rw-r--r--qt-ui/mainwindow.ui7
7 files changed, 277 insertions, 1 deletions
diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
new file mode 100644
index 000000000..eafbdd384
--- /dev/null
+++ b/qt-ui/divelistview.cpp
@@ -0,0 +1,5 @@
+#include "divelistview.h"
+
+DiveListView::DiveListView(QWidget *parent) : QTreeView(parent)
+{
+}
diff --git a/qt-ui/divelistview.h b/qt-ui/divelistview.h
new file mode 100644
index 000000000..3ac123a14
--- /dev/null
+++ b/qt-ui/divelistview.h
@@ -0,0 +1,19 @@
+#ifndef DIVELISTVIEW_H
+#define DIVELISTVIEW_H
+
+/*! A view subclass for use with dives
+
+ Note: calling this a list view might be misleading?
+
+
+*/
+
+#include <QTreeView>
+
+class DiveListView : public QTreeView
+{
+public:
+ DiveListView(QWidget *parent = 0);
+};
+
+#endif // DIVELISTVIEW_H
diff --git a/qt-ui/divetripmodel.cpp b/qt-ui/divetripmodel.cpp
new file mode 100644
index 000000000..a03603bcf
--- /dev/null
+++ b/qt-ui/divetripmodel.cpp
@@ -0,0 +1,136 @@
+#include "divetripmodel.h"
+
+
+DiveItem::DiveItem(int num, QString dt, float dur, float dep, QString loc, DiveItem *p):
+ number(num), dateTime(dt), duration(dur), depth(dep), location(loc), parentItem(p)
+{
+ if (parentItem)
+ parentItem->addChild(this);
+}
+
+
+DiveTripModel::DiveTripModel(const QString &filename, QObject *parent) : QAbstractItemModel(parent), filename(filename)
+{
+ rootItem = new DiveItem;
+}
+
+
+Qt::ItemFlags DiveTripModel::flags(const QModelIndex &index) const
+{
+ Qt::ItemFlags diveFlags = QAbstractItemModel::flags(index);
+ if (index.isValid()) {
+ diveFlags |= Qt::ItemIsSelectable|Qt::ItemIsEnabled;
+ }
+ return diveFlags;
+}
+
+
+QVariant DiveTripModel::data(const QModelIndex &index, int role) const
+{
+ if (!index.isValid())
+ return QVariant();
+
+ if (role != Qt::DisplayRole)
+ return QVariant();
+
+ DiveItem *item = static_cast<DiveItem*>(index.internalPointer());
+
+ QVariant retVal;
+ switch (index.column()) {
+ case DIVE_NUMBER:
+ retVal = QVariant(item->diveNumber());
+ break;
+ case DIVE_DATE_TIME:
+ retVal = QVariant(item->diveDateTime());
+ break;
+ case DIVE_DURATION:
+ retVal = QVariant(item->diveDuration());
+ break;
+ case DIVE_DEPTH:
+ retVal = QVariant(item->diveDepth());
+ break;
+ case DIVE_LOCATION:
+ retVal = QVariant(item->diveLocation());
+ break;
+ default:
+ return QVariant();
+ };
+ return retVal;
+}
+
+
+QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+ if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
+ if (section == DIVE_NUMBER) {
+ return tr("Dive number");
+ } else if (section == DIVE_DATE_TIME) {
+ return tr("Date");
+ } else if (section == DIVE_DURATION) {
+ return tr("Duration");
+ } else if (section == DIVE_DEPTH) {
+ return tr("Depth");
+ } else if (section == DIVE_LOCATION) {
+ return tr("Location");
+ }
+ }
+ return QVariant();
+}
+
+int DiveTripModel::rowCount(const QModelIndex &parent) const
+{
+ /* only allow kids in column 0 */
+ if (parent.isValid() && parent.column() > 0){
+ return 0;
+ }
+ DiveItem *item = itemForIndex(parent);
+ return item ? item->childCount() : 0;
+}
+
+
+
+int DiveTripModel::columnCount(const QModelIndex &parent) const
+{
+ return parent.isValid() && parent.column() != 0 ? 0 : COLUMNS;
+}
+
+
+QModelIndex DiveTripModel::index(int row, int column, const QModelIndex &parent) const
+{
+
+ if (!rootItem || row < 0 || column < 0 || column >= COLUMNS ||
+ (parent.isValid() && parent.column() != 0))
+ return QModelIndex();
+
+ DiveItem *parentItem = itemForIndex(parent);
+ Q_ASSERT(parentItem);
+ if (DiveItem *item = parentItem->childAt(row)){
+ return createIndex(row, column, item);
+ }
+ return QModelIndex();
+}
+
+
+QModelIndex DiveTripModel::parent(const QModelIndex &childIndex) const
+{
+ if (!childIndex.isValid())
+ return QModelIndex();
+
+ DiveItem *child = static_cast<DiveItem*>(childIndex.internalPointer());
+ DiveItem *parent = child->parent();
+
+ if (parent == rootItem)
+ return QModelIndex();
+
+ return createIndex(parent->rowOfChild(child), 0, parent);
+}
+
+
+DiveItem* DiveTripModel::itemForIndex(const QModelIndex &index) const
+{
+ if (index.isValid()) {
+ DiveItem *item = static_cast<DiveItem*>(index.internalPointer());
+ return item;
+ }
+ return rootItem;
+}
diff --git a/qt-ui/divetripmodel.h b/qt-ui/divetripmodel.h
new file mode 100644
index 000000000..8c8a829e2
--- /dev/null
+++ b/qt-ui/divetripmodel.h
@@ -0,0 +1,80 @@
+#ifndef DIVETRIPMODEL_H
+#define DIVETRIPMODEL_H
+
+#include <QAbstractItemModel>
+
+/*! A DiveItem for use with a DiveTripModel
+ *
+ * A simple class which wraps basic stats for a dive (e.g. duration, depth) and
+ * tidies up after it's children. This is done manually as we don't inherit from
+ * QObject.
+ *
+*/
+class DiveItem
+{
+public:
+ explicit DiveItem(): number(0), dateTime(QString()), duration(0.0), depth(0.0), location(QString()) {parentItem = 0;}
+ explicit DiveItem(int num, QString dt, float, float, QString loc, DiveItem *parent = 0);
+ ~DiveItem() { qDeleteAll(childlist); }
+
+ int diveNumber() const { return number; }
+ QString diveDateTime() const { return dateTime; }
+ float diveDuration() const { return duration; }
+ float diveDepth() const { return depth; }
+ QString diveLocation() const { return location; }
+
+ DiveItem *parent() const { return parentItem; }
+ DiveItem *childAt(int row) const { return childlist.value(row); }
+ int rowOfChild(DiveItem *child) const { return childlist.indexOf(child); }
+ int childCount() const { return childlist.count(); }
+ bool hasChildren() const { return !childlist.isEmpty(); }
+ QList<DiveItem *> children() const { return childlist; }
+ void addChild(DiveItem* item) { item->parentItem = this; childlist << item; } /* parent = self */
+
+
+private:
+
+ int number;
+ QString dateTime;
+ float duration;
+ float depth;
+ QString location;
+
+ DiveItem *parentItem;
+ QList <DiveItem*> childlist;
+
+};
+
+
+enum Column {DIVE_NUMBER, DIVE_DATE_TIME, DIVE_DURATION, DIVE_DEPTH, DIVE_LOCATION, COLUMNS};
+
+
+/*! An AbstractItemModel for recording dive trip information such as a list of dives.
+*
+*/
+class DiveTripModel : public QAbstractItemModel
+{
+public:
+
+ DiveTripModel(const QString &filename, QObject *parent = 0);
+
+ Qt::ItemFlags flags(const QModelIndex &index) const;
+ QVariant data(const QModelIndex &index, int role) const;
+ QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+ int rowCount(const QModelIndex &parent) const;
+
+ int columnCount(const QModelIndex &parent = QModelIndex()) const;
+ virtual QModelIndex index(int row, int column,
+ const QModelIndex &parent = QModelIndex()) const;
+ virtual QModelIndex parent(const QModelIndex &child) const;
+
+ DiveItem *itemForIndex(const QModelIndex &) const;
+
+private:
+
+ DiveItem *rootItem;
+ QString filename;
+
+};
+
+#endif // DIVETRIPMODEL_H
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 56c39015b..03f6b6ca6 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -4,9 +4,38 @@
#include <QVBoxLayout>
#include <QtDebug>
+#include "divelistview.h"
+#include "divetripmodel.h"
+
MainWindow::MainWindow() : ui(new Ui::MainWindow())
{
ui->setupUi(this);
+
+ /* may want to change ctor to avoid filename as 1st param.
+ * here we just use an empty string
+ */
+ model = new DiveTripModel("",this);
+ if (model){
+ ui->ListWidget->setModel(model);
+ }
+ /* add in dives here.
+ * we need to root to parent all top level dives
+ * trips need more work as it complicates parent/child stuff.
+ *
+ * We show how to obtain the root and add a demo dive
+ *
+ * Todo: work through integration with current list of dives/trips
+ * Todo: look at alignment/format of e.g. duration in view
+ */
+ DiveItem *dive = 0;
+ DiveItem *root = model->itemForIndex(QModelIndex());
+ if (root){
+ dive = new DiveItem(1,QString("01/03/13"),14.2, 29.0,QString("Wraysbury"),root);
+
+ Q_UNUSED(dive)
+ }
+
+
}
void MainWindow::on_actionNew_triggered()
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 51b428c5f..662d07cc5 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -3,6 +3,7 @@
#include <QMainWindow>
+class DiveTripModel;
namespace Ui
{
@@ -60,6 +61,7 @@ private Q_SLOTS:
private:
Ui::MainWindow *ui;
+ DiveTripModel *model;
};
#endif
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 65b18c757..6ece13f57 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -27,7 +27,7 @@
<widget class="MainTab" name="InfoWidget" native="true"/>
<widget class="QGraphicsView" name="ProfileWidget"/>
</widget>
- <widget class="QTableView" name="ListWidget"/>
+ <widget class="DiveListView" name="ListWidget"/>
</widget>
</item>
<item>
@@ -291,6 +291,11 @@
<header>maintab.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>DiveListView</class>
+ <extends>QTreeView</extends>
+ <header>divelistview.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-01-06 06:21:32 +0000