mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive pictures: remove close-button optimization

Browse source 
One close-button object was used for all dive pictures. This seems
like a brittle premature optimization and the pixmap is shared
anyway. Make the button a subobject of the dive picture object.

Change the object-hierarchy to be based on QGraphicsItem instead
of QObject. The QObject here is only used as a kludge to support
signals and properties (the latter are necessary for animations).

Remove a comment, which does not seem to be relevant after this
change.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-03-04 01:01:52 +01:00 committed by Dirk Hohndel
parent e811c7306d
commit 630862971f
4 changed files with 37 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
profile-widget/diveeventitem.cpp
View file

@ -12,7 +12,7 @@
extern struct ev_select *ev_namelist;
extern int evn_used;
DiveEventItem::DiveEventItem(QObject *parent) : DivePixmapItem(parent),
DiveEventItem::DiveEventItem(QGraphicsItem *parent) : DivePixmapItem(parent),
vAxis(NULL),
hAxis(NULL),
dataModel(NULL),

2
profile-widget/diveeventitem.h
View file

@ -11,7 +11,7 @@ struct event;
class DiveEventItem : public DivePixmapItem {
Q_OBJECT
public:
DiveEventItem(QObject *parent = 0);
DiveEventItem(QGraphicsItem *parent = 0);
virtual ~DiveEventItem();
void setEvent(struct event *ev, struct gasmix *lastgasmix);
struct event *getEvent();

40
profile-widget/divepixmapitem.cpp
View file

@ -12,11 +12,11 @@
#include <QUrl>
#include <QGraphicsSceneMouseEvent>
DivePixmapItem::DivePixmapItem(QObject *parent) : QObject(parent), QGraphicsPixmapItem()
DivePixmapItem::DivePixmapItem(QGraphicsItem *parent) : QGraphicsPixmapItem(parent)
{
}
DiveButtonItem::DiveButtonItem(QObject *parent): DivePixmapItem(parent)
DiveButtonItem::DiveButtonItem(QGraphicsItem *parent): DivePixmapItem(parent)
{
}
@ -26,9 +26,7 @@ void DiveButtonItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
emit clicked();
}
// If we have many many pictures on screen, maybe a shared-pixmap would be better to
// paint on screen, but for now, this.
CloseButtonItem::CloseButtonItem(QObject *parent): DiveButtonItem(parent)
CloseButtonItem::CloseButtonItem(QGraphicsItem *parent): DiveButtonItem(parent)
{
static QPixmap p = QPixmap(":list-remove-icon");
setPixmap(p);
@ -45,9 +43,10 @@ void CloseButtonItem::show()
DiveButtonItem::show();
}
DivePictureItem::DivePictureItem(QObject *parent): DivePixmapItem(parent),
DivePictureItem::DivePictureItem(QGraphicsItem *parent): DivePixmapItem(parent),
canvas(new QGraphicsRectItem(this)),
shadow(new QGraphicsRectItem(this))
shadow(new QGraphicsRectItem(this)),
button(new CloseButtonItem(this))
{
setFlag(ItemIgnoresTransformations);
setAcceptHoverEvents(true);
@ -67,6 +66,10 @@ DivePictureItem::DivePictureItem(QObject *parent): DivePixmapItem(parent),
shadow->setBrush(QColor(Qt::lightGray));
shadow->setFlag(ItemStacksBehindParent);
shadow->setZValue(-2);
button->setScale(0.2);
button->setZValue(7);
button->hide();
}
void DivePictureItem::settingsChanged()
@ -80,28 +83,19 @@ void DivePictureItem::setPixmap(const QPixmap &pix)
QRectF r = boundingRect();
canvas->setRect(0 - 10, 0 -10, r.width() + 20, r.height() + 20);
shadow->setRect(canvas->rect());
button->setPos(boundingRect().width() - button->boundingRect().width() * 0.2,
boundingRect().height() - button->boundingRect().height() * 0.2);
}
CloseButtonItem *button = NULL;
void DivePictureItem::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
{
Q_UNUSED(event);
Animations::scaleTo(this, 1.0);
setZValue(5);
if(!button) {
button = new CloseButtonItem();
button->setScale(0.2);
button->setZValue(7);
scene()->addItem(button);
}
button->setParentItem(this);
button->setPos(boundingRect().width() - button->boundingRect().width() * 0.2,
boundingRect().height() - button->boundingRect().height() * 0.2);
button->setOpacity(0);
button->show();
Animations::show(button);
button->disconnect();
connect(button, SIGNAL(clicked()), this, SLOT(removePicture()));
}
@ -115,17 +109,7 @@ void DivePictureItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
Q_UNUSED(event);
Animations::scaleTo(this, 0.2);
setZValue(0);
if(button){
button->setParentItem(NULL);
Animations::hide(button);
}
}
DivePictureItem::~DivePictureItem(){
if(button){
button->setParentItem(NULL);
Animations::hide(button);
}
}
void DivePictureItem::mousePressEvent(QGraphicsSceneMouseEvent *event)

44
profile-widget/divepixmapitem.h
View file

@ -12,15 +12,33 @@ class DivePixmapItem : public QObject, public QGraphicsPixmapItem {
Q_PROPERTY(qreal x WRITE setX READ x)
Q_PROPERTY(qreal y WRITE setY READ y)
public:
DivePixmapItem(QObject *parent = 0);
DivePixmapItem(QGraphicsItem *parent = 0);
};
class DiveButtonItem : public DivePixmapItem {
Q_OBJECT
public:
DiveButtonItem(QGraphicsItem *parent = 0);
protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
signals:
void clicked();
};
class CloseButtonItem : public DiveButtonItem {
Q_OBJECT
public:
CloseButtonItem(QGraphicsItem *parent = 0);
public slots:
void hide();
void show();
};
class DivePictureItem : public DivePixmapItem {
Q_OBJECT
Q_PROPERTY(qreal scale WRITE setScale READ scale)
public:
DivePictureItem(QObject *parent = 0);
virtual ~DivePictureItem();
DivePictureItem(QGraphicsItem *parent = 0);
void setPixmap(const QPixmap& pix);
public slots:
void settingsChanged();
@ -36,25 +54,7 @@ private:
QString fileUrl;
QGraphicsRectItem *canvas;
QGraphicsRectItem *shadow;
};
class DiveButtonItem : public DivePixmapItem {
Q_OBJECT
public:
DiveButtonItem(QObject *parent = 0);
protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
signals:
void clicked();
};
class CloseButtonItem : public DiveButtonItem {
Q_OBJECT
public:
CloseButtonItem(QObject *parent = 0);
public slots:
void hide();
void show();
DiveButtonItem *button;
};
#endif // DIVEPIXMAPITEM_H