X-Git-Url: https://git-public.kairo.at/?p=mandelbrot.git;a=blobdiff_plain;f=xulapp%2Fchrome%2Fmandelbrot%2Fcontent%2Fmandelbrot.js;h=0a4a31aeeb64a771a9ea20466ccb6ffe07f481a9;hp=5533f22e7a88950b89b973b82ccb8da5307bb4d4;hb=3e3d9a1d1c51a41435682714a8d601bf641629b5;hpb=474b436c32a22fe875097a3cc6bc61fb4823ddf1

diff --git a/xulapp/chrome/mandelbrot/content/mandelbrot.js b/xulapp/chrome/mandelbrot/content/mandelbrot.js
index 5533f22..0a4a31a 100644
--- a/xulapp/chrome/mandelbrot/content/mandelbrot.js
+++ b/xulapp/chrome/mandelbrot/content/mandelbrot.js
@@ -15,11 +15,13 @@
  *
  * The Initial Developer of the Original Code is
  * Robert Kaiser <kairo@kairo.at>.
- * Portions created by the Initial Developer are Copyright (C) 2008
+ * Portions created by the Initial Developer are Copyright (C) 2008-2011
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
  *   Robert Kaiser <kairo@kairo.at>
+ *   prefiks (patch for some speedups)
+ *   Boris Zbarsky <bzbarsky@mit.edu> (use imageData for canvas interaction)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -188,14 +190,21 @@ function drawLine(line, dimensions, canvas, context, iterMax, algorithm) {
   let Ci_max = dimensions[3];
   let Ci_scale = Ci_max - Ci_min;
 
-  let pixels = [];
+  let lines = Math.min(canvas.height - line, 8);
+  let imageData = context.createImageData(canvas.width, lines);
+  let pixels = imageData.data;
+  let idx = 0;
   for (var img_y = line; img_y < canvas.height && img_y < line+8; img_y++)
     for (let img_x = 0; img_x < canvas.width; img_x++) {
       let C = new complex(Cr_min + (img_x / canvas.width) * Cr_scale,
                           Ci_min + (img_y / canvas.height) * Ci_scale);
-      pixels.push.apply(pixels, drawPoint(context, img_x, img_y, C, iterMax, algorithm));
+      let colors = drawPoint(context, img_x, img_y, C, iterMax, algorithm);
+      pixels[idx++] = colors[0];
+      pixels[idx++] = colors[1];
+      pixels[idx++] = colors[2];
+      pixels[idx++] = colors[3];
     }
-  context.putImageData({width: canvas.width, height: pixels.length/4/canvas.width, data: pixels}, 0, line);
+  context.putImageData(imageData, 0, line);
 
   if (img_y < canvas.height)
     setTimeout(drawLine, 0, img_y, dimensions, canvas, context, iterMax, algorithm);
@@ -433,24 +442,17 @@ function mouseevent(etype, event) {
         if (zoomend.y < zoomstart.y)
           [zoomend.y, zoomstart.y] = [zoomstart.y, zoomend.y];
 
-        let prompts = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                .getService(Components.interfaces.nsIPromptService);
-        let ok = prompts.confirm(null, gMbrotBundle.getString("zoomConfirmTitle"),
-                                 gMbrotBundle.getString("zoomConfirmLabel"));
-        // ok is now true if OK was clicked, and false if cancel was clicked
-        if (ok) {
-          // determine new "coordinates"
-          let CWidth = gCurrentImageData.C_max.r - gCurrentImageData.C_min.r;
-          let CHeight = gCurrentImageData.C_max.i - gCurrentImageData.C_min.i;
-          let newC_min = new complex(
-              gCurrentImageData.C_min.r + zoomstart.x / gCurrentImageData.iWidth * CWidth,
-              gCurrentImageData.C_min.i + zoomstart.y / gCurrentImageData.iHeight * CHeight);
-          let newC_max = new complex(
-              gCurrentImageData.C_min.r + zoomend.x / gCurrentImageData.iWidth * CWidth,
-              gCurrentImageData.C_min.i + zoomend.y / gCurrentImageData.iHeight * CHeight);
-
-          adjustCoordsAndDraw(newC_min, newC_max);
-        }
+        // determine new "coordinates"
+        let CWidth = gCurrentImageData.C_max.r - gCurrentImageData.C_min.r;
+        let CHeight = gCurrentImageData.C_max.i - gCurrentImageData.C_min.i;
+        let newC_min = new complex(
+            gCurrentImageData.C_min.r + zoomstart.x / gCurrentImageData.iWidth * CWidth,
+            gCurrentImageData.C_min.i + zoomstart.y / gCurrentImageData.iHeight * CHeight);
+        let newC_max = new complex(
+            gCurrentImageData.C_min.r + zoomend.x / gCurrentImageData.iWidth * CWidth,
+            gCurrentImageData.C_min.i + zoomend.y / gCurrentImageData.iHeight * CHeight);
+
+        adjustCoordsAndDraw(newC_min, newC_max);
       }
       zoomstart = undefined;
       break;
@@ -674,18 +676,32 @@ function setPalette(aPaletteID) {
 }
 
 function imgSettings() {
-  window.openDialog("chrome://mandelbrot/content/image-settings.xul");
+  let anchor = null;
+  let position = "before_start";
+  if (document.getElementById("mandelbrotWindow").nodeName == "page") {
+    anchor = document.getElementById("mandelbrotToolbar");
+  }
+  else {
+    anchor = document.getElementById("mandelbrotMenubar");
+    position = "after_start";
+  }
+  document.getElementById("imgSettingsPanel").showPopup(anchor, position);
 }
 
 function updateDebugMenu() {
-  var jitMenuItem = document.getElementById("jitEnabled");
-  jitMenuItem.setAttribute("checked", gPref.getBoolPref("javascript.options.jit.chrome"));
+  let scope = (document.getElementById("mandelbrotWindow").nodeName == "page") ? "content" : "chrome";
+  for each (let type in ["tracejit", "methodjit"]) {
+    let jitMenuItem = document.getElementById(type + "Enabled");
+    jitMenuItem.setAttribute("checked", gPref.getBoolPref("javascript.options." + type + "." + scope));
+  }
 }
 
-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 toggleJITState(jitMenuItem, jittype) {
+  let scope = (document.getElementById("mandelbrotWindow").nodeName == "page") ? "content" : "chrome";
+  let jitpref = "javascript.options." + jittype + "jit." + scope;
+  let jitEnabled = !gPref.getBoolPref(jitpref);
+  gPref.setBoolPref(jitpref, jitEnabled)
+  jitMenuItem.setAttribute("checked", jitEnabled ? "true" : "false");
 }
 
 function updateAlgoMenu() {
@@ -739,6 +755,152 @@ function errorConsole() {
   toOpenWindowByType("global:console", "chrome://global/content/console.xul");
 }
 
+function initImgSettings() {
+  // Get values from prefs.
+  for each (let coord in ["Cr_min", "Cr_max", "Ci_min", "Ci_max"]) {
+    document.getElementById("is_" + coord).value =
+        roundCoord(parseFloat(gPref.getCharPref("mandelbrot.last_image." + coord)));
+  }
+  for each (let dim in ["width", "height"]) {
+    document.getElementById("is_img_" + dim).value =
+        gPref.getIntPref("mandelbrot.image." + dim);
+  }
+  document.getElementById("is_syncProp").checked =
+        gPref.getBoolPref("mandelbrot.syncProportions");
+
+  // Calculate scales.
+  recalcCoord("Cr", "scale");
+  recalcCoord("Ci", "scale");
+
+  // Clear the preview.
+  let canvas = document.getElementById("is_mbrotPreview");
+  let context = canvas.getContext("2d");
+  context.fillStyle = "rgba(255, 255, 255, 127)";
+  context.fillRect(0, 0, canvas.width, canvas.height);
+}
+
+function closeImgSettings() {
+  // Hide popup, which will automatically make a call to save values.
+  document.getElementById("imgSettingsPanel").hidePopup();
+}
+
+function saveImgSettings() {
+  // Get values to prefs.
+  for each (let coord in ["Cr_min", "Cr_max", "Ci_min", "Ci_max"]) {
+    gPref.setCharPref("mandelbrot.last_image." + coord,
+                      document.getElementById("is_" + coord).value);
+  }
+  for each (let dim in ["width", "height"]) {
+    gPref.setIntPref("mandelbrot.image." + dim,
+                     document.getElementById("is_img_" + dim).value);
+  }
+  gPref.setBoolPref("mandelbrot.syncProportions",
+                    document.getElementById("is_syncProp").checked);
+}
+
+function checkISValue(textbox, type) {
+  if (type == "coord") {
+    textbox.value = roundCoord(parseFloat(textbox.value));
+  }
+  else if (type == "dim") {
+    textbox.value = parseInt(textbox.value);
+  }
+}
+
+function drawPreview() {
+  let canvas = document.getElementById("is_mbrotPreview");
+  let context = canvas.getContext("2d");
+
+  if (document.getElementById("is_img_width").value /
+      document.getElementById("is_img_height").value
+        < 80 / 50) {
+    canvas.height = 50;
+    canvas.width = canvas.height *
+      document.getElementById("is_img_width").value /
+      document.getElementById("is_img_height").value;
+  }
+  else {
+    canvas.width = 80;
+    canvas.height = canvas.width *
+      document.getElementById("is_imgHeight").value /
+      document.getElementById("is_imgWidth").value;
+  }
+
+  let Cr_min = parseFloat(document.getElementById("is_Cr_min").value);
+  let Cr_max = parseFloat(document.getElementById("is_Cr_max").value);
+  if ((Cr_min < -2) || (Cr_min > 2) ||
+      (Cr_max < -2) || (Cr_max > 2) || (Cr_min >= Cr_max)) {
+    Cr_min = -2.0; Cr_max = 1.0;
+  }
+
+  let Ci_min = parseFloat(document.getElementById("is_Ci_min").value);
+  let Ci_max = parseFloat(document.getElementById("is_Ci_max").value);
+  if ((Ci_min < -2) || (Ci_min > 2) ||
+      (Ci_max < -2) || (Ci_max > 2) || (Ci_min >= Ci_max)) {
+    Ci_min = -2.0; Ci_max = 1.0;
+  }
+
+  let iterMax = gPref.getIntPref("mandelbrot.iteration_max");
+  let algorithm = gPref.getCharPref("mandelbrot.use_algorithm");
+
+  context.fillStyle = "rgba(255, 255, 255, 127)";
+  context.fillRect(0, 0, canvas.width, canvas.height);
+
+  try {
+    var currentPalette = gPref.getCharPref("mandelbrot.color_palette");
+  }
+  catch(e) {
+    var currentPalette = "";
+  }
+  if (!currentPalette.length) {
+    currentPalette = "kairo";
+  }
+  gColorPalette = getColorPalette(currentPalette);
+
+  drawLine(0, [Cr_min, Cr_max, Ci_min, Ci_max],
+              canvas, context, iterMax, algorithm);
+}
+
+function recalcCoord(coord, target) {
+  let othercoord = (coord == "Ci") ? "Cr" : "Ci";
+  let owndim = (coord == "Ci") ? "height" : "width";
+  let otherdim = (coord == "Ci") ? "width" : "height";
+  if (target == "scale") {
+    var myscale =
+      parseFloat(document.getElementById("is_" + coord + "_max").value) -
+      parseFloat(document.getElementById("is_" + coord + "_min").value);
+    document.getElementById("is_" + coord + "_scale").value = roundCoord(myscale);
+  }
+  else if (target == 'max') {
+    let mymax =
+      parseFloat(document.getElementById("is_" + coord + "_min").value) +
+      parseFloat(document.getElementById("is_" + coord + "_scale").value);
+    document.getElementById("is_" + coord + "_max").value = roundCoord(mymax);
+    var myscale = document.getElementById("is_" + coord + "_scale").value;
+  }
+  if (document.getElementById("is_syncProp").checked) {
+    let otherscale = myscale *
+      document.getElementById("is_img_" + otherdim).value /
+      document.getElementById("is_img_" + owndim).value;
+    document.getElementById("is_" + othercoord + "_scale").value = roundCoord(otherscale);
+    let othermax =
+      parseFloat(document.getElementById("is_" + othercoord + "_min").value) +
+      parseFloat(document.getElementById("is_" + othercoord + "_scale").value);
+    document.getElementById("is_" + othercoord + "_max").value = roundCoord(othermax);
+  }
+}
+
+function checkProportions() {
+  if (!document.getElementById("is_syncProp").checked) {
+    recalcCoord("Cr", "scale");
+  }
+}
+
+function roundCoord(floatval) {
+  // We should round to 10 decimals here or so
+  return parseFloat(floatval.toFixed(10));
+}
+
 /***** helper functions from external sources *****/
 
 // function below is based on http://developer.mozilla.org/en/docs/Code_snippets:Canvas