plotly · archmoj · Jul 18, 2023 · Jun 2, 2023 · Jun 2, 2023 · Jun 3, 2023
diff --git a/draftlogs/6625_fix.md b/draftlogs/6625_fix.md
@@ -0,0 +1 @@
+ - Fix contour plot colorscale domain (take account of [zmin, zmax] and [cmin, cmax]) [[#6625](https://github.com/plotly/plotly.js/pull/6625)]
diff --git a/src/components/colorbar/draw.js b/src/components/colorbar/draw.js
@@ -512,7 +512,7 @@ function drawColorBar(g, opts, gd) {
             .data(fillLevels);
         fills.enter().append('rect')
             .classed(cn.cbfill, true)
-            .style('stroke', 'none');
+            .attr('style', '');
         fills.exit().remove();
 
         var zBounds = zrange

diff --git a/src/traces/contour/make_color_map.js b/src/traces/contour/make_color_map.js
@@ -29,10 +29,10 @@ module.exports = function makeColorMap(trace) {
 
     var si, i;
 
-    if(contours.coloring === 'heatmap') {
-        var zmin0 = cOpts.min;
-        var zmax0 = cOpts.max;
+    var zmin0 = cOpts.min;
+    var zmax0 = cOpts.max;
 
+    if(contours.coloring === 'heatmap') {
         for(i = 0; i < len; i++) {
             si = scl[i];
             domain[i] = si[0] * (zmax0 - zmin0) + zmin0;
@@ -65,6 +65,18 @@ module.exports = function makeColorMap(trace) {
             domain[i] = (si[0] * (nc + extra - 1) - (extra / 2)) * cs + start;
             range[i] = si[1];
         }
+
+        // Ensure zmin and zmax are included in the colorscale
+
+        if(domain[0] > zmin0) {
+            domain.unshift(zmin0);
+            range.unshift(range[0]);
+        }
+
+        if(domain[domain.length - 1] < zmax0) {
+            domain.push(zmax0);
+            range.push(range[range.length - 1]);
+        }
     }
 
     return Colorscale.makeColorScaleFunc(

diff --git a/test/image/baselines/25.png b/test/image/baselines/25.png
diff --git a/test/image/baselines/axes_breaks-contour1d.png b/test/image/baselines/axes_breaks-contour1d.png
diff --git a/test/image/baselines/axes_breaks-contour2d.png b/test/image/baselines/axes_breaks-contour2d.png
diff --git a/test/image/baselines/cheater_contour.png b/test/image/baselines/cheater_contour.png
diff --git a/test/image/baselines/colorbar_tick_prefix_suffix.png b/test/image/baselines/colorbar_tick_prefix_suffix.png
diff --git a/test/image/baselines/colorbar_tickformat.png b/test/image/baselines/colorbar_tickformat.png
diff --git a/test/image/baselines/colorscale_opacity.png b/test/image/baselines/colorscale_opacity.png
diff --git a/test/image/baselines/contour_edge_cases.png b/test/image/baselines/contour_edge_cases.png
diff --git a/test/image/baselines/contour_label-formatting-via-colorbar.png b/test/image/baselines/contour_label-formatting-via-colorbar.png
diff --git a/test/image/baselines/contour_lines_coloring.png b/test/image/baselines/contour_lines_coloring.png
diff --git a/test/image/baselines/contour_nolines.png b/test/image/baselines/contour_nolines.png
diff --git a/test/image/baselines/contour_nonlinear_interpolation.png b/test/image/baselines/contour_nonlinear_interpolation.png
diff --git a/test/image/baselines/contour_transposed.png b/test/image/baselines/contour_transposed.png
diff --git a/test/image/baselines/contour_xyz-gaps-on-sides.png b/test/image/baselines/contour_xyz-gaps-on-sides.png
diff --git a/test/image/baselines/h-colorbar_contour_xyz-gaps-on-sides.png b/test/image/baselines/h-colorbar_contour_xyz-gaps-on-sides.png
diff --git a/test/image/baselines/h-colorbar_tickformat.png b/test/image/baselines/h-colorbar_tickformat.png
diff --git a/test/image/baselines/h-colorbar_tickformat_with-border.png b/test/image/baselines/h-colorbar_tickformat_with-border.png
diff --git a/test/image/baselines/heatmap_multicategory.png b/test/image/baselines/heatmap_multicategory.png
diff --git a/test/image/baselines/histogram2dcontour_bingroup-coloraxis.png b/test/image/baselines/histogram2dcontour_bingroup-coloraxis.png
diff --git a/test/image/baselines/multicategory_histograms.png b/test/image/baselines/multicategory_histograms.png
diff --git a/test/image/baselines/shared_coloraxes_contour.png b/test/image/baselines/shared_coloraxes_contour.png
diff --git a/test/image/mocks/airfoil.json b/test/image/mocks/airfoil.json
@@ -211,7 +211,7 @@
       "zmax":1,
       "name":"Pressure",
       "colorscale":"Viridis",
-      "zmin":-8,
+      "zmin":-1,
       "colorbar":{
         "y":0,
         "yanchor":"bottom",

diff --git a/test/image/mocks/contour_edge_cases.json b/test/image/mocks/contour_edge_cases.json
@@ -38,6 +38,8 @@
             [0, 0, 0, -9, 0, 0],
             [0, 0, 0, 0, 0, 0]],
       "type": "contour",
+      "zmin": -0.000001,
+      "zmax": 0.000001,
       "contours": {
         "start": -0.000001,
         "end": 0.000001,
@@ -55,6 +57,8 @@
             [0, 0, 9, -9, 0, 0],
             [0, 0, 0, 0, 0, 0]],
       "type": "contour",
+      "zmin": -0.000001,
+      "zmax": 0.000001,
       "contours": {
         "start": -0.000001,
         "end": 0.000001,
@@ -91,6 +95,8 @@
             [0, 0, 0, 9, 0, 0],
             [0, 0, 0, 0, 0, 0]],
       "type": "contour",
+      "zmin": -0.000001,
+      "zmax": 0.000001,
       "contours": {
         "start": -0.0000005,
         "end": 0.000001,
@@ -107,6 +113,8 @@
             [0, 0, 0, 0, -9, 0],
             [0, 0, 0, 0, 0, 0]],
       "type": "contour",
+      "zmin": -0.000001,
+      "zmax": 0.000001,
       "contours": {
         "start": -0.0000005,
         "end": 0.000001,
@@ -122,6 +130,8 @@
             [0, 0, 0, 9, 0, 0],
             [0, 0, 0, 0, 0, 0]],
       "type": "contour",
+      "zmin": -0.000001,
+      "zmax": 0.000001,
       "contours": {
         "start": -0.0000005,
         "end": 0.000001,

diff --git a/test/image/mocks/contour_log.json b/test/image/mocks/contour_log.json
@@ -11,6 +11,8 @@
         [6, 5, 4, 8, 2, 1],
         [5, 4, 3, 2, 1, 0]
       ],
+      "zmin": 4,
+      "zmax": 6.5,
       "contours": {"start": 4, "end": 6.5, "size": 1},
       "type": "contour"
     },

diff --git a/test/image/mocks/contour_valid_ses.json b/test/image/mocks/contour_valid_ses.json
@@ -45,8 +45,8 @@
                 "end": 10,
                 "size": 1
             },
-            "zmin": 0,
-            "zmax": 20
+            "zmin": 2,
+            "zmax": 10
         }
     ],
     "layout": {

diff --git a/test/image/mocks/h-colorbar_airfoil.json b/test/image/mocks/h-colorbar_airfoil.json
@@ -216,7 +216,7 @@
       "zmax":1,
       "name":"Pressure",
       "colorscale":"Viridis",
-      "zmin":-8,
+      "zmin":-1,
       "colorbar":{
         "orientation": "h",
         "x":0.75,

diff --git a/test/image/mocks/histogram2dcontour_bingroup-coloraxis.json b/test/image/mocks/histogram2dcontour_bingroup-coloraxis.json
@@ -655,6 +655,8 @@
       }
     ],
     "coloraxis": {
+      "cmin": 0,
+      "cmax": 8.5,
       "colorscale": [
         [
           0,

diff --git a/test/image/mocks/shared_coloraxes_contour.json b/test/image/mocks/shared_coloraxes_contour.json
@@ -112,6 +112,8 @@
       }
     },
     "coloraxis2": {
+      "cmin": -5.5,
+      "cmax": 4.5,
       "colorbar": {
         "dtick": 1,
         "len": 0.5,
@@ -120,6 +122,8 @@
       }
     },
     "coloraxis3": {
+      "cmin": -5.5,
+      "cmax": 4.5,
       "colorbar": {
         "len": 0.5,
         "x": -0.05, "xanchor": "right",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Fix contour plot colorscale domain (take account of [zmin, zmax] and [cmin, cmax]) [[#6625](https://github.com/plotly/plotly.js/pull/6625)]
lvlte marked this conversation as resolved. Show resolved Hide resolved