Add graph animation; support for line graphs

[harbour-pedalo.git] / src / graph.h

diff --git a/src/graph.h b/src/graph.h
index 269f37d..704eb0c 100644 (file)
--- a/src/graph.h
+++ b/src/graph.h
@@ -7,7 +7,8 @@
 class Graph : public QQuickPaintedItem
 {
     Q_OBJECT
-    Q_PROPERTY(QList<float> model READ getModel WRITE setModel NOTIFY modelChanged)
+    Q_PROPERTY(QList<float> bardata READ getBarData WRITE setBarData NOTIFY barDataChanged)
+    Q_PROPERTY(QList<float> linedata READ getLineData WRITE setLineData NOTIFY lineDataChanged)
     Q_PROPERTY(QStringList labelsx READ getLabelsx WRITE setLabelsx NOTIFY labelsxChanged)
     Q_PROPERTY(QStringList labelsy READ getLabelsy WRITE setLabelsy NOTIFY labelsyChanged)
     Q_PROPERTY(QColor primary READ getPrimary WRITE setPrimary NOTIFY primaryChanged)
@@ -27,8 +28,10 @@ public:
         Graph(QQuickItem *parent = 0);
         void paint(QPainter *painter);
 
-        QList<float> getModel() const;
-        void setModel(QList<float> value);
+        QList<float> getBarData() const;
+        void setBarData(QList<float> value);
+        QList<float> getLineData() const;
+        void setLineData(QList<float> value);
         QStringList getLabelsx() const;
         void setLabelsx(QStringList value);
         QStringList getLabelsy() const;
@@ -55,7 +58,8 @@ public:
         void setAnimate(float value);
 
     private:
-        QList<float> model;
+        QList<float> bardata;
+        QList<float> linedata;
         QStringList labelsx;
         QStringList labelsy;
         QColor primary;
@@ -63,9 +67,8 @@ public:
         QColor highlight;
         float axisThickness;
         int bars;
+        int points;
         float gap;
-        float minmodel;
-        float maxmodel;
         float miny;
         float maxy;
         float stepy;
@@ -74,7 +77,8 @@ public:
         float animate;
 
     signals:
-        void modelChanged();
+        void barDataChanged();
+        void lineDataChanged();
         void labelsxChanged();
         void labelsyChanged();
         void primaryChanged(QColor primary);