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

Add depth colum to cylinder model

Browse source 
To make the planner work this adds a new column to the Cylinder widget
(depth - for the depth at which we want to change to a certain gas
during deco).

This also tries to hide that column in the equipment view and hide the
start/end pressure columns in the planner view. Oddly that fails :-(

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-11-12 11:12:43 +09:00
parent cd1149e57f
commit d72c69db7a
7 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -143,6 +143,7 @@ typedef struct {
cylinder_type_t type;
struct gasmix gasmix;
pressure_t start, end, sample_start, sample_end;
depth_t depth;
} cylinder_t;
typedef struct {

5
qt-ui/diveplanner.cpp
View file

@ -905,6 +905,11 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::GAS, new AirTypesDelegate(this));
ui.cylinderTableWidget->setTitle(tr("Available Gases"));
ui.cylinderTableWidget->setModel(CylindersModel::instance());
// the setColumnHidden calls don't seem to work????
ui.cylinderTableWidget->setColumnHidden(CylindersModel::START, true);
ui.cylinderTableWidget->setColumnHidden(CylindersModel::END, true);
ui.cylinderTableWidget->setColumnHidden(CylindersModel::DEPTH, false);
ui.cylinderTableWidget->view()->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate());
connect(ui.cylinderTableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addCylinder_clicked()));
connect(ui.tableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addStop()));

3
qt-ui/maintab.cpp
View file

@ -83,7 +83,8 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
ui.cylinders->view()->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate());
ui.weights->view()->setItemDelegateForColumn(WeightModel::TYPE, new WSInfoDelegate());
// this does not appear to work???
ui.cylinders->view()->setColumnHidden(CylindersModel::DEPTH, true);
completers.buddy = new QCompleter(BuddyCompletionModel::instance(), ui.buddy);
completers.divemaster = new QCompleter(DiveMasterCompletionModel::instance(), ui.divemaster);
completers.location = new QCompleter(LocationCompletionModel::instance(), ui.location);

19
qt-ui/models.cpp
View file

@ -58,8 +58,8 @@ void CleanerTableModel::setHeaderDataStrings(const QStringList& newHeaders)
CylindersModel::CylindersModel(QObject* parent): current(0), rows(0)
{
// enum{REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE,};
setHeaderDataStrings( QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << tr("O2%") << tr("HE"));
// enum{REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
setHeaderDataStrings( QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << tr("O2%") << tr("HE") << tr("Switch at"));
}
CylindersModel *CylindersModel::instance()
@ -148,6 +148,12 @@ QVariant CylindersModel::data(const QModelIndex& index, int role) const
case HE:
ret = percent_string(cyl->gasmix.he);
break;
case DEPTH:
if (prefs.units.length == prefs.units.FEET)
ret = mm_to_feet(cyl->depth.mm);
else
ret = cyl->depth.mm / 1000;
break;
}
break;
case Qt::DecorationRole:
@ -279,6 +285,15 @@ bool CylindersModel::setData(const QModelIndex& index, const QVariant& value, in
changed = true;
}
break;
case DEPTH:
if (CHANGED(toDouble, "ft", "m")) {
if (value.toInt() != 0) {
if (prefs.units.length == prefs.units.FEET)
cyl->depth.mm = feet_to_mm(value.toString().remove("ft").remove("m").toInt());
else
cyl->depth.mm = value.toString().remove("ft").remove("m").toInt() * 1000;
}
}
}
dataChanged(index, index);
return true;

2
qt-ui/models.h
View file

@ -79,7 +79,7 @@ private:
class CylindersModel : public CleanerTableModel {
Q_OBJECT
public:
enum Column {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE};
enum Column {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
explicit CylindersModel(QObject* parent = 0);
static CylindersModel *instance();

2
qt-ui/tableview.cpp
View file

@ -7,7 +7,7 @@
#include <QTextStream>
#include <QSettings>
TableView::TableView(QWidget *parent) : QWidget(parent)
TableView::TableView(QWidget *parent) : QTableView(parent)
{
ui.setupUi(this);
QFile cssFile(":table-css");

2
qt-ui/tableview.h
View file

@ -14,7 +14,7 @@ class QAbstractItemModel;
class QModelIndex;
class QTableView;
class TableView : public QWidget {
class TableView : public QTableView {
Q_OBJECT
public:
TableView(QWidget *parent = 0);