image: change code style

antoinerg · antoinerg · commit 94dff5cf6b9e · 2019-10-16T14:27:27.000-04:00
diff --git a/src/traces/image/constants.js b/src/traces/image/constants.js
@@ -11,17 +11,19 @@
 
 module.exports = {
     colormodel: {
-        'rgb': [[0, 0, 0], [255, 255, 255], function(c) {return c.slice(0, 3);}],
-        'rgba': [[0, 0, 0, 0], [255, 255, 255, 1], function(c) {return c.slice(0, 4);}],
-        'hsl': [[0, 0, 0], [360, 100, 100], function(c) {
-            c[1] = c[1] + '%';
-            c[2] = c[2] + '%';
-            return c.slice(0, 3);
-        }],
-        'hsla': [[0, 0, 0, 0], [360, 100, 100, 1], function(c) {
-            c[1] = c[1] + '%';
-            c[2] = c[2] + '%';
-            return c.slice(0, 4);
+        rgb: {min: [0, 0, 0], max: [255, 255, 255], fmt: function(c) {return c.slice(0, 3);}},
+        rgba: {min: [0, 0, 0, 0], max: [255, 255, 255, 1], fmt: function(c) {return c.slice(0, 4);}},
+        hsl: {min: [0, 0, 0], max: [360, 100, 100], fmt: function(c) {
+            var p = c.slice(0, 3);
+            p[1] = p[1] + '%';
+            p[2] = p[2] + '%';
+            return p;
+        }},
+        hsla: [[0, 0, 0, 0], [360, 100, 100, 1], function(c) {
+            var p = c.slice(0, 4);
+            p[1] = p[1] + '%';
+            p[2] = p[2] + '%';
+            return p.slice(0, 4);
         }]
     }
 };
diff --git a/src/traces/image/plot.js b/src/traces/image/plot.js
@@ -77,8 +77,8 @@ module.exports = function(gd, plotinfo, cdimage, imageLayer) {
         var scale = [];
         var k;
         for(k = 0; k < tupleLength; k++) {
-            if(cr[0][k] !== trace.zmin[k] || cr[1][k] !== trace.zmax[k]) {
-                scale.push([k, (cr[1][k] - cr[0][k]) / (trace.zmax[k] - trace.zmin[k])]);
+            if(cr.min[k] !== trace.zmin[k] || cr.max[k] !== trace.zmax[k]) {
+                scale.push([k, (cr.max[k] - cr.min[k]) / (trace.zmax[k] - trace.zmin[k])]);
             }
         }
 
@@ -90,9 +90,9 @@ module.exports = function(gd, plotinfo, cdimage, imageLayer) {
                 for(k = 0; k < scale.length; k++) {
                     ch = scale[k][0];
                     c[ch] = (c[ch] - trace.zmin[ch]) * scale[k][1];
-                    c[ch] = Lib.constrain(c[ch], cr[0][k], cr[1][k]);
+                    c[ch] = Lib.constrain(c[ch], cr.min[k], cr.max[k]);
                 }
-                context.fillStyle = trace.colormodel + '(' + cr[2](c).join(',') + ')';
+                context.fillStyle = trace.colormodel + '(' + cr.fmt(c).join(',') + ')';
                 context.fillRect(ipx(i), jpx(j), ipx(i + 1) - ipx(i), jpx(j + 1) - jpx(j));
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,8 @@ module.exports = function(gd, plotinfo, cdimage, imageLayer) {`
`77`	`77`	`var scale = [];`
`78`	`78`	`var k;`
`79`	`79`	`for(k = 0; k < tupleLength; k++) {`
`80`		`- if(cr[0][k] !== trace.zmin[k] \|\| cr[1][k] !== trace.zmax[k]) {`
`81`		`- scale.push([k, (cr[1][k] - cr[0][k]) / (trace.zmax[k] - trace.zmin[k])]);`
	`80`	`+ if(cr.min[k] !== trace.zmin[k] \|\| cr.max[k] !== trace.zmax[k]) {`
	`81`	`+ scale.push([k, (cr.max[k] - cr.min[k]) / (trace.zmax[k] - trace.zmin[k])]);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`@@ -90,9 +90,9 @@ module.exports = function(gd, plotinfo, cdimage, imageLayer) {`
`90`	`90`	`for(k = 0; k < scale.length; k++) {`
`91`	`91`	`ch = scale[k][0];`
`92`	`92`	`c[ch] = (c[ch] - trace.zmin[ch]) * scale[k][1];`
`93`		`- c[ch] = Lib.constrain(c[ch], cr[0][k], cr[1][k]);`
	`93`	`+ c[ch] = Lib.constrain(c[ch], cr.min[k], cr.max[k]);`
`94`	`94`	`}`
`95`		`- context.fillStyle = trace.colormodel + '(' + cr[2](c).join(',') + ')';`
	`95`	`+ context.fillStyle = trace.colormodel + '(' + cr.fmt(c).join(',') + ')';`
`96`	`96`	`context.fillRect(ipx(i), jpx(j), ipx(i + 1) - ipx(i), jpx(j + 1) - jpx(j));`
`97`	`97`	`}`
`98`	`98`	`}`