mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: make cylinder-model subobject of planner-model

Browse source 
The cylinder-model had an instance() function, but actually
there were two cylinder models: one used by the equipment tab,
one used by the planner.

This is misleading. Therefore, remove the instance() function
and make the cylinder-model a subobject of the planner-model.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-03 18:52:17 +01:00 • committed by Dirk Hohndel
parent 6622f42aab
commit 190a2a876e
7 changed files with 39 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
backend-shared/plannershared.cpp
View file

@ -126,7 +126,7 @@ void PlannerShared::set_o2narcotic(bool value)
{
qPrefDivePlanner::set_o2narcotic(value);
DivePlannerPointsModel::instance()->emitDataChanged();
CylindersModelFiltered::instance()->model()->updateBestMixes();
DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes();
}
double PlannerShared::bottompo2()
@ -136,7 +136,7 @@ double PlannerShared::bottompo2()
void PlannerShared::set_bottompo2(double value)
{
qPrefDivePlanner::set_bottompo2((int) (value * 1000.0));
CylindersModelFiltered::instance()->model()->updateBestMixes();
DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes();
}
double PlannerShared::decopo2()
@ -148,8 +148,8 @@ void PlannerShared::set_decopo2(double value)
pressure_t olddecopo2;
olddecopo2.mbar = prefs.decopo2;
qPrefDivePlanner::instance()->set_decopo2((int) (value * 1000.0));
CylindersModelFiltered::instance()->model()->updateDecoDepths(olddecopo2);
CylindersModelFiltered::instance()->model()->updateBestMixes();
DivePlannerPointsModel::instance()->cylindersModel()->model()->updateDecoDepths(olddecopo2);
DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes();
}
int PlannerShared::bestmixend()
@ -159,5 +159,5 @@ int PlannerShared::bestmixend()
void PlannerShared::set_bestmixend(int value)
{
qPrefDivePlanner::set_bestmixend(units_to_depth(value).mm);
CylindersModelFiltered::instance()->model()->updateBestMixes();
DivePlannerPointsModel::instance()->cylindersModel()->model()->updateBestMixes();
}

20
desktop-widgets/diveplanner.cpp
View file

@ -110,6 +110,8 @@ void DiveHandler::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f)
{
DivePlannerPointsModel *plannerModel = DivePlannerPointsModel::instance();
CylindersModelFiltered *cylinders = DivePlannerPointsModel::instance()->cylindersModel();
ui.setupUi(this);
ui.dateEdit->setDisplayFormat(prefs.date_format);
ui.tableWidget->setTitle(tr("Dive planner points"));
@ -120,8 +122,8 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg
ui.tableWidget->view()->setItemDelegateForColumn(DivePlannerPointsModel::DIVEMODE, new DiveTypesDelegate(this));
ui.cylinderTableWidget->setTitle(tr("Available gases"));
ui.cylinderTableWidget->setBtnToolTip(tr("Add cylinder"));
ui.cylinderTableWidget->setModel(CylindersModelFiltered::instance());
connect(ui.cylinderTableWidget, &TableView::itemClicked, CylindersModelFiltered::instance(), &CylindersModelFiltered::remove);
ui.cylinderTableWidget->setModel(cylinders);
connect(ui.cylinderTableWidget, &TableView::itemClicked, cylinders, &CylindersModelFiltered::remove);
ui.waterType->setItemData(0, FRESHWATER_SALINITY);
ui.waterType->setItemData(1, SEAWATER_SALINITY);
ui.waterType->setItemData(2, EN13319_SALINITY);
@ -139,13 +141,13 @@ DivePlannerWidget::DivePlannerWidget(QWidget *parent, Qt::WindowFlags f) : QWidg
// Continue to use old syntax, to avoid problems.
connect(ui.tableWidget, SIGNAL(addButtonClicked()), plannerModel, SLOT(addStop()));
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::dataChanged, GasSelectionModel::instance(), &GasSelectionModel::repopulate);
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::rowsInserted, GasSelectionModel::instance(), &GasSelectionModel::repopulate);
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::rowsRemoved, GasSelectionModel::instance(), &GasSelectionModel::repopulate);
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::dataChanged, plannerModel, &DivePlannerPointsModel::emitDataChanged);
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::dataChanged, plannerModel, &DivePlannerPointsModel::cylinderModelEdited);
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::rowsInserted, plannerModel, &DivePlannerPointsModel::cylinderModelEdited);
connect(CylindersModelFiltered::instance(), &CylindersModelFiltered::rowsRemoved, plannerModel, &DivePlannerPointsModel::cylinderModelEdited);
connect(cylinders, &CylindersModelFiltered::dataChanged, GasSelectionModel::instance(), &GasSelectionModel::repopulate);
connect(cylinders, &CylindersModelFiltered::rowsInserted, GasSelectionModel::instance(), &GasSelectionModel::repopulate);
connect(cylinders, &CylindersModelFiltered::rowsRemoved, GasSelectionModel::instance(), &GasSelectionModel::repopulate);
connect(cylinders, &CylindersModelFiltered::dataChanged, plannerModel, &DivePlannerPointsModel::emitDataChanged);
connect(cylinders, &CylindersModelFiltered::dataChanged, plannerModel, &DivePlannerPointsModel::cylinderModelEdited);
connect(cylinders, &CylindersModelFiltered::rowsInserted, plannerModel, &DivePlannerPointsModel::cylinderModelEdited);
connect(cylinders, &CylindersModelFiltered::rowsRemoved, plannerModel, &DivePlannerPointsModel::cylinderModelEdited);
connect(plannerModel, &DivePlannerPointsModel::calculatedPlanNotes, MainWindow::instance(), &MainWindow::setPlanNotes);

