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

Make gaschange from contex menu act as a gaschange

Browse source 
so it affect no longer the previous leg but all the following ones
with the same gas (i.e. until the next gaschange).

This makes the add dive/planner behaviour more consistent
with the rest of the program regarding gas changes.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2015-05-14 23:42:09 +02:00 • committed by Dirk Hohndel
parent 907ccb0b71
commit 043bd3afb7
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qt-ui/diveplanner.cpp
View file

@ -241,7 +241,7 @@ void DiveHandler::changeGas()
{ {
QAction *action = qobject_cast<QAction *>(sender()); QAction *action = qobject_cast<QAction *>(sender());
QModelIndex index = plannerModel->index(parentIndex(), DivePlannerPointsModel::GAS); QModelIndex index = plannerModel->index(parentIndex(), DivePlannerPointsModel::GAS);
plannerModel->setData(index, action->text()); plannerModel->gaschange(index.sibling(index.row() + 1, index.column()), action->text());
} }
void DiveHandler::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void DiveHandler::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
@ -741,6 +741,18 @@ bool DivePlannerPointsModel::setData(const QModelIndex &index, const QVariant &v
return QAbstractItemModel::setData(index, value, role); return QAbstractItemModel::setData(index, value, role);
} }
void DivePlannerPointsModel::gaschange(const QModelIndex &index, QString newgas)
{
int i = index.row();
gasmix oldgas = divepoints[i].gasmix;
gasmix gas = { 0 };
if (!validate_gas(newgas.toUtf8().data(), &gas))
return;
while (i < plannerModel->rowCount() && gasmix_distance(&oldgas, &divepoints[i].gasmix) == 0)
divepoints[i++].gasmix = gas;
emit dataChanged(createIndex(0, 0), createIndex(rowCount() - 1, COLUMNS - 1));
}
QVariant DivePlannerPointsModel::headerData(int section, Qt::Orientation orientation, int role) const QVariant DivePlannerPointsModel::headerData(int section, Qt::Orientation orientation, int role) const
{ {
if (role == Qt::DisplayRole && orientation == Qt::Horizontal) { if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {

1
qt-ui/diveplanner.h
View file

@ -35,6 +35,7 @@ public:
virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
virtual Qt::ItemFlags flags(const QModelIndex &index) const; virtual Qt::ItemFlags flags(const QModelIndex &index) const;
void gaschange(const QModelIndex &index, QString newgas);
void removeSelectedPoints(const QVector<int> &rows); void removeSelectedPoints(const QVector<int> &rows);
void setPlanMode(Mode mode); void setPlanMode(Mode mode);
bool isPlanner(); bool isPlanner();