[candlestick] Fix #4783 (add barWidth, barMinWidth, barMaxWidth support)

apache · Dec 26, 2016 · 2502242 · 2502242
1 parent aa723df
commit 2502242
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/chart/candlestick/CandlestickSeries.js b/src/chart/candlestick/CandlestickSeries.js
@@ -57,6 +57,10 @@ define(function(require) {
                 }
             },
 
+            barMaxWidth: null,
+            barMinWidth: null,
+            barWidth: null,
+
             animationUpdate: false,
             animationEasing: 'linear',
             animationDuration: 300

diff --git a/src/chart/candlestick/candlestickLayout.js b/src/chart/candlestick/candlestickLayout.js
@@ -1,8 +1,7 @@
 define(function (require) {
 
-    var CANDLE_MIN_WIDTH = 2;
-    var CANDLE_MIN_NICE_WIDTH = 5;
-    var GPA_MIN = 4;
+    var retrieve = require('zrender/core/util').retrieve;
+    var parsePercent = require('../../util/number').parsePercent;
 
     return function (ecModel) {
 
@@ -104,16 +103,19 @@ define(function (require) {
                 Math.abs(extent[1] - extent[0]) / data.count()
             );
 
-        // Half band width is perfect when space is enouph, otherwise
-        // try not to be smaller than CANDLE_MIN_NICE_WIDTH (and only
-        // gap is compressed), otherwise ensure not to be smaller than
-        // CANDLE_MIN_WIDTH in spite of overlap.
-
-        return bandWidth / 2 - 2 > CANDLE_MIN_NICE_WIDTH // "- 2" is minus border width
-            ? bandWidth / 2 - 2
-            : bandWidth - CANDLE_MIN_NICE_WIDTH > GPA_MIN
-            ? CANDLE_MIN_NICE_WIDTH
-            : Math.max(bandWidth - GPA_MIN, CANDLE_MIN_WIDTH);
+        var barMaxWidth = parsePercent(
+            retrieve(seriesModel.get('barMaxWidth'), bandWidth),
+            bandWidth
+        );
+        var barMinWidth = parsePercent(
+            retrieve(seriesModel.get('barMinWidth'), 1),
+            bandWidth
+        );
+        var barWidth = seriesModel.get('barWidth');
+        return barWidth != null
+            ? parsePercent(barWidth, bandWidth)
+            // Put max outer to ensure bar visible in spite of overlap.
+            : Math.max(Math.min(bandWidth / 2, barMaxWidth), barMinWidth);
     }
 
 });