From 55ac07f6f69c90bb06b6484233bf671ea60823a9 Mon Sep 17 00:00:00 2001 From: Oliver Schwaneberg Date: Thu, 10 May 2018 17:35:30 +0200 Subject: Corrected file name "weigthsysteminfomodel" to "weightsysteminfomodel" Signed-off-by: Oliver Schwaneberg --- qt-models/CMakeLists.txt | 2 +- qt-models/weightmodel.cpp | 4 +- qt-models/weightsysteminfomodel.cpp | 131 ++++++++++++++++++++++++++++++++++++ qt-models/weightsysteminfomodel.h | 33 +++++++++ qt-models/weigthsysteminfomodel.cpp | 131 ------------------------------------ qt-models/weigthsysteminfomodel.h | 33 --------- 6 files changed, 167 insertions(+), 167 deletions(-) create mode 100644 qt-models/weightsysteminfomodel.cpp create mode 100644 qt-models/weightsysteminfomodel.h delete mode 100644 qt-models/weigthsysteminfomodel.cpp delete mode 100644 qt-models/weigthsysteminfomodel.h (limited to 'qt-models') diff --git a/qt-models/CMakeLists.txt b/qt-models/CMakeLists.txt index e7f6ec01e..dc840e059 100644 --- a/qt-models/CMakeLists.txt +++ b/qt-models/CMakeLists.txt @@ -19,7 +19,7 @@ set(SUBSURFACE_DESKTOP_MODELS_LIB_SRCS treemodel.cpp cylindermodel.cpp yearlystatisticsmodel.cpp - weigthsysteminfomodel.cpp + weightsysteminfomodel.cpp weightmodel.cpp filtermodels.cpp divecomputermodel.cpp diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp index 8dd9b0223..227bb7be0 100644 --- a/qt-models/weightmodel.cpp +++ b/qt-models/weightmodel.cpp @@ -4,7 +4,7 @@ #include "core/gettextfromc.h" #include "core/metrics.h" #include "core/helpers.h" -#include "qt-models/weigthsysteminfomodel.h" +#include "qt-models/weightsysteminfomodel.h" WeightModel::WeightModel(QObject *parent) : CleanerTableModel(parent), changed(false), @@ -103,7 +103,7 @@ bool WeightModel::setData(const QModelIndex &index, const QVariant &value, int r switch (index.column()) { case TYPE: if (!value.isNull()) { - //TODO: C-function weigth_system_set_description ? + //TODO: C-function weight_system_set_description ? if (!ws->description || gettextFromC::instance()->tr(ws->description) != vString) { // loop over translations to see if one matches int i = -1; diff --git a/qt-models/weightsysteminfomodel.cpp b/qt-models/weightsysteminfomodel.cpp new file mode 100644 index 000000000..08fecec5d --- /dev/null +++ b/qt-models/weightsysteminfomodel.cpp @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "qt-models/weightsysteminfomodel.h" +#include "core/dive.h" +#include "core/metrics.h" +#include "core/gettextfromc.h" + +WSInfoModel *WSInfoModel::instance() +{ + static WSInfoModel self; + return &self; +} + +bool WSInfoModel::insertRows(int row, int count, const QModelIndex &parent) +{ + Q_UNUSED(row); + beginInsertRows(parent, rowCount(), rowCount()); + rows += count; + endInsertRows(); + return true; +} + +bool WSInfoModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + //WARN: check for Qt::EditRole + Q_UNUSED(role); + struct ws_info_t *info = &ws_info[index.row()]; + switch (index.column()) { + case DESCRIPTION: + info->name = strdup(value.toByteArray().data()); + break; + case GR: + info->grams = value.toInt(); + break; + } + emit dataChanged(index, index); + return true; +} + +void WSInfoModel::clear() +{ +} + +QVariant WSInfoModel::data(const QModelIndex &index, int role) const +{ + QVariant ret; + if (!index.isValid()) { + return ret; + } + struct ws_info_t *info = &ws_info[index.row()]; + + int gr = info->grams; + switch (role) { + case Qt::FontRole: + ret = defaultModelFont(); + break; + case Qt::DisplayRole: + case Qt::EditRole: + switch (index.column()) { + case GR: + ret = gr; + break; + case DESCRIPTION: + ret = gettextFromC::instance()->tr(info->name); + break; + } + break; + } + return ret; +} + +int WSInfoModel::rowCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent); + return rows + 1; +} + +const QString &WSInfoModel::biggerString() const +{ + return biggerEntry; +} + +WSInfoModel::WSInfoModel() : rows(-1) +{ + setHeaderDataStrings(QStringList() << tr("Description") << tr("kg")); + struct ws_info_t *info = ws_info; + for (info = ws_info; info->name; info++, rows++) { + QString wsInfoName = gettextFromC::instance()->tr(info->name); + if (wsInfoName.count() > biggerEntry.count()) + biggerEntry = wsInfoName; + } + + if (rows > -1) { + beginInsertRows(QModelIndex(), 0, rows); + endInsertRows(); + } +} + +void WSInfoModel::updateInfo() +{ + struct ws_info_t *info = ws_info; + beginRemoveRows(QModelIndex(), 0, this->rows); + endRemoveRows(); + rows = -1; + for (info = ws_info; info->name; info++, rows++) { + QString wsInfoName = gettextFromC::instance()->tr(info->name); + if (wsInfoName.count() > biggerEntry.count()) + biggerEntry = wsInfoName; + } + + if (rows > -1) { + beginInsertRows(QModelIndex(), 0, rows); + endInsertRows(); + } +} + +void WSInfoModel::update() +{ + if (rows > -1) { + beginRemoveRows(QModelIndex(), 0, rows); + endRemoveRows(); + rows = -1; + } + struct ws_info_t *info = ws_info; + for (info = ws_info; info->name; info++, rows++) + ; + + if (rows > -1) { + beginInsertRows(QModelIndex(), 0, rows); + endInsertRows(); + } +} diff --git a/qt-models/weightsysteminfomodel.h b/qt-models/weightsysteminfomodel.h new file mode 100644 index 000000000..98c11d814 --- /dev/null +++ b/qt-models/weightsysteminfomodel.h @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0 +#ifndef WEIGHTSYSTEMINFOMODEL_H +#define WEIGHTSYSTEMINFOMODEL_H + +#include "cleanertablemodel.h" + +/* Encapsulate ws_info */ +class WSInfoModel : public CleanerTableModel { + Q_OBJECT +public: + static WSInfoModel *instance(); + + enum Column { + DESCRIPTION, + GR + }; + WSInfoModel(); + + /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; + /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; + /*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); + /*reimp*/ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + const QString &biggerString() const; + void clear(); + void update(); + void updateInfo(); + +private: + int rows; + QString biggerEntry; +}; + +#endif diff --git a/qt-models/weigthsysteminfomodel.cpp b/qt-models/weigthsysteminfomodel.cpp deleted file mode 100644 index 608a70e56..000000000 --- a/qt-models/weigthsysteminfomodel.cpp +++ /dev/null @@ -1,131 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "qt-models/weigthsysteminfomodel.h" -#include "core/dive.h" -#include "core/metrics.h" -#include "core/gettextfromc.h" - -WSInfoModel *WSInfoModel::instance() -{ - static WSInfoModel self; - return &self; -} - -bool WSInfoModel::insertRows(int row, int count, const QModelIndex &parent) -{ - Q_UNUSED(row); - beginInsertRows(parent, rowCount(), rowCount()); - rows += count; - endInsertRows(); - return true; -} - -bool WSInfoModel::setData(const QModelIndex &index, const QVariant &value, int role) -{ - //WARN: check for Qt::EditRole - Q_UNUSED(role); - struct ws_info_t *info = &ws_info[index.row()]; - switch (index.column()) { - case DESCRIPTION: - info->name = strdup(value.toByteArray().data()); - break; - case GR: - info->grams = value.toInt(); - break; - } - emit dataChanged(index, index); - return true; -} - -void WSInfoModel::clear() -{ -} - -QVariant WSInfoModel::data(const QModelIndex &index, int role) const -{ - QVariant ret; - if (!index.isValid()) { - return ret; - } - struct ws_info_t *info = &ws_info[index.row()]; - - int gr = info->grams; - switch (role) { - case Qt::FontRole: - ret = defaultModelFont(); - break; - case Qt::DisplayRole: - case Qt::EditRole: - switch (index.column()) { - case GR: - ret = gr; - break; - case DESCRIPTION: - ret = gettextFromC::instance()->tr(info->name); - break; - } - break; - } - return ret; -} - -int WSInfoModel::rowCount(const QModelIndex &parent) const -{ - Q_UNUSED(parent); - return rows + 1; -} - -const QString &WSInfoModel::biggerString() const -{ - return biggerEntry; -} - -WSInfoModel::WSInfoModel() : rows(-1) -{ - setHeaderDataStrings(QStringList() << tr("Description") << tr("kg")); - struct ws_info_t *info = ws_info; - for (info = ws_info; info->name; info++, rows++) { - QString wsInfoName = gettextFromC::instance()->tr(info->name); - if (wsInfoName.count() > biggerEntry.count()) - biggerEntry = wsInfoName; - } - - if (rows > -1) { - beginInsertRows(QModelIndex(), 0, rows); - endInsertRows(); - } -} - -void WSInfoModel::updateInfo() -{ - struct ws_info_t *info = ws_info; - beginRemoveRows(QModelIndex(), 0, this->rows); - endRemoveRows(); - rows = -1; - for (info = ws_info; info->name; info++, rows++) { - QString wsInfoName = gettextFromC::instance()->tr(info->name); - if (wsInfoName.count() > biggerEntry.count()) - biggerEntry = wsInfoName; - } - - if (rows > -1) { - beginInsertRows(QModelIndex(), 0, rows); - endInsertRows(); - } -} - -void WSInfoModel::update() -{ - if (rows > -1) { - beginRemoveRows(QModelIndex(), 0, rows); - endRemoveRows(); - rows = -1; - } - struct ws_info_t *info = ws_info; - for (info = ws_info; info->name; info++, rows++) - ; - - if (rows > -1) { - beginInsertRows(QModelIndex(), 0, rows); - endInsertRows(); - } -} diff --git a/qt-models/weigthsysteminfomodel.h b/qt-models/weigthsysteminfomodel.h deleted file mode 100644 index 98c11d814..000000000 --- a/qt-models/weigthsysteminfomodel.h +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#ifndef WEIGHTSYSTEMINFOMODEL_H -#define WEIGHTSYSTEMINFOMODEL_H - -#include "cleanertablemodel.h" - -/* Encapsulate ws_info */ -class WSInfoModel : public CleanerTableModel { - Q_OBJECT -public: - static WSInfoModel *instance(); - - enum Column { - DESCRIPTION, - GR - }; - WSInfoModel(); - - /*reimp*/ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - /*reimp*/ int rowCount(const QModelIndex &parent = QModelIndex()) const; - /*reimp*/ bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); - /*reimp*/ bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); - const QString &biggerString() const; - void clear(); - void update(); - void updateInfo(); - -private: - int rows; - QString biggerEntry; -}; - -#endif -- cgit v1.2.3-70-g09d2