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

New profile: add event manipulation to context menu

Browse source 
This got lost when we switched to the new profile.
Remove event works. Hide events does call hide() on the DiveEventItem but
for some reason it stays visible. I'll hope for one of the more
experienced Qt people to fix that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-03-15 21:12:34 -07:00
parent cb41f34826
commit 401aa210ff
3 changed files with 80 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
qt-ui/profile/diveeventitem.cpp
View file

@ -4,8 +4,12 @@
#include "animationfunctions.h"
#include "libdivecomputer.h"
#include "dive.h"
#include "profile.h"
#include <QDebug>
extern struct ev_select *ev_namelist;
extern int evn_used;
DiveEventItem::DiveEventItem(QObject *parent) : DivePixmapItem(parent),
vAxis(NULL),
hAxis(NULL),
@ -107,6 +111,7 @@ void DiveEventItem::eventVisibilityChanged(const QString &eventName, bool visibl
void DiveEventItem::recalculatePos(bool instant)
{
bool hidden = false;
if (!vAxis || !hAxis || !internalEvent || !dataModel)
return;
@ -116,9 +121,12 @@ void DiveEventItem::recalculatePos(bool instant)
hide();
return;
}
if (!isVisible())
for (int i = 0; i < evn_used; i++) {
if (!strcmp(internalEvent->name, ev_namelist[i].ev_name) && ev_namelist[i].plot_ev == false)
hidden = true;
}
if (!isVisible() && !hidden)
show();
int depth = dataModel->data(dataModel->index(result.first().row(), DivePlotDataModel::DEPTH)).toInt();
qreal x = hAxis->posAtValue(internalEvent->time.seconds);
qreal y = vAxis->posAtValue(depth);
@ -126,4 +134,6 @@ void DiveEventItem::recalculatePos(bool instant)
Animations::moveTo(this, x, y);
else
setPos(x, y);
if (isVisible() && hidden)
hide();
}