Mandelbrot sample changes to use Thinker-Qt. (Submitted in a single diff for easy review on gitorious)

hostilefork · hostilefork · commit 458eb50b3163 · 2010-01-21T11:11:53.000-08:00
diff --git a/examples/mandelbrot/main.cpp b/examples/mandelbrot/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** Modified 2010 by HostileFork to use http://hostilefork.com/thinker-qt/
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -42,4 +42,4 @@ int main(int argc, char *argv[])
     MandelbrotWidget widget;
     widget.show();
     return app.exec();
-}
+}
diff --git a/examples/mandelbrot/mandelbrotwidget.cpp b/examples/mandelbrot/mandelbrotwidget.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** Modified 2010 by HostileFork to use http://hostilefork.com/thinker-qt/
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -54,9 +54,11 @@ MandelbrotWidget::MandelbrotWidget(QWidget *parent)
     pixmapScale = DefaultScale;
     curScale = DefaultScale;
 
-    qRegisterMetaType<QImage>("QImage");
-    connect(&thread, SIGNAL(renderedImage(const QImage &, double)),
-            this, SLOT(updatePixmap(const QImage &, double)));
+    for (int i = 0; i < ColormapSize; ++i)
+        colormap[i] = rgbFromWaveLength(380.0 + (i * 400.0 / ColormapSize));
+
+    connect(&watcher, SIGNAL(written()), this, SLOT(updatePixmap()));
+    watcher.setThrottleTime(400);
 
     setWindowTitle(tr("Mandelbrot"));
 #ifndef QT_NO_CURSOR
@@ -65,6 +67,21 @@ MandelbrotWidget::MandelbrotWidget(QWidget *parent)
     resize(550, 400);
 }
 
+MandelbrotWidget::~MandelbrotWidget()
+{
+    watcher.cancel();
+}
+
+void MandelbrotWidget::resetThinker(double centerX, double centerY,
+                double scaleFactor, QSize resultSize)
+{
+    watcher.cancel();
+
+    RenderThinker* thinker = new RenderThinker(centerX, centerY,
+                scaleFactor, resultSize, colormap);
+    watcher.setPresent(ThinkerQt::run(thinker));
+}
+
 void MandelbrotWidget::paintEvent(QPaintEvent * /* event */)
 {
     QPainter painter(this);
@@ -110,7 +127,7 @@ void MandelbrotWidget::paintEvent(QPaintEvent * /* event */)
 
 void MandelbrotWidget::resizeEvent(QResizeEvent * /* event */)
 {
-    thread.render(centerX, centerY, curScale, size());
+    resetThinker(centerX, centerY, curScale, size());
 }
 
 void MandelbrotWidget::keyPressEvent(QKeyEvent *event)
@@ -173,29 +190,70 @@ void MandelbrotWidget::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
-void MandelbrotWidget::updatePixmap(const QImage &image, double scaleFactor)
+void MandelbrotWidget::updatePixmap()
 {
     if (!lastDragPos.isNull())
         return;
 
-    pixmap = QPixmap::fromImage(image);
-    pixmapOffset = QPoint();
-    lastDragPos = QPoint();
-    pixmapScale = scaleFactor;
-    update();
+    RenderThinker::SnapshotPointer snap = watcher.createSnapshot();
+    if (snap->hasImage()) {
+        pixmap = QPixmap::fromImage(snap->getImage());
+        pixmapScale = snap->getScaleFactor();
+        snap.clear();
+        pixmapOffset = QPoint();
+        lastDragPos = QPoint();
+        update();
+    }
 }
 
 void MandelbrotWidget::zoom(double zoomFactor)
 {
     curScale *= zoomFactor;
     update();
-    thread.render(centerX, centerY, curScale, size());
+    resetThinker(centerX, centerY, curScale, size());
 }
 
 void MandelbrotWidget::scroll(int deltaX, int deltaY)
 {
     centerX += deltaX * curScale;
     centerY += deltaY * curScale;
     update();
-    thread.render(centerX, centerY, curScale, size());
-}
+    resetThinker(centerX, centerY, curScale, size());
+}
+
+uint MandelbrotWidget::rgbFromWaveLength(double wave)
+{
+    double r = 0.0;
+    double g = 0.0;
+    double b = 0.0;
+
+    if (wave >= 380.0 && wave <= 440.0) {
+        r = -1.0 * (wave - 440.0) / (440.0 - 380.0);
+        b = 1.0;
+    } else if (wave >= 440.0 && wave <= 490.0) {
+        g = (wave - 440.0) / (490.0 - 440.0);
+        b = 1.0;
+    } else if (wave >= 490.0 && wave <= 510.0) {
+        g = 1.0;
+        b = -1.0 * (wave - 510.0) / (510.0 - 490.0);
+    } else if (wave >= 510.0 && wave <= 580.0) {
+        r = (wave - 510.0) / (580.0 - 510.0);
+        g = 1.0;
+    } else if (wave >= 580.0 && wave <= 645.0) {
+        r = 1.0;
+        g = -1.0 * (wave - 645.0) / (645.0 - 580.0);
+    } else if (wave >= 645.0 && wave <= 780.0) {
+        r = 1.0;
+    }
+
+    double s = 1.0;
+    if (wave > 700.0)
+        s = 0.3 + 0.7 * (780.0 - wave) / (780.0 - 700.0);
+    else if (wave <  420.0)
+        s = 0.3 + 0.7 * (wave - 380.0) / (420.0 - 380.0);
+
+    r = pow(r * s, 0.8);
+    g = pow(g * s, 0.8);
+    b = pow(b * s, 0.8);
+    return qRgb(int(r * 255), int(g * 255), int(b * 255));
+}
diff --git a/examples/mandelbrot/mandelbrotwidget.h b/examples/mandelbrot/mandelbrotwidget.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** Modified 2010 by HostileFork to use http://hostilefork.com/thinker-qt/
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -37,6 +37,7 @@
 
 #include <QPixmap>
 #include <QWidget>
