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

Transform the DiveProfileItem to an Abstract Generalization

Browse source 
The DiveProfileItem contained much of the complexity and
algorithms for almost all line-based items on the canvas,
so I transformed that to a general abstraction and implemented
a new DiveProfileItem that uses it. this should reduce a
bit of code since the implementation of the PP Graphs, Temperature
Cylinder Pressure and maybe a few others will only need to
reimplement the paint() and the modelDataChanged() methods.
The rest is ready.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-01-16 16:21:23 -02:00 • committed by Dirk Hohndel
parent 1f80788286
commit 254beef5d4
4 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,19 +14,19 @@ DiveEventItem::DiveEventItem(QObject* parent): DivePixmapItem(parent),
void DiveEventItem::setHorizontalAxis(DiveCartesianAxis* axis)
{
hAxis = axis;
recalculate();
recalculatePos();
}
void DiveEventItem::setModel(DivePlotDataModel* model)
{
dataModel = model;
recalculate();
recalculatePos();
}
void DiveEventItem::setVerticalAxis(DiveCartesianAxis* axis)
{
vAxis = axis;
recalculate();
recalculatePos();
}
void DiveEventItem::setEvent(struct event* ev)
@ -34,7 +34,7 @@ void DiveEventItem::setEvent(struct event* ev)
internalEvent = ev;
setupPixmap();
setupToolTipString();
recalculate();
recalculatePos();
}
void DiveEventItem::setupPixmap()
@ -102,12 +102,11 @@ void DiveEventItem::eventVisibilityChanged(const QString& eventName, bool visibl
}
void DiveEventItem::recalculate()
void DiveEventItem::recalculatePos()
{
if (!vAxis || !hAxis || !internalEvent || !dataModel){
return;
}
qDebug() << "Calculating.";
QModelIndexList result = dataModel->match(dataModel->index(0,DivePlotDataModel::TIME), Qt::DisplayRole, internalEvent->time.seconds );
if(result.isEmpty()){
hide();

4
qt-ui/profile/diveeventitem.h
View file

@ -16,10 +16,10 @@ public:
void setVerticalAxis(DiveCartesianAxis *axis);
void setHorizontalAxis(DiveCartesianAxis *axis);
void setModel(DivePlotDataModel *model);
void recalculate();
private:
void setupToolTipString();
void setupPixmap();
void recalculatePos();
void setupPixmap();
DiveCartesianAxis *vAxis;
DiveCartesianAxis *hAxis;
DivePlotDataModel *dataModel;

33
qt-ui/profile/diveprofileitem.cpp
View file

@ -7,43 +7,43 @@
#include <QPainter>
#include <QLinearGradient>
DiveProfileItem::DiveProfileItem(): QObject(), QGraphicsPolygonItem(),
AbstractProfilePolygonItem::AbstractProfilePolygonItem(): QObject(), QGraphicsPolygonItem(),
hAxis(NULL), vAxis(NULL), dataModel(NULL), hDataColumn(-1), vDataColumn(-1)
{
}
void DiveProfileItem::setHorizontalAxis(DiveCartesianAxis* horizontal)
void AbstractProfilePolygonItem::setHorizontalAxis(DiveCartesianAxis* horizontal)
{
hAxis = horizontal;
modelDataChanged();
}
void DiveProfileItem::setHorizontalDataColumn(int column)
void AbstractProfilePolygonItem::setHorizontalDataColumn(int column)
{
hDataColumn = column;
modelDataChanged();
}
void DiveProfileItem::setModel(QAbstractTableModel* model)
void AbstractProfilePolygonItem::setModel(QAbstractTableModel* model)
{
dataModel = model;
modelDataChanged();
}
void DiveProfileItem::setVerticalAxis(DiveCartesianAxis* vertical)
void AbstractProfilePolygonItem::setVerticalAxis(DiveCartesianAxis* vertical)
{
vAxis = vertical;
modelDataChanged();
}
void DiveProfileItem::setVerticalDataColumn(int column)
void AbstractProfilePolygonItem::setVerticalDataColumn(int column)
{
vDataColumn = column;
modelDataChanged();
}
void DiveProfileItem::modelDataChanged()
void AbstractProfilePolygonItem::modelDataChanged()
{
// We don't have enougth data to calculate things, quit.
if (!hAxis || !vAxis || !dataModel || hDataColumn == -1 || vDataColumn == -1)
@ -62,13 +62,6 @@ void DiveProfileItem::modelDataChanged()
poly.append(point);
}
setPolygon(poly);
// This is the blueish gradient that the Depth Profile should have.
// It's a simple QLinearGradient with 2 stops, starting from top to bottom.
QLinearGradient pat(0, poly.boundingRect().top(), 0, poly.boundingRect().bottom());
pat.setColorAt(1, getColor(DEPTH_BOTTOM));
pat.setColorAt(0, getColor(DEPTH_TOP));
setBrush(QBrush(pat));
}
void DiveProfileItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) {
@ -92,3 +85,15 @@ void DiveProfileItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* o
painter->drawLine(polygon()[i-1],polygon()[i]);
}
}
void DiveProfileItem::modelDataChanged(){
AbstractProfilePolygonItem::modelDataChanged();
if(polygon().isEmpty())
return;
// This is the blueish gradient that the Depth Profile should have.
// It's a simple QLinearGradient with 2 stops, starting from top to bottom.
QLinearGradient pat(0, polygon().boundingRect().top(), 0, polygon().boundingRect().bottom());
pat.setColorAt(1, getColor(DEPTH_BOTTOM));
pat.setColorAt(0, getColor(DEPTH_TOP));
setBrush(QBrush(pat));
}

16
qt-ui/profile/diveprofileitem.h
View file

@ -21,22 +21,22 @@
class DiveCartesianAxis;
class QAbstractTableModel;
class DiveProfileItem : public QObject, public QGraphicsPolygonItem{
class AbstractProfilePolygonItem : public QObject, public QGraphicsPolygonItem{
Q_OBJECT
Q_PROPERTY(QPointF pos WRITE setPos READ pos)
Q_PROPERTY(qreal x WRITE setX READ x)
Q_PROPERTY(qreal y WRITE setY READ y)
public:
DiveProfileItem();
AbstractProfilePolygonItem();
void setVerticalAxis(DiveCartesianAxis *vertical);
void setHorizontalAxis(DiveCartesianAxis *horizontal);
void setModel(QAbstractTableModel *model);
void setHorizontalDataColumn(int column);
void setVerticalDataColumn(int column);
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) = 0;
public slots:
void modelDataChanged();
private:
virtual void modelDataChanged();
protected:
DiveCartesianAxis *hAxis;
DiveCartesianAxis *vAxis;
QAbstractTableModel *dataModel;
@ -44,5 +44,11 @@ private:
int vDataColumn;
};
class DiveProfileItem : public AbstractProfilePolygonItem{
Q_OBJECT
public:
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
virtual void modelDataChanged();
};
#endif