summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tcanabrava@kde.org>2013-06-17 20:02:30 -0300
committerGravatar Tomaz Canabrava <tcanabrava@kde.org>2013-06-17 20:02:30 -0300
commita05ea5a6e8f50213559b096871905f9777059eb4 (patch)
treeab05724734bb04be6b39fc773c61dfae0f79af90
parent240cfa74be5b6bc25053947c632084ad347b46b0 (diff)
downloadsubsurface-a05ea5a6e8f50213559b096871905f9777059eb4.tar.gz
Create a view for the Statistics Model and Fix displaying the header
This simply creates a view to show the model, while doing that I noticed that the model header wasn't showing, so I fixed it too. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
-rw-r--r--qt-ui/mainwindow.cpp6
-rw-r--r--qt-ui/models.cpp40
2 files changed, 29 insertions, 17 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 45b8df80a..ae43ff814 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -16,6 +16,7 @@
#include <QApplication>
#include <QFontMetrics>
#include <QTextBrowser>
+#include <QTableView>
#include "divelistview.h"
#include "starwidget.h"
@@ -240,7 +241,10 @@ void MainWindow::on_actionToggleZoom_triggered()
void MainWindow::on_actionYearlyStatistics_triggered()
{
- qDebug("actionYearlyStatistics");
+ QTableView *view = new QTableView();
+ QAbstractItemModel *model = new YearlyStatisticsModel();
+ view->setModel(model);
+ view->show();
}
/**
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index e94446fa0..f2dcc3cd9 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -1284,26 +1284,34 @@ void DiveComputerModel::remove(const QModelIndex& i)
YearlyStatisticsModel::YearlyStatisticsModel(QObject* parent)
{
+ columns = COLUMNS;
}
QVariant YearlyStatisticsModel::headerData(int section, Qt::Orientation orientation, int role) const
{
QVariant val;
- switch(section){
- case YEAR: val = tr("Year \n > Month"); break;
- case DIVES: val = tr("#"); break;
- case TOTAL_TIME: val = tr("Duration \n Total"); break;
- case AVERAGE_TIME: val = tr("Average"); break;
- case SHORTEST_TIME: val = tr("Shortest"); break;
- case LONGEST_TIME: val = tr("Longest"); break;
- case AVG_DEPTH: val = tr("Depth \n Average"); break;
- case MIN_DEPTH: val = tr("Minimum"); break;
- case MAX_DEPTH: val = tr("Maximum"); break;
- case AVG_SAC: val = tr("SAC \n Average"); break;
- case MIN_SAC: val = tr("Minimum"); break;
- case MAX_SAC: val = tr("Maximum"); break;
- case AVG_TEMP: val = tr("Temperature \n Average"); break;
- case MIN_TEMP: val = tr("Minimum"); break;
- case MAX_TEMP: val = tr("Maximum"); break;
+ if (role == Qt::FontRole){
+ val = defaultModelFont();
+ }
+
+ if (role == Qt::DisplayRole && orientation == Qt::Horizontal){
+ switch(section){
+ case YEAR: val = tr("Year \n > Month"); break;
+ case DIVES: val = tr("#"); break;
+ case TOTAL_TIME: val = tr("Duration \n Total"); break;
+ case AVERAGE_TIME: val = tr("Average"); break;
+ case SHORTEST_TIME: val = tr("Shortest"); break;
+ case LONGEST_TIME: val = tr("Longest"); break;
+ case AVG_DEPTH: val = tr("Depth \n Average"); break;
+ case MIN_DEPTH: val = tr("Minimum"); break;
+ case MAX_DEPTH: val = tr("Maximum"); break;
+ case AVG_SAC: val = tr("SAC \n Average"); break;
+ case MIN_SAC: val = tr("Minimum"); break;
+ case MAX_SAC: val = tr("Maximum"); break;
+ case AVG_TEMP: val = tr("Temperature \n Average"); break;
+ case MIN_TEMP: val = tr("Minimum"); break;
+ case MAX_TEMP: val = tr("Maximum"); break;
+ }
}
+ return val;
}