+#include "thinkerqt/thinkerqt.h"
 
 #include "renderthread.h"
 
@@ -46,6 +47,7 @@ class MandelbrotWidget : public QWidget
 
 public:
     MandelbrotWidget(QWidget *parent = 0);
+    ~MandelbrotWidget();
 
 protected:
     void paintEvent(QPaintEvent *event);
@@ -57,20 +59,25 @@ class MandelbrotWidget : public QWidget
     void mouseReleaseEvent(QMouseEvent *event);
 
 private slots:
-    void updatePixmap(const QImage &image, double scaleFactor);
+    void updatePixmap(); /* makes snapshot to get image & scaleFactor */
 
 private:
     void zoom(double zoomFactor);
     void scroll(int deltaX, int deltaY);
+    uint rgbFromWaveLength(double wave);
+
+    RenderThinker::PresentWatcher watcher;
+    void resetThinker(double centerX, double centerY, double scaleFactor,
+                QSize resultSize);
 
-    RenderThread thread;
     QPixmap pixmap;
     QPoint pixmapOffset;
     QPoint lastDragPos;
     double centerX;
     double centerY;
     double pixmapScale;
     double curScale;
+    Colormap colormap;
 };
 
 #endif
diff --git a/examples/mandelbrot/renderthread.cpp b/examples/mandelbrot/renderthread.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Toolkit.
+** Modified 2010 by HostileFork to use http://hostilefork.com/thinker-qt/
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -38,54 +38,18 @@
 
 #include "renderthread.h"
 
-RenderThread::RenderThread(QObject *parent)
-    : QThread(parent)
+RenderThinker::RenderThinker(double centerX, double centerY, double scaleFactor,
+                QSize resultSize, const Colormap& colormap)
+    : centerX (centerX),
+    centerY (centerY),
+    scaleFactor (scaleFactor),
+    resultSize (resultSize),
+    colormap (colormap)
 {
-    restart = false;
-    abort = false;
-
-    for (int i = 0; i < ColormapSize; ++i)
-        colormap[i] = rgbFromWaveLength(380.0 + (i * 400.0 / ColormapSize));
-}
-
-RenderThread::~RenderThread()
-{
-    mutex.lock();
-    abort = true;
-    condition.wakeOne();
-    mutex.unlock();
-
-    wait();
 }
 
