mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Enable parts of planner based on define
In bf205726
DEPTH/Switch at was disabled by commenting out that code.
This puts it back behind ifdefs
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
d4a1932276
commit
8bc2ad1473
4 changed files with 25 additions and 12 deletions
|
@ -937,8 +937,9 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg
|
|||
QTableView *view = ui.cylinderTableWidget->view();
|
||||
view->setColumnHidden(CylindersModel::START, true);
|
||||
view->setColumnHidden(CylindersModel::END, true);
|
||||
// disabled as pointless outside of the disabled planner
|
||||
// view->setColumnHidden(CylindersModel::DEPTH, false);
|
||||
#ifdef ENABLE_PLANNER
|
||||
view->setColumnHidden(CylindersModel::DEPTH, false);
|
||||
#endif
|
||||
view->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate(this));
|
||||
connect(ui.cylinderTableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addCylinder_clicked()));
|
||||
connect(ui.tableWidget, SIGNAL(addButtonClicked()), DivePlannerPointsModel::instance(), SLOT(addStop()));
|
||||
|
|
|
@ -88,8 +88,9 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
|
|||
|
||||
ui.cylinders->view()->setItemDelegateForColumn(CylindersModel::TYPE, new TankInfoDelegate(this));
|
||||
ui.weights->view()->setItemDelegateForColumn(WeightModel::TYPE, new WSInfoDelegate(this));
|
||||
// disabled as this column is pointless outside the disabled planner
|
||||
// ui.cylinders->view()->setColumnHidden(CylindersModel::DEPTH, true);
|
||||
#ifdef ENABLE_PLANNER
|
||||
ui.cylinders->view()->setColumnHidden(CylindersModel::DEPTH, true);
|
||||
#endif
|
||||
completers.buddy = new QCompleter(&buddyModel, ui.buddy);
|
||||
completers.divemaster = new QCompleter(&diveMasterModel, ui.divemaster);
|
||||
completers.location = new QCompleter(&locationModel, ui.location);
|
||||
|
|
|
@ -67,7 +67,9 @@ CylindersModel::CylindersModel(QObject *parent) : current(0), rows(0)
|
|||
{
|
||||
// enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};
|
||||
setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("WorkPress") << tr("StartPress") << tr("EndPress") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")
|
||||
// while the planner is disabled, we don't need this column: << tr("Switch at")
|
||||
#ifdef ENABLE_PLANNER
|
||||
<< tr("Switch at")
|
||||
#endif
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -143,9 +145,11 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
|
|||
case HE:
|
||||
ret = percent_string(cyl->gasmix.he);
|
||||
break;
|
||||
// case DEPTH:
|
||||
// ret = get_depth_string(cyl->depth, true);
|
||||
// break;
|
||||
#ifdef ENABLE_PLANNER
|
||||
case DEPTH:
|
||||
ret = get_depth_string(cyl->depth, true);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case Qt::DecorationRole:
|
||||
|
@ -258,9 +262,13 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
|
|||
changed = true;
|
||||
}
|
||||
break;
|
||||
// case DEPTH:
|
||||
// if (CHANGED())
|
||||
// cyl->depth = string_to_depth(vString.toUtf8().data());
|
||||
#ifdef ENABLE_PLANNER
|
||||
case DEPTH:
|
||||
if (CHANGED()) {
|
||||
cyl->depth = string_to_depth(vString.toUtf8().data());
|
||||
changed = true;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
dataChanged(index, index);
|
||||
if (addDiveMode)
|
||||
|
|
|
@ -102,7 +102,10 @@ public:
|
|||
END,
|
||||
O2,
|
||||
HE,
|
||||
/* DEPTH, */ COLUMNS
|
||||
#ifdef ENABLE_PLANNER
|
||||
DEPTH,
|
||||
#endif
|
||||
COLUMNS
|
||||
};
|
||||
|
||||
explicit CylindersModel(QObject *parent = 0);
|
||||
|
|
Loading…
Add table
Reference in a new issue