2
desktop-widgets/mainwindow.cpp
View file

@ -918,7 +918,7 @@ void MainWindow::on_actionReplanDive_triggered()
divePlannerWidget->setSalinity(current_dive->salinity);
DivePlannerPointsModel::instance()->loadFromDive(current_dive);
reset_cylinders(&displayed_dive, true);
CylindersModelFiltered::instance()->updateDive();
DivePlannerPointsModel::instance()->cylindersModel()->updateDive();
}
void MainWindow::on_actionDivePlanner_triggered()

6
qt-models/cylindermodel.cpp
View file

@ -611,12 +611,6 @@ void CylindersModel::cylindersReset(const QVector<dive *> &dives)
updateDive();
}
CylindersModelFiltered *CylindersModelFiltered::instance()
{
static CylindersModelFiltered self;
return &self;
}
CylindersModelFiltered::CylindersModelFiltered(QObject *parent) : QSortFilterProxyModel(parent)
{
setSourceModel(&source);

1
qt-models/cylindermodel.h
View file

@ -61,7 +61,6 @@ class CylindersModelFiltered : public QSortFilterProxyModel {
Q_OBJECT
public:
CylindersModelFiltered(QObject *parent = 0);
static CylindersModelFiltered *instance();
CylindersModel *model(); // Access to unfiltered base model
void clear();

35
qt-models/diveplannermodel.cpp
View file

@ -21,6 +21,11 @@
#define UNIT_FACTOR ((prefs.units.length == units::METERS) ? 1000.0 / 60.0 : feet_to_mm(1.0) / 60.0)
CylindersModelFiltered *DivePlannerPointsModel::cylindersModel()
{
return &cylinders;
}
/* TODO: Port this to CleanerTableModel to remove a bit of boilerplate and
* use the signal warningMessage() to communicate errors to the MainWindow.
*/
@ -37,7 +42,7 @@ void DivePlannerPointsModel::removeSelectedPoints(const QVector<int> &rows)
divepoints.remove(v2[i]);
}
endRemoveRows();
CylindersModelFiltered::instance()->model()->updateTrashIcon();
cylinders.model()->updateTrashIcon();
}
void DivePlannerPointsModel::createSimpleDive()
@ -89,7 +94,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d)
const struct event *evd = NULL;
enum divemode_t current_divemode = UNDEF_COMP_TYPE;
recalc = false;
CylindersModelFiltered::instance()->updateDive();
cylinders.updateDive();
duration_t lasttime = { 0 };
duration_t lastrecordedtime = {};
duration_t newtime = {};
@ -162,7 +167,7 @@ void DivePlannerPointsModel::setupCylinders()
reset_cylinders(&displayed_dive, true);
if (displayed_dive.cylinders.nr > 0) {
CylindersModelFiltered::instance()->updateDive();
cylinders.updateDive();
return; // We have at least one cylinder
}
}
@ -180,7 +185,7 @@ void DivePlannerPointsModel::setupCylinders()
add_to_cylinder_table(&displayed_dive.cylinders, 0, cyl);
}
reset_cylinders(&displayed_dive, false);
CylindersModelFiltered::instance()->updateDive();
cylinders.updateDive();
}
// Update the dive's maximum depth. Returns true if max. depth changed
@ -209,11 +214,9 @@ void DivePlannerPointsModel::removeDeco()
void DivePlannerPointsModel::addCylinder_clicked()
{
CylindersModelFiltered::instance()->add();
cylinders.add();
}
void DivePlannerPointsModel::setPlanMode(Mode m)
{
mode = m;
@ -317,7 +320,7 @@ bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &v
if (value.toInt() >= 0) {
p.depth = units_to_depth(value.toInt());
if (updateMaxDepth())
CylindersModelFiltered::instance()->model()->updateBestMixes();
cylinders.model()->updateBestMixes();
}
break;
case RUNTIME:
@ -343,8 +346,8 @@ bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &v
p.cylinderid = value.toInt();
/* Did we change the start (dp 0) cylinder to another cylinderid than 0? */
if (value.toInt() != 0 && index.row() == 0)
CylindersModelFiltered::instance()->model()->moveAtFirst(value.toInt());
CylindersModelFiltered::instance()->model()->updateTrashIcon();
cylinders.model()->moveAtFirst(value.toInt());
cylinders.model()->updateTrashIcon();
break;
case DIVEMODE:
if (value.toInt() < FREEDIVE) {
@ -799,9 +802,9 @@ void DivePlannerPointsModel::editStop(int row, divedatapoint newData)
divepoints[row] = newData;
std::sort(divepoints.begin(), divepoints.end(), divePointsLessThan);
if (updateMaxDepth())
CylindersModelFiltered::instance()->model()->updateBestMixes();
cylinders.model()->updateBestMixes();
if (divepoints[0].cylinderid != old_first_cylid)
CylindersModelFiltered::instance()->model()->moveAtFirst(divepoints[0].cylinderid);
cylinders.model()->moveAtFirst(divepoints[0].cylinderid);
emitDataChanged();
}
@ -850,9 +853,9 @@ void DivePlannerPointsModel::remove(const QModelIndex &index)
divepoints.remove(index.row());
}
endRemoveRows();
CylindersModelFiltered::instance()->model()->updateTrashIcon();
cylinders.model()->updateTrashIcon();
if (divepoints[0].cylinderid != old_first_cylid)
CylindersModelFiltered::instance()->model()->moveAtFirst(divepoints[0].cylinderid);
cylinders.model()->moveAtFirst(divepoints[0].cylinderid);
}
struct diveplan &DivePlannerPointsModel::getDiveplan()
@ -907,13 +910,13 @@ void DivePlannerPointsModel::clear()
{
bool oldRecalc = setRecalc(false);
CylindersModelFiltered::instance()->updateDive();
cylinders.updateDive();
if (rowCount() > 0) {
beginRemoveRows(QModelIndex(), 0, rowCount() - 1);
divepoints.clear();
endRemoveRows();
}
CylindersModelFiltered::instance()->clear();
cylinders.clear();
setRecalc(oldRecalc);
}

3
qt-models/diveplannermodel.h
View file

@ -7,6 +7,7 @@
#include "core/deco.h"
#include "core/planner.h"
#include "qt-models/cylindermodel.h"
class DivePlannerPointsModel : public QAbstractTableModel {
Q_OBJECT
@ -47,6 +48,7 @@ public:
bool tankInUse(int cylinderid);
void setupCylinders();
bool updateMaxDepth();
CylindersModelFiltered *cylindersModel();
int ascrate75Display();
int ascrate50Display();
@ -127,6 +129,7 @@ private:
void computeVariations(struct diveplan *diveplan, const struct deco_state *ds);
void computeVariationsFreeDeco(struct diveplan *diveplan, struct deco_state *ds);
int analyzeVariations(struct decostop *min, struct decostop *mid, struct decostop *max, const char *unit);
CylindersModelFiltered cylinders;
Mode mode;
bool recalc;
QVector<divedatapoint> divepoints;