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

Moves deletion logic of divepoints to the Model.

Browse source 
Deletes the logic of divepoints to the model, this
makes automatic updates on the table on deletions.
( remember, to select dive points, ctrl+click on it.
) if you want to delete it, press 'delete', it will
be removed from the graphics part and also from the
table.

Next: delete point by clicking on the table trash-
icon.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
This commit is contained in:
Tomaz Canabrava 2013-08-30 15:53:10 -03:00
parent 5e722a93e4
commit d37213a413
2 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
qt-ui/diveplanner.cpp
View file

@ -158,9 +158,12 @@ DivePlannerGraphics::DivePlannerGraphics(QWidget* parent): QGraphicsView(parent)
gasListView->hide();
connect(gasListView, SIGNAL(activated(QModelIndex)), this, SLOT(selectGas(QModelIndex)));
connect(DivePlannerPointsModel::instance(), SIGNAL(rowsInserted(const QModelIndex&,int,int)),
connect(plannerModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(createDecoStops()));
connect(plannerModel, SIGNAL(rowsInserted(const QModelIndex&,int,int)),
this, SLOT(pointInserted(const QModelIndex&, int, int)));
connect(DivePlannerPointsModel::instance(), SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(createDecoStops()));
connect(plannerModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
this, SLOT(pointsRemoved(const QModelIndex&, int, int)));
setRenderHint(QPainter::Antialiasing);
}
@ -287,18 +290,42 @@ void DivePlannerGraphics::keyDeleteAction()
delete btn;
}
QVector<int> selectedIndexes;
Q_FOREACH(QGraphicsItem *i, scene()->selectedItems()){
if (DiveHandler *handler = qgraphicsitem_cast<DiveHandler*>(i)){
handles.removeAll(handler);
scene()->removeItem(handler);
delete i;
selectedIndexes.push_back(handles.indexOf(handler));
}
}
plannerModel->removeSelectedPoints(selectedIndexes);
createDecoStops();
}
}
void DivePlannerGraphics::pointsRemoved(const QModelIndex& , int start, int end)
{ // start and end are inclusive.
int num = (end - start) + 1;
for(int i = num; i != 0; i--){
delete handles.back();
handles.pop_back();
}
scene()->clearSelection();
}
bool intLessThan(int a, int b){
return a <= b;
}
void DivePlannerPointsModel::removeSelectedPoints(const QVector< int >& rows)
{
int firstRow = rowCount() - rows.count();
QVector<int> v2 = rows;
std::sort(v2.begin(), v2.end(), intLessThan);
beginRemoveRows(QModelIndex(), firstRow, rowCount()-1);
for(int i = v2.count()-1; i >= 0; i--){
divepoints.remove(v2[i]);
}
endRemoveRows();
}
void DivePlannerGraphics::keyEscAction()
{
if (scene()->selectedItems().count()){
@ -662,6 +689,10 @@ void DiveHandler::mousePressEvent(QGraphicsSceneMouseEvent* event)
}
// mousePressEvent 'grabs' the mouse and keyboard, annoying.
ungrabMouse();
/* hack. Sometimes the keyboard is grabbed, sometime it's not,
so, let's force a grab and release, to get rid of a warning. */
grabKeyboard();
ungrabKeyboard();
}

3
qt-ui/diveplanner.h
View file

@ -31,7 +31,7 @@ public:
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 Qt::ItemFlags flags(const QModelIndex& index) const;
void removeSelectedPoints(const QVector<int>& rows);
/**
* @return the row number.
*/
@ -134,6 +134,7 @@ private slots:
void prepareSelectGas();
void selectGas(const QModelIndex& index);
void pointInserted(const QModelIndex&, int start, int end);
void pointsRemoved(const QModelIndex&, int start, int end);
private:
void moveActiveHandler(const QPointF& pos);