add an option for synching proportions and implement it (mostly)

diff --git a/xulapp/chrome/mandelbrot/content/image-settings.js b/xulapp/chrome/mandelbrot/content/image-settings.js
index a907f5a20bf677a820a4350f3c40b43f88d18a2d..3b1943420bc4cb49c802e708ab8eb55366e606bb 100644 (file)
--- a/xulapp/chrome/mandelbrot/content/image-settings.js
+++ b/xulapp/chrome/mandelbrot/content/image-settings.js
@@ -46,6 +46,21 @@ function drawPreview() {
   let canvas = document.getElementById("mbrotPreview");
   let context = canvas.getContext("2d");
 
+  if (document.getElementById("imgWidth").value /
+      document.getElementById("imgHeight").value
+        < 80 / 50) {
+    canvas.height = 50;
+    canvas.width = canvas.height *
+      document.getElementById("imgWidth").value /
+      document.getElementById("imgHeight").value;
+  }
+  else {
+    canvas.width = 80;
+    canvas.height = canvas.width *
+      document.getElementById("imgHeight").value /
+      document.getElementById("imgWidth").value;
+  }
+
   let Cr_min = parseFloat(document.getElementById("Cr_min").value);
   let Cr_max = parseFloat(document.getElementById("Cr_max").value);
   if ((Cr_min < -2) || (Cr_min > 2) ||
@@ -82,14 +97,41 @@ function drawPreview() {
 }
 
 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') {
-    document.getElementById(coord + '_scale').value =
+    var myscale =
       parseFloat(document.getElementById(coord + '_max').value) -
       parseFloat(document.getElementById(coord + '_min').value);
+    document.getElementById(coord + '_scale').value = roundCoord(myscale);
   }
   else if (target == 'max') {
-    document.getElementById('mandelbrot.last_image.' + coord + '_max').value =
+    let mymax =
       parseFloat(document.getElementById(coord + '_min').value) +
       parseFloat(document.getElementById(coord + '_scale').value);
+    document.getElementById('mandelbrot.last_image.' + coord + '_max').value = roundCoord(mymax);
+    var myscale = document.getElementById(coord + '_scale').value;
   }
+  if (document.getElementById('syncProp').checked) {
+    let otherscale = myscale *
+      document.getElementById('mandelbrot.image.' + otherdim).value /
+      document.getElementById('mandelbrot.image.' + owndim).value;
+    document.getElementById(othercoord + '_scale').value = roundCoord(otherscale);
+    let othermax =
+      parseFloat(document.getElementById(othercoord + '_min').value) +
+      parseFloat(document.getElementById(othercoord + '_scale').value);
+    document.getElementById('mandelbrot.last_image.' + othercoord + '_max').value = roundCoord(othermax);
+  }
+}
+
+function checkProportions() {
+  if (!document.getElementById('syncProp').checked) {
+    recalcCoord('Cr', 'scale');
+  }
+}
+
+function roundCoord(floatval) {
+  // We should round to 10 decimals here or so
+  return floatval;
 }
\ No newline at end of file

diff --git a/xulapp/chrome/mandelbrot/content/image-settings.xul b/xulapp/chrome/mandelbrot/content/image-settings.xul
index c4c609222702b36f5d63dc173deac99286ab6026..752fcef8c9d0ba715ad9a5ff0df911be1fa3aeff 100644 (file)
--- a/xulapp/chrome/mandelbrot/content/image-settings.xul
+++ b/xulapp/chrome/mandelbrot/content/image-settings.xul
@@ -69,6 +69,8 @@
                   type="string"/>
       <preference id="mandelbrot.last_image.Ci_max" name="mandelbrot.last_image.Ci_max"
                   type="string"/>
+      <preference id="mandelbrot.syncProportions" name="mandelbrot.syncProportions"
+                  type="bool"/>
     </preferences>
 
     <groupbox>
@@ -109,12 +111,14 @@
         <hbox flex="1">
           <label value="&img.width.label;" control="imgWidth"/>
           <textbox id="imgWidth" size="4"
-                   preference="mandelbrot.image.width"/>
+                   preference="mandelbrot.image.width"
+                   onchange="recalcCoord('Ci', 'scale');"/>
         </hbox>
         <hbox flex="1">
           <label value="&img.height.label;" control="imgHeight"/>
           <textbox id="imgHeight" size="4"
-                   preference="mandelbrot.image.height"/>
+                   preference="mandelbrot.image.height"
+                   onchange="recalcCoord('Cr', 'scale');"/>
         </hbox>
       </groupbox>
 
@@ -125,6 +129,16 @@
         </hbox>
         <button id="previewButton" label="&previewDraw.label;" oncommand="drawPreview();"/>
       </groupbox>
+
+      <groupbox>
+        <caption label="&options.title;"/>
+        <hbox flex="1">
+          <checkbox id="syncProp"
+                    preference="mandelbrot.syncProportions"
+                    onclick="checkProportions();"/>
+          <label value="&syncProp.label;" control="syncProp"/>
+        </hbox>
+      </groupbox>
     </hbox>
   </prefpane>
 </prefwindow>

diff --git a/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd b/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd
index 1351acc4bff6a9707616a850df3ea328d4547f91..2433e060e24da624357bdff48f67725b61f8a82d 100644 (file)
--- a/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd
+++ b/xulapp/chrome/mandelbrot/locales/en-US/image-settings.dtd
@@ -51,3 +51,6 @@
 
 <!ENTITY preview.title         "Preview">
 <!ENTITY previewDraw.label     "Preview">
+
+<!ENTITY options.title         "Options">
+<!ENTITY syncProp.label        "Proportional">

diff --git a/xulapp/defaults/preferences/prefs.js b/xulapp/defaults/preferences/prefs.js
index a3e0f834421c2396c456335890e48c38850edd26..3ab5a34960474cd01c0283bc95b4bd9043d38ac5 100644 (file)
--- a/xulapp/defaults/preferences/prefs.js
+++ b/xulapp/defaults/preferences/prefs.js
@@ -39,6 +39,7 @@ pref("toolkit.defaultChromeURI", "chrome://mandelbrot/content/mandelbrot.xul");
 
 /* default prefs */
 pref("javascript.options.jit.chrome", true);
+pref("mandelbrot.syncProportions", true);
 
 /* debugging prefs */
 pref("browser.dom.window.dump.enabled", true);