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

Correct trash or trashforbidden icon and tooltip in cylinder table

Browse source 
Display the correct trash or trashforbidden icon and tooltip in the cylinder table.
This should fit together with if it is really possible to remove a cylinder.

Search for "same gas" based on used cylinders only. Otherwise one could remove
a used cylinder because there is an unused cylinder with same gas.

ToDo:
In planner update trash icon on change of planner points.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2017-03-11 10:39:48 +01:00 • committed by Dirk Hohndel
parent b11af5a1ce
commit ac52034778
1 changed files with 42 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
qt-models/cylindermodel.cpp
View file

@ -135,7 +135,11 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.row() >= MAX_CYLINDERS) if (!index.isValid() || index.row() >= MAX_CYLINDERS)
return ret; return ret;
int mapping[MAX_CYLINDERS];
int same_gas = -1;
cylinder_t *cyl = &displayed_dive.cylinder[index.row()]; cylinder_t *cyl = &displayed_dive.cylinder[index.row()];
struct gasmix *mygas = &cyl->gasmix;
switch (role) { switch (role) {
case Qt::BackgroundRole: { case Qt::BackgroundRole: {
switch (index.column()) { switch (index.column()) {
@ -222,26 +226,48 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const
} }
break; break;
case Qt::DecorationRole: case Qt::DecorationRole:
if (index.column() == REMOVE) {
if (rowCount() > 1)
ret = trashIcon();
else
ret = trashForbiddenIcon();
}
break;
case Qt::SizeHintRole: case Qt::SizeHintRole:
if (index.column() == REMOVE) { if (index.column() == REMOVE) {
if (rowCount() > 1) same_gas = -1;
ret = trashIcon(); for (int i = 0; i < MAX_CYLINDERS; i++) {
else mapping[i] = i;
if (i == index.row() || cylinder_none(&displayed_dive.cylinder[i]))
continue;
struct gasmix *gas2 = &displayed_dive.cylinder[i].gasmix;
if (gasmix_distance(mygas, gas2) == 0 && is_cylinder_used(&displayed_dive, i))
same_gas = i;
}
if (same_gas == -1 &&
((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING &&
DivePlannerPointsModel::instance()->tankInUse(index.row())) ||
(DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING &&
is_cylinder_used(&displayed_dive, index.row())))) {
ret = trashForbiddenIcon(); ret = trashForbiddenIcon();
} }
else ret = trashIcon();
}
break; break;
case Qt::ToolTipRole: case Qt::ToolTipRole:
switch (index.column()) { switch (index.column()) {
case REMOVE: case REMOVE:
ret = tr("Clicking here will remove this cylinder."); same_gas = -1;
for (int i = 0; i < MAX_CYLINDERS; i++) {
mapping[i] = i;
if (i == index.row() || cylinder_none(&displayed_dive.cylinder[i]))
continue;
struct gasmix *gas2 = &displayed_dive.cylinder[i].gasmix;
if (gasmix_distance(mygas, gas2) == 0 && is_cylinder_used(&displayed_dive, i))
same_gas = i;
}
if (same_gas == -1 &&
((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING &&
DivePlannerPointsModel::instance()->tankInUse(index.row())) ||
(DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING &&
is_cylinder_used(&displayed_dive, index.row())))) {
ret = tr("This gas is in use. Only cylinders that are not used in the dive can be removed.");
}
else ret = tr("Clicking here will remove this cylinder.");
break; break;
case TYPE: case TYPE:
case SIZE: case SIZE:
@ -519,19 +545,16 @@ void CylindersModel::remove(const QModelIndex &index)
if (i == index.row() || cylinder_none(&displayed_dive.cylinder[i])) if (i == index.row() || cylinder_none(&displayed_dive.cylinder[i]))
continue; continue;
struct gasmix *gas2 = &displayed_dive.cylinder[i].gasmix; struct gasmix *gas2 = &displayed_dive.cylinder[i].gasmix;
if (gasmix_distance(mygas, gas2) == 0) if (gasmix_distance(mygas, gas2) == 0 && is_cylinder_used(&displayed_dive, i))
same_gas = i; same_gas = i;
} }
if (same_gas == -1 && if (same_gas == -1 &&
((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING && ((DivePlannerPointsModel::instance()->currentMode() != DivePlannerPointsModel::NOTHING &&
DivePlannerPointsModel::instance()->tankInUse(index.row())) || DivePlannerPointsModel::instance()->tankInUse(index.row())) ||
(DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING && (DivePlannerPointsModel::instance()->currentMode() == DivePlannerPointsModel::NOTHING &&
is_cylinder_used(&displayed_dive, index.row())))) { is_cylinder_used(&displayed_dive, index.row()))))
emit warningMessage(TITLE_OR_TEXT(
tr("Cylinder cannot be removed"),
tr("This gas is in use. Only cylinders that are not used in the dive can be removed.")));
return; return;
}
beginRemoveRows(QModelIndex(), index.row(), index.row()); // yah, know, ugly. beginRemoveRows(QModelIndex(), index.row(), index.row()); // yah, know, ugly.
rows--; rows--;
// if we didn't find an identical gas, point same_gas at the index.row() // if we didn't find an identical gas, point same_gas at the index.row()