bugfix items are not properly handled

sgratzl · sgratzl · commit 346315a0f031 · 2019-06-30T12:29:49.000+10:00
diff --git a/samples/datastructures.html b/samples/datastructures.html
@@ -0,0 +1,84 @@
+<!doctype html>
+<html>
+
+<head>
+  <title>Box Plot Chart</title>
+  <script src="../node_modules/chart.js/dist/Chart.bundle.js"></script>
+  <script src="../build/Chart.BoxPlot.js" type="text/javascript"></script>
+  <script src="https://unpkg.com/d3-random@latest/dist/d3-random.js"></script>
+  <script src="./utils.js"></script>
+  <style>
+  canvas {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+  }
+  </style>
+</head>
+
+<body>
+  <div id="container" style="width: 75%;">
+    <canvas id="canvas"></canvas>
+  </div>
+  <script>
+
+    const boxplotData = {
+      // define label tree
+      labels: ['array', '{boxplot values}', 'with items', 'as outliers'],
+      datasets: [{
+        label: 'Dataset 1',
+        backgroundColor: 'rgba(255,0,0,0.2)',
+        borderColor: 'red',
+        borderWidth: 1,
+        outlierColor: '#999999',
+        padding: 10,
+        itemRadius: 2,
+        itemStyle: 'circle',
+        itemBackgroundColor: '#000',
+        outlierColor: '#000',
+        data: [
+          [1, 2, 3, 4, 5], {
+            min: 1,
+            q1: 2,
+            median: 3,
+            q3: 4,
+            max: 5
+          }, {
+            min: 1,
+            q1: 2,
+            median: 3,
+            q3: 4,
+            max: 5,
+            items: [1, 2, 3, 4, 5]
+          },
+          {
+            min: 1,
+            q1: 2,
+            median: 3,
+            q3: 4,
+            max: 5,
+            outliers: [1, 2, 3, 4, 5]
+          },
+        ]
+      }]
+    };
+
+    window.onload = function() {
+      var ctx = document.getElementById("canvas").getContext("2d");
+      window.myBar = new Chart(ctx, {
+        type: 'boxplot',
+        data: boxplotData,
+        options: {
+          responsive: true,
+          title: {
+            display: true,
+            text: 'Chart.js Box Plot Chart'
+          }
+        }
+      });
+
+    };
+  </script>
+</body>
+
+</html>
diff --git a/src/controllers/base.js b/src/controllers/base.js
@@ -57,6 +57,8 @@ const array = {
 
     if (Array.isArray(data)) {
       r.items = data.map((d) => scale.getPixelForValue(Number(d)));
+    } else if (container.items) {
+      r.items = container.items.map((d) => scale.getPixelForValue(Number(d)));
     }
   }
 };
diff --git a/src/controllers/boxplot.js b/src/controllers/boxplot.js
@@ -53,7 +53,7 @@ const boxplot = {
 
     const r = {};
     Object.keys(v).forEach((key) => {
-      if (key !== 'outliers') {
+      if (key !== 'outliers' && key !== 'items') {
         r[key] = scale.getPixelForValue(Number(v[key]));
       }
     });

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ const array = {`
`57`	`57`
`58`	`58`	`if (Array.isArray(data)) {`
`59`	`59`	`r.items = data.map((d) => scale.getPixelForValue(Number(d)));`
	`60`	`+ } else if (container.items) {`
	`61`	`+ r.items = container.items.map((d) => scale.getPixelForValue(Number(d)));`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`};`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ const boxplot = {`
`53`	`53`
`54`	`54`	`const r = {};`
`55`	`55`	`Object.keys(v).forEach((key) => {`
`56`		`- if (key !== 'outliers') {`
	`56`	`+ if (key !== 'outliers' && key !== 'items') {`
`57`	`57`	`r[key] = scale.getPixelForValue(Number(v[key]));`
`58`	`58`	`}`
`59`	`59`	`});`