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: DiveRuler compiles / not working yet.

Browse source 
This patch removes the GC macros and change the calling to use the
DiveCartesianAxis.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-02-27 14:59:41 -03:00 • committed by Dirk Hohndel
parent 52fe9101c8
commit 250653a67f
2 changed files with 47 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
qt-ui/profile/ruleritem.h
View file

@ -4,6 +4,7 @@
#include <QObject>
#include <QGraphicsEllipseItem>
#include <QGraphicsObject>
#include "divecartesianaxis.h"
struct plot_data;
class RulerItem2;
@ -13,7 +14,7 @@ class RulerNodeItem2 : public QObject, public QGraphicsEllipseItem
Q_OBJECT
friend class RulerItem2;
public:
explicit RulerNodeItem2(QGraphicsItem* parent);
explicit RulerNodeItem2();
void setRuler(RulerItem2 *r);
void recalculate();
@ -21,19 +22,21 @@ protected:
QVariant itemChange(GraphicsItemChange change, const QVariant & value );
private:
struct plot_info *pInfo;
struct plot_data *entry;
RulerItem2* ruler;
DiveCartesianAxis *timeAxis;
DiveCartesianAxis *depthAxis;
};
class RulerItem2 : public QGraphicsObject
{
Q_OBJECT
public:
explicit RulerItem2(QGraphicsItem* parent,
RulerNodeItem2 *sourceMarker,
RulerNodeItem2 *destMarker);
explicit RulerItem2();
void recalculate();
void setPlotInfo(struct plot_info *pInfo);
RulerNodeItem2* sourceNode() const;
RulerNodeItem2* destNode() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget * widget = 0);
@ -41,10 +44,13 @@ public:
QPainterPath shape() const;
private:
struct plot_info *pInfo;
QPointF startPoint, endPoint;
RulerNodeItem2 *source, *dest;
QString text;
int height;
int paint_direction;
DiveCartesianAxis *timeAxis;
DiveCartesianAxis *depthAxis;
};
#endif