LoadPen, setSpeed, setScale and a bunch of cleanups...

1 files changed, 21 insertions, 2 deletions

diff --git a/src/outputwindow.h b/src/outputwindow.h
index 5f14099..d875b36 100644
--- a/src/outputwindow.h
+++ b/src/outputwindow.h
@@ -45,6 +45,12 @@ public:
 
   void stopScript();
 
+  void setSpeed(int s);
+  void setScale(double s);
+  void setColour(int r, int g, int b, int a);
+
+  void loadPen(QString file);
+
 public slots:
   void timeout();
   void reset();
@@ -53,13 +59,26 @@ protected:
   void paintEvent(QPaintEvent * event);
 
 private:
+  class ColLine {
+  public:
+    QColor colour;
+    QLine line;
+  };
   QImage kaiman;
   double x, y, r;
   QTimer timer;
   QSemaphore sem;
-  QVector<QPointF> points;
-
+  QVector<ColLine> lines;
+  QVector<QPointF> current_points;
+  QColor colour;
   volatile bool stop;
+
+  volatile int speed;
+
+  volatile bool loadpen;
+  QString penfile;
+
+  volatile float scale; 
 };
 
 #endif/*__KAIMAN_OUTPUTWINDOW_H__*/