X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/graphlib.git/blobdiff_plain/f41c1c8ff250f095b47fb6d5f7e578279b0c2844..6e5da99d46dc4139c3ccf56f3a858e809c9cfa42:/DrawingWindow.h

diff --git a/DrawingWindow.h b/DrawingWindow.h
index 7dd9bb7..73fdc26 100644
--- a/DrawingWindow.h
+++ b/DrawingWindow.h
@@ -1,29 +1,128 @@
 #ifndef DRAWING_WINDOW_H
 #define DRAWING_WINDOW_H
 
-#include "DrawingArea.h"
-#include <QPixmap>
-#include <QTimer>
+#include <QBasicTimer>
+#include <QColor>
+#include <QImage>
+#include <QMutex>
+#include <QPainter>
+#include <QPen>
+#include <QRect>
+#include <QWaitCondition>
 #include <QWidget>
+#include <Qt>
 
-class DrawingWindow: public QWidget {
-/*     Q_OBJECT */
+class DrawingThread;
 
+/*!
+ * Fenêtre de dessin.
+ *  
+ */
+class DrawingWindow: public QWidget {
 public:
-    DrawingWindow(DrawingArea &a);
-    DrawingWindow(QWidget *parent, DrawingArea &a);
-    DrawingWindow(QWidget *parent, Qt::WindowFlags flags, DrawingArea &a);
+    //! Type de la fonction de dessin, passée en paramètre de construction.
+    typedef void (*ThreadFunction)(DrawingWindow &);
+
+    //! Largeur par défaut de la fenêtre.
+    static const int DEFAULT_WIDTH = 640;
+    //! Hauteur par défaut de la fenêtre.
+    static const int DEFAULT_HEIGHT = 480;
+
+    DrawingWindow(ThreadFunction fun,
+                  int width_ = DEFAULT_WIDTH, int height_ = DEFAULT_HEIGHT);
+    DrawingWindow(QWidget *parent,
+                  ThreadFunction fun,
+                  int width_ = DEFAULT_WIDTH, int height_ = DEFAULT_HEIGHT);
+    DrawingWindow(QWidget *parent, Qt::WindowFlags flags,
+                  ThreadFunction fun,
+                  int width_ = DEFAULT_WIDTH, int height_ = DEFAULT_HEIGHT);
+
+    ~DrawingWindow();
+
+    //! Largeur de la fenêtre.
+    const int width;
+    //! Hauteur de la fenêtre.
+    const int height;
+
+    void setColor(unsigned int color);
+    void setColor(const char *name);
+    void setColor(float red, float green, float blue);
+
+    void setBgColor(unsigned int color);
+    void setBgColor(const char *name);
+    void setBgColor(float red, float green, float blue);
+
+    void clearGraph();
+
+    void drawPoint(int x, int y);
+    void drawLine(int x1, int y1, int x2, int y2);
+    void drawRect(int x1, int y1, int x2, int y2);
+    void fillRect(int x1, int y1, int x2, int y2);
+    void drawCircle(int x, int y, int r);
+    void fillCircle(int x, int y, int r);
+
+    void drawText(int x, int y, const char *text, int flags = 0);
+    void drawTextBg(int x, int y, const char *text, int flags = 0);
+
+    unsigned int getPointColor(int x, int y);
+
+    bool sync(unsigned long time = ULONG_MAX);
+
+    void closeGraph();
+
+    void sleep(unsigned long secs);
+    void msleep(unsigned long msecs);
+    void usleep(unsigned long usecs);
 
 protected:
+    void closeEvent(QCloseEvent *ev);
+    void customEvent(QEvent *ev);
+    void keyPressEvent(QKeyEvent *ev);
     void paintEvent(QPaintEvent *ev);
+    void showEvent(QShowEvent *ev);
     void timerEvent(QTimerEvent *ev);
 
 private:
-    DrawingArea &drawingArea;
-    QPixmap pixmap;
+    //! Intervalle de temps entre deux rendus (ms)
+    static const int paintInterval = 33;
+
     QBasicTimer timer;
+    QMutex imageMutex;
+    QMutex syncMutex;
+    QWaitCondition syncCondition;
+    bool terminateThread;
+    int lockCount;
+
+    QImage *image;
+    QPainter *painter;
+
+    bool dirtyFlag;
+    QRect dirtyRect;
 
-    void initialize();
+    DrawingThread *thread;
+
+    void initialize(ThreadFunction fun);
+
+    void setColor(const QColor& color);
+    void setBgColor(const QColor& color);
+    QColor getColor();
+    QColor getBgColor();
+
+    void safeLock(QMutex &mutex);
+    void safeUnlock(QMutex &mutex);
+
+    void dirty();
+    void dirty(int x, int y);
+    void dirty(int x1, int y1, int x2, int y2);
+    void dirty(const QRect &rect);
+
+    void mayUpdate();
+    void realSync();
+    void realDrawText(int x, int y, const char *text, int flags);
 };
 
 #endif // !DRAWING_WINDOW_H
+
+// Local variables:
+// mode: c++
+// End: