mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move ExtraDataModel to qt-models

Browse source 
Another attempt to make it easyer to create the mobile version.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-05-28 17:29:58 -03:00 committed by Dirk Hohndel
parent d84ffa8fc3
commit 257f8063c4
6 changed files with 97 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -255,6 +255,7 @@ set(SUBSURFACE_MODELS_LIB_SRCS
qt-models/tankinfomodel.cpp
qt-models/weigthsysteminfomodel.cpp
qt-models/weightmodel.cpp
qt-models/divecomputerextradatamodel.cpp
qt-models/completionmodels.cpp
)
source_group("Subsurface Models" FILES ${SUBSURFACE_MODELS})

70
qt-models/divecomputerextradatamodel.cpp Normal file
View file

@ -0,0 +1,70 @@
#include "divecomputerextradatamodel.h"
#include "dive.h"
#include "metrics.h"
ExtraDataModel::ExtraDataModel(QObject *parent) : CleanerTableModel(parent),
rows(0)
{
//enum Column {KEY, VALUE};
setHeaderDataStrings(QStringList() << tr("Key") << tr("Value"));
}
void ExtraDataModel::clear()
{
if (rows > 0) {
beginRemoveRows(QModelIndex(), 0, rows - 1);
endRemoveRows();
}
}
QVariant ExtraDataModel::data(const QModelIndex &index, int role) const
{
QVariant ret;
struct extra_data *ed = get_dive_dc(&displayed_dive, dc_number)->extra_data;
int i = -1;
while (ed && ++i < index.row())
ed = ed->next;
if (!ed)
return ret;
switch (role) {
case Qt::FontRole:
ret = defaultModelFont();
break;
case Qt::TextAlignmentRole:
ret = int(Qt::AlignLeft | Qt::AlignVCenter);
break;
case Qt::DisplayRole:
switch (index.column()) {
case KEY:
ret = QString(ed->key);
break;
case VALUE:
ret = QString(ed->value);
break;
}
break;
}
return ret;
}
int ExtraDataModel::rowCount(const QModelIndex &parent) const
{
return rows;
}
void ExtraDataModel::updateDive()
{
clear();
rows = 0;
struct extra_data *ed = get_dive_dc(&displayed_dive, dc_number)->extra_data;
while (ed) {
rows++;
ed = ed->next;
}
if (rows > 0) {
beginInsertRows(QModelIndex(), 0, rows - 1);
endInsertRows();
}
}

25
qt-models/divecomputerextradatamodel.h Normal file
View file

@ -0,0 +1,25 @@
#ifndef DIVECOMPUTEREXTRADATAMODEL_H
#define DIVECOMPUTEREXTRADATAMODEL_H
#include "cleanertablemodel.h"
/* extra data model for additional dive computer data */
class ExtraDataModel : public CleanerTableModel {
Q_OBJECT
public:
enum Column {
KEY,
VALUE
};
explicit ExtraDataModel(QObject *parent = 0);
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
void clear();
void updateDive();
private:
int rows;
};
#endif

66
qt-models/models.cpp
View file

@ -1378,69 +1378,3 @@ int LanguageModel::rowCount(const QModelIndex &parent) const
{
return languages.count();
}
ExtraDataModel::ExtraDataModel(QObject *parent) : CleanerTableModel(parent),
rows(0)
{
//enum Column {KEY, VALUE};
setHeaderDataStrings(QStringList() << tr("Key") << tr("Value"));
}
void ExtraDataModel::clear()
{
if (rows > 0) {
beginRemoveRows(QModelIndex(), 0, rows - 1);
endRemoveRows();
}
}
QVariant ExtraDataModel::data(const QModelIndex &index, int role) const
{
QVariant ret;
struct extra_data *ed = get_dive_dc(&displayed_dive, dc_number)->extra_data;
int i = -1;
while (ed && ++i < index.row())
ed = ed->next;
if (!ed)
return ret;
switch (role) {
case Qt::FontRole:
ret = defaultModelFont();
break;
case Qt::TextAlignmentRole:
ret = int(Qt::AlignLeft | Qt::AlignVCenter);
break;
case Qt::DisplayRole:
switch (index.column()) {
case KEY:
ret = QString(ed->key);
break;
case VALUE:
ret = QString(ed->value);
break;
}
break;
}
return ret;
}
int ExtraDataModel::rowCount(const QModelIndex &parent) const
{
return rows;
}
void ExtraDataModel::updateDive()
{
clear();
rows = 0;
struct extra_data *ed = get_dive_dc(&displayed_dive, dc_number)->extra_data;
while (ed) {
rows++;
ed = ed->next;
}
if (rows > 0) {
beginInsertRows(QModelIndex(), 0, rows - 1);
endInsertRows();
}
}

19
qt-models/models.h
View file

@ -21,25 +21,6 @@
#include "../divecomputer.h"
#include "cleanertablemodel.h"
/* extra data model for additional dive computer data */
class ExtraDataModel : public CleanerTableModel {
Q_OBJECT
public:
enum Column {
KEY,
VALUE
};
explicit ExtraDataModel(QObject *parent = 0);
/*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
/*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const;
void clear();
void updateDive();
private:
int rows;
};
/*! An AbstractItemModel for recording dive trip information such as a list of dives.
*
*/

1
qt-ui/maintab.cpp
View file

@ -19,6 +19,7 @@
#include "divesitehelpers.h"
#include "cylindermodel.h"
#include "weightmodel.h"
#include "divecomputerextradatamodel.h"
#if defined(FBSUPPORT)
#include "socialnetworks.h"