X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=blobdiff_plain;f=xulapp%2Fchrome%2Fmandelbrot%2Fcontent%2Fmandelbrot.js;h=837c0f262e233294d8a7d45ab52a389aded631d8;hp=440911348f03d47ef5c8628c08776b28aeb5611e;hb=6e98af87f333055b6896606602bacef3bb73c547;hpb=8444612af15f939b804d6051d08cfa1419fa29bd;ds=sidebyside

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js
index 4409113..837c0f2 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.js
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js
@@ -1,9 +1,23 @@
-var gColorPalette = getColorPalette('kairo');
+var gColorPalette = [];
+var gPref = Components.classes["@mozilla.org/preferences-service;1"]
+                      .getService(Components.interfaces.nsIPrefService)
+                      .getBranch(null);
+var gStartTime = 0;
+
+function Startup() {
+  updateIterMenu();
+  updatePaletteMenu();
+  document.getElementById("statusLabel").value =
+      document.getElementById("mbrotBundle").getString("statusEmpty");
+}
 
 function drawImage() {
-  var canvas = document.getElementById("mbrotImage");
+  let canvas = document.getElementById("mbrotImage");
   if (canvas.getContext) {
-    var context = canvas.getContext("2d");
+    let context = canvas.getContext("2d");
+
+    document.getElementById("statusLabel").value =
+        document.getElementById("mbrotBundle").getString("statusDrawing");
 
     // example:
     // context.fillStyle = "rgb(200,0,0)";
@@ -12,26 +26,37 @@ function drawImage() {
     // context.fillStyle = "rgba(0, 0, 200, 0.5)";
     // context.fillRect (30, 30, 55, 50);
 
-    var Cr_min = -2.0;
-    var Cr_max = 1.0;
-    var Cr_scale = Cr_max - Cr_min;
+    let Cr_min = -2.0;
+    let Cr_max = 1.0;
+    let Cr_scale = Cr_max - Cr_min;
+
+    let Ci_min = -1.5;
+    let Ci_max = 1.5;
+    let Ci_scale = Ci_max - Ci_min;
 
-    var Ci_min = -1.5;
-    var Ci_max = 1.5;
-    var Ci_scale = Ci_max - Ci_min;
+    let iterMax = gPref.getIntPref("mandelbrot.iteration_max");
+    let algorithm = gPref.getCharPref("mandelbrot.use_algorithm");
 
-    var iterMax = 500;
+    gStartTime = new Date();
 
-    for (var img_x = 0; img_x < canvas.width; img_x++) {
-      for (var img_y = 0; img_y < canvas.height; img_y++) {
-        var C = new complex(Cr_min + (img_x / canvas.width) * Cr_scale,
+    for (let img_x = 0; img_x < canvas.width; img_x++) {
+      for (let img_y = 0; img_y < canvas.height; img_y++) {
+        let C = new complex(Cr_min + (img_x / canvas.width) * Cr_scale,
                             Ci_min + (img_y / canvas.height) * Ci_scale);
-        window.setTimeout(drawPoint, 0, context, img_x, img_y, C, iterMax);
+        window.setTimeout(drawPoint, 0, context, img_x, img_y, C, iterMax, algorithm);
       }
     }
+    window.setTimeout(EndCalc, 0);
   }
 }
 
+function EndCalc() {
+  let endTime = new Date();
+  let timeUsed = (endTime.getTime() - gStartTime.getTime()) / 1000;
+  document.getElementById("statusLabel").value =
+      document.getElementById("mbrotBundle").getFormattedString("statusTime", [timeUsed.toFixed(3)]);
+}
+
 function complex(aReal, aImag) {
   this.r = aReal;
   this.i = aImag;
@@ -47,16 +72,18 @@ function complex(aReal, aImag) {
   }
 }
 
-function mandelbrotValue (aC, aIterMax) {
-  /* XXX: this would be nice code but it looks like JS objects are too heavy for this.
+function mandelbrotValueOO (aC, aIterMax) {
+  // this would be nice code in general but it looks like JS objects are too heavy for normal use.
   let Z = new complex(0.0, 0.0);
   for (var iter = 0; iter < aIterMax; iter++) {
     Z = Z.square().add(aC);
     if (Z.r * Z.r + Z.i * Z.i > 256) { break; }
   }
-  */
+  return iter;
+}
 
-  // highly optimized code for fast calculation
+function mandelbrotValueNumeric (aC, aIterMax) {
+  // optimized numeric code for fast calculation
   let Cr = aC.r, Ci = aC.i;
   let Zr = 0.0, Zi = 0.0;
   let Zr2 = Zr * Zr, Zi2 = Zi * Zi;
@@ -71,63 +98,63 @@ function mandelbrotValue (aC, aIterMax) {
 }
 
 function getColor(aIterValue, aIterMax) {
-  var standardizedValue = Math.round(aIterValue * 1024 / aIterMax);
-  return gColorPalette[standardizedValue];
-  if (aIterValue == aIterMax) {
+  let standardizedValue = Math.round(aIterValue * 1024 / aIterMax);
+  if (gColorPalette && gColorPalette.length)
+    return gColorPalette[standardizedValue];
+
+  // fallback to simple b/w if for some reason we don't have a palette
+  if (aIterValue == aIterMax)
     return "rgb(0,0,0)";
-  }
-  else {
-    //return "rgb(" + img_x + "," + img_y + ",0)";
+  else
     return "rgb(255,255,255)";
-  }
 }
 
 function getColorPalette(palName) {
   var palette = [];
   switch (palName) {
     case 'bw':
-      for (var i = 0; i < 1024; i++) {
+      for (let i = 0; i < 1024; i++) {
         palette[i] = 'rgb(255,255,255)';
       }
       palette[1024] = 'rgb(0,0,0)';
       break;
     case 'kairo':
       // outer areas
-      for (var i = 0; i < 32; i++) {
-        var cc1 = Math.floor(i * 127 / 31);
-        var cc2 = 170 - Math.floor(i * 43 / 31);
+      for (let i = 0; i < 32; i++) {
+        let cc1 = Math.floor(i * 127 / 31);
+        let cc2 = 170 - Math.floor(i * 43 / 31);
         palette[i] = 'rgb(' + cc1 + ',' + cc2 + ',' + cc1 + ')';
       }
       // inner areas
-      for (var i = 0; i < 51; i++) {
-        var cc = Math.floor(i * 170 / 50);
+      for (let i = 0; i < 51; i++) {
+        let cc = Math.floor(i * 170 / 50);
         palette[32 + i] = 'rgb(' + cc + ',0,' + (170 + cc) + ')';
       }
       // corona
-      for (var i = 0; i < 101; i++) {
-        var cc = Math.floor(i * 200 / 100);
+      for (let i = 0; i < 101; i++) {
+        let cc = Math.floor(i * 200 / 100);
         palette[83 + i] = 'rgb(255,' + cc + ',0)';
       }
       // inner corona
-      for (var i = 0; i < 201; i++) {
-        var cc1 = 255 - Math.floor(i * 85 / 200);
-        var cc2 = 200 - Math.floor(i * 30 / 200);
-        var cc3 = Math.floor(i * 170 / 200);
+      for (let i = 0; i < 201; i++) {
+        let cc1 = 255 - Math.floor(i * 85 / 200);
+        let cc2 = 200 - Math.floor(i * 30 / 200);
+        let cc3 = Math.floor(i * 170 / 200);
         palette[184 + i] = 'rgb(' + cc1 + ',' + cc2 + ',' + cc3 + ')';
       }
-      for (var i = 0; i < 301; i++) {
-        var cc1 = 170 - Math.floor(i * 43 / 300);
-        var cc2 = 170 + Math.floor(i * 85 / 300);
+      for (let i = 0; i < 301; i++) {
+        let cc1 = 170 - Math.floor(i * 43 / 300);
+        let cc2 = 170 + Math.floor(i * 85 / 300);
         palette[385 + i] = 'rgb(' + cc1 + ',' + cc1 + ',' + cc2 + ')';
       }
-      for (var i = 0; i < 338; i++) {
-        var cc = 127 + Math.floor(i * 128 / 337);
+      for (let i = 0; i < 338; i++) {
+        let cc = 127 + Math.floor(i * 128 / 337);
         palette[686 + i] = 'rgb(' + cc + ',' + cc + ',255)';
       }
       palette[1024] = 'rgb(0,0,0)';
       break;
     case 'rainbow-linear1':
-      for (var i = 0; i < 256; i++) {
+      for (let i = 0; i < 256; i++) {
         palette[i] = 'rgb(' + i + ',0,0)';
         palette[256 + i] = 'rgb(255,' + i + ',0)';
         palette[512 + i] = 'rgb(' + (255 - i) + ',255,' + i + ')';
@@ -197,17 +224,132 @@ Case 5  'Regenbogen-Palette 2 (qu.)
   return palette;
 }
 
-function drawPoint(context, img_x, img_y, C, iterMax) {
-  var itVal = mandelbrotValue(C, iterMax);
+function drawPoint(context, img_x, img_y, C, iterMax, algorithm) {
+  var itVal;
+  switch (algorithm) {
+    case 'oo':
+      itVal = mandelbrotValueOO(C, iterMax);
+      break;
+    case 'numeric':
+    default:
+      itVal = mandelbrotValueNumeric(C, iterMax);
+      break;
+  }
   context.fillStyle = getColor(itVal, iterMax);
   context.fillRect (img_x, img_y, 1, 1); // x, y, width, height
 }
 
+/***** pure UI functions *****/
+
 function saveImage() {
-  // should call filepicker!
+  // XXX: should call filepicker!
   saveCanvas(document.getElementById("mbrotImage"), "/home/robert/temp/canvas-save.png")
 }
 
+function updateIterMenu() {
+  try {
+    var currentIter = gPref.getIntPref("mandelbrot.iteration_max");
+  }
+  catch(e) {
+    var currentIter = 0;
+  }
+  if (currentIter < 10) {
+    currentIter = 500;
+    setIter(currentIter);
+  }
+
+  var popup = document.getElementById("menu_iterPopup");
+  var item = popup.firstChild;
+  while (item) {
+    if (item.getAttribute("name") == "iter") {
+      if (item.getAttribute("value") == currentIter)
+        item.setAttribute("checked","true");
+      else
+        item.removeAttribute("checked");
+    }
+    item = item.nextSibling;
+  }
+}
+
+function setIter(aIter) {
+  gPref.setIntPref("mandelbrot.iteration_max", aIter);
+}
+
+function updatePaletteMenu() {
+  try {
+    var currentPalette = gPref.getCharPref("mandelbrot.color_palette");
+  }
+  catch(e) {
+    var currentPalette = '';
+  }
+  if (!currentPalette.length) {
+    currentPalette = 'kairo';
+    setPalette(currentPalette);
+  }
+  if (!gColorPalette || !gColorPalette.length)
+    gColorPalette = getColorPalette(currentPalette);
+
+  var popup = document.getElementById("menu_palettePopup");
+  var item = popup.firstChild;
+  while (item) {
+    if (item.getAttribute("name") == "palette") {
+      if (item.getAttribute("value") == currentPalette)
+        item.setAttribute("checked", "true");
+      else
+        item.removeAttribute("checked");
+    }
+    item = item.nextSibling;
+  }
+}
+
+function setPalette(aPaletteID) {
+  gPref.setCharPref("mandelbrot.color_palette", aPaletteID);
+  gColorPalette = getColorPalette(aPaletteID);
+}
+
+function updateDebugMenu() {
+  var jitMenuItem = document.getElementById("jitEnabled");
+  jitMenuItem.setAttribute("checked", gPref.getBoolPref("javascript.options.jit.chrome"));
+}
+
+function toggleJITState(jitMenuItem) {
+  var jitEnabled = !gPref.getBoolPref("javascript.options.jit.chrome");
+  gPref.setBoolPref("javascript.options.jit.chrome", jitEnabled)
+  jitMenuItem.setAttribute("checked", jitEnabled? "true" : "false");
+}
+
+function updateAlgoMenu() {
+  try {
+    var currentAlgo = gPref.getCharPref("mandelbrot.use_algorithm");
+  }
+  catch(e) {
+    var currentAlgo = '';
+  }
+  if (!currentAlgo.length) {
+    currentAlgo = 'numeric';
+    setAlgorithm(currentAlgo);
+  }
+
+  var popup = document.getElementById("menu_algoPopup");
+  var item = popup.firstChild;
+  while (item) {
+    if (item.getAttribute("name") == "algorithm") {
+      if (item.getAttribute("value") == currentAlgo)
+        item.setAttribute("checked", "true");
+      else
+        item.removeAttribute("checked");
+    }
+    item = item.nextSibling;
+  }
+}
+
+function setAlgorithm(algoID) {
+  gPref.setCharPref("mandelbrot.use_algorithm", algoID);
+}
+
+
+/***** helper functions from external sources *****/
+
 // function below is from from http://developer.mozilla.org/en/docs/Code_snippets:Canvas
 function saveCanvas(canvas, destFile) {
   // convert string filepath to an nsIFile