simplified

[graphlib.git] / test / hello.cpp

diff --git a/test/hello.cpp b/test/hello.cpp
index 033253a..4143590 100644 (file)
--- a/test/hello.cpp
+++ b/test/hello.cpp
@@ -22,48 +22,119 @@
 
 
 #include <QApplication>
-#include <DrawingArea.h>
-#include <DrawingThread.h>
 #include <DrawingWindow.h>
 
 #include <iostream>
 
-int main_drawing_thread(DrawingArea &a)
+int flip(DrawingWindow &w)
 {
-    std::cout << "[ " << a.width() << " x " << a.height() << " ]\n";
+    std::cout << "[ " << w.width() << " x " << w.height() << " ]\n";
 
     int c = 0;
     int y = 0;
-    int h = a.height();
-    int w = a.width();
-    int count = 10;
+//     int h = w.height();
+//     int w = w.width();
+    int count = 50;//1 << 31;
     while (1) {
 //         std::cerr << "loooooooooooooooooooooop "
 //                   << y << " (" << c << ")\n";
-        a.setColor(c, c, c);
+        w.setColor(c, c, c);
         for (int yy = y; yy < y + 10; yy++)
-            for (int x = 0; x < w; x++)
-                a.drawPoint(x, yy);
-        if ((y += 10) >= h) {
+            for (int x = 0; x < w.width(); x++)
+                w.drawPoint(x, yy);
+        if ((y += 10) >= w.height()) {
             y = 0;
             c = !c;
             if (!--count) break;
-            std::cerr << "loooooooooooooooooooooop "
-                      << y << " (" << c << ")\n";
+//             std::cerr << "loooooooooooooooooooooop "
+//                       << y << " (" << c << ")\n";
         }
     }
     return 0;
 }
 
+int mandel(DrawingWindow &w)
+{
+    /* paramètres par défaut */
+    int larg = w.width();
+    int haut = w.height();
+    float Rmin = -2.05;
+    float Rmax = 0.55;
+    float Imin = -1.3;
+    float Imax = 1.3;
+
+    int maxiter = 100;
+
+    int x, y;                   /* le pixel considéré */
+    float cr, ci;               /* le complexe correspondant */
+    float zr, zi;               /* pour calculer la suite */
+    float zr2, zi2;
+    float pr, pi;               /* taille d'un pixel */
+    float rouge, vert, bleu;
+    int i;
+
+    pr = (Rmax - Rmin) / larg;
+    pi = (Imax - Imin) / haut;
+
+    cr = Rmin;
+    for (x = 0; x < larg; x++) {
+        ci = Imin;
+        for (y = 0; y < haut; y++) {
+            /* z_1 = c */
+            zr = cr;
+            zi = ci;
+            for (i = 1; i <= maxiter; i++) {
+                zr2 = zr * zr;
+                zi2 = zi * zi;
+                if (zr2 + zi2 >= 4) {
+                    /* |z| >= 2 : on sort de la boucle */
+                    break;
+                }
+                /* on calcule le z suivant */
+                zi = 2*zr*zi + ci;
+                zr = zr2 - zi2 + cr;
+            }
+                /* on est sorti trop tôt du for(...):
+                   on affiche le pixel d'un couleur en fonction 
+                   de i */
+                 if (i <= maxiter / 2) {
+                    /* entre rouge et vert */
+                    vert = (2.0 * i) / maxiter;
+                    rouge = 1.0 - vert;
+                    bleu = 0.0;
+                } else if (i <= maxiter) {
+                    /* entre vert et bleu */
+                    rouge = 0.0;
+                    bleu = (2.0 * i) / maxiter - 1.0;
+                    vert = 1.0 - bleu;
+                } else /* (i > maxiter) */
+                    rouge = vert = bleu = 0.0;
+                 w.setColor(rouge, vert, bleu);
+                 w.drawPoint(x, y);
+
+            ci += pi;
+        }
+        cr += pr;
+    }
+    return 0;
+}
+
 int main(int argc, char *argv[])
 {
+    const int nf = 1;
+    const int nm = 1;
+    const int w = 1000;
+    const int h = 700;
     QApplication application(argc, argv);
-    DrawingArea drawingArea(800, 600);
-    DrawingWindow drawingWindow(drawingArea);
-    DrawingThread drawingThread(drawingArea, main_drawing_thread);
+    DrawingWindow *dw[nf + nm];
+
+    for (int i = 0; i < nf; ++i)
+        dw[i] = new DrawingWindow(flip, w, h);
+    for (int i = nf; i < nf + nm; ++i)
+        dw[i] = new DrawingWindow(mandel, w, h);
 
-    drawingWindow.show();
-    drawingThread.start();
+    for (int i = 0; i < nf + nm; ++i)
+        dw[i]->show();
 
     return application.exec();
 }