-void RenderThread::render(double centerX, double centerY, double scaleFactor,
-                          QSize resultSize)
+void RenderThinker::start()
 {
-    QMutexLocker locker(&mutex);
-
-    this->centerX = centerX;
-    this->centerY = centerY;
-    this->scaleFactor = scaleFactor;
-    this->resultSize = resultSize;
-
-    if (!isRunning()) {
-        start(LowPriority);
-    } else {
-        restart = true;
-        condition.wakeOne();
-    }
-}
-
-void RenderThread::run()
-{
-    forever {
-        mutex.lock();
-        QSize resultSize = this->resultSize;
-        double scaleFactor = this->scaleFactor;
-        double centerX = this->centerX;
-        double centerY = this->centerY;
-        mutex.unlock();
-
         int halfWidth = resultSize.width() / 2;
         int halfHeight = resultSize.height() / 2;
         QImage image(resultSize, QImage::Format_RGB32);
@@ -98,9 +62,7 @@ void RenderThread::run()
             bool allBlack = true;
 
             for (int y = -halfHeight; y < halfHeight; ++y) {
-                if (restart)
-                    break;
-                if (abort)
+               if (wasPauseRequested())
                     return;
 
                 uint *scanLine =
@@ -139,53 +101,12 @@ void RenderThread::run()
             if (allBlack && pass == 0) {
                 pass = 4;
             } else {
-                if (!restart)
-                    emit renderedImage(image, scaleFactor);
+                lockForWrite();
+                writable().image = image;
+                writable().scaleFactor = scaleFactor;
+                unlock();
                 ++pass;
             }
         }
-
-        mutex.lock();
-        if (!restart)
-            condition.wait(&mutex);
-        restart = false;
-        mutex.unlock();
-    }
+        emit done();
 }
-
-uint RenderThread::rgbFromWaveLength(double wave)
-{
-    double r = 0.0;
-    double g = 0.0;
-    double b = 0.0;
-
-    if (wave >= 380.0 && wave <= 440.0) {
-        r = -1.0 * (wave - 440.0) / (440.0 - 380.0);
-        b = 1.0;
-    } else if (wave >= 440.0 && wave <= 490.0) {
-        g = (wave - 440.0) / (490.0 - 440.0);
-        b = 1.0;
-    } else if (wave >= 490.0 && wave <= 510.0) {
-        g = 1.0;
-        b = -1.0 * (wave - 510.0) / (510.0 - 490.0);
-    } else if (wave >= 510.0 && wave <= 580.0) {
-        r = (wave - 510.0) / (580.0 - 510.0);
-        g = 1.0;
-    } else if (wave >= 580.0 && wave <= 645.0) {
-        r = 1.0;
-        g = -1.0 * (wave - 645.0) / (645.0 - 580.0);
-    } else if (wave >= 645.0 && wave <= 780.0) {
-        r = 1.0;
-    }
-
-    double s = 1.0;
-    if (wave > 700.0)
-        s = 0.3 + 0.7 * (780.0 - wave) / (780.0 - 700.0);
-    else if (wave <  420.0)
-        s = 0.3 + 0.7 * (wave - 380.0) / (420.0 - 380.0);
-
-    r = pow(r * s, 0.8);
-    g = pow(g * s, 0.8);
-    b = pow(b * s, 0.8);
-    return qRgb(int(r * 255), int(g * 255), int(b * 255));
-}
diff --git a/examples/mandelbrot/renderthread.h b/examples/mandelbrot/renderthread.h

Original file line number	Original file line	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`** All rights reserved.`	`4`	`** All rights reserved.`
`5`	`** Contact: Nokia Corporation (qt-info@nokia.com)`	`5`	`** Contact: Nokia Corporation (qt-info@nokia.com)`
`6`	`**`	`6`	`**`
`7`	`-** This file is part of the examples of the Qt Toolkit.`	`7`	`+** Modified 2010 by HostileFork to use http://hostilefork.com/thinker-qt/`
`8`	`**`	`8`	`**`
`9`	`** $QT_BEGIN_LICENSE:LGPL$`	`9`	`** $QT_BEGIN_LICENSE:LGPL$`
`10`	`** No Commercial Usage`	`10`	`** No Commercial Usage`
`@@ -42,4 +42,4 @@ int main(int argc, char *argv[])`
`42`	`MandelbrotWidget widget;`	`42`	`MandelbrotWidget widget;`
`43`	`widget.show();`	`43`	`widget.show();`
`44`	`return app.exec();`	`44`	`return app.exec();`
`45`	`-}`	`45`	`+}`