merge png-export feature

mendixlabs · Nov 8, 2017 · 3b8d60a · 3b8d60a
2 parents eb52995 + 5ecd2e0
commit 3b8d60a
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 7 deletions.
diff --git a/src/ChartJS/widgets/BarChart/widget/BarChart.js b/src/ChartJS/widgets/BarChart/widget/BarChart.js
@@ -160,7 +160,11 @@ define([
                         scaleLineWidth : this.scaleLineWidth,
 
                         //The scale line color
-                        scaleLineColor : this.scaleLineColor
+                        scaleLineColor : this.scaleLineColor,
+
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 };
 

diff --git a/src/ChartJS/widgets/Core.js b/src/ChartJS/widgets/Core.js
@@ -66,6 +66,7 @@ define([
         _legendNode: null,
         _mxObj: null,
         _handle: null,
+        _dataURL: "",
 
         _chartType: null,
 
@@ -700,6 +701,11 @@ define([
             if (cb && typeof cb === "function") {
                 cb();
             }
+        },
+
+        _animationComplete: function () {
+            logger.debug(this.id + "._animationComplete");
+            // Use this.canvasNode.toDataURL() to get an image
         }
 
     });

diff --git a/src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js b/src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js
@@ -96,7 +96,11 @@ define([
                     legendCallback: this._legendAlternateCallback,
 
                     //Number - The percentage of the chart that we cut out of the middle
-                    cutoutPercentage: this.percentageInnerCutout
+                    cutoutPercentage: this.percentageInnerCutout,
+
+                    animation: {
+                        onComplete: lang.hitch(this, this._animationComplete)
+                    }
                 })
             });
 

diff --git a/src/ChartJS/widgets/LineChart/widget/LineChart.js b/src/ChartJS/widgets/LineChart/widget/LineChart.js
@@ -211,7 +211,11 @@ define([
                         scaleLineWidth: this.scaleLineWidth,
 
                         //The scale line color
-                        scaleLineColor: this.scaleLineColor
+                        scaleLineColor: this.scaleLineColor,
+
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 };
 
@@ -235,4 +239,4 @@ define([
     });
 });
 
-require(["ChartJS/widgets/LineChart/widget/LineChart"]);
+require(["ChartJS/widgets/LineChart/widget/LineChart"]);
diff --git a/src/ChartJS/widgets/PieChart/widget/PieChart.js b/src/ChartJS/widgets/PieChart/widget/PieChart.js
@@ -102,6 +102,9 @@ define([
                         //cutOut of pie
                         cutoutPercentage: 0, //always zero for Pie chart
 
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 };
                 this._chart = new this._chartJS(this._ctx, chartProperties);

diff --git a/src/ChartJS/widgets/PolarChart/widget/PolarChart.js b/src/ChartJS/widgets/PolarChart/widget/PolarChart.js
@@ -140,7 +140,11 @@ define([
                     showTooltips : this.showTooltips,
 
                     // Custom tooltip?
-                    customTooltips : false //lang.hitch(this, this.customTooltip)
+                    customTooltips : false, //lang.hitch(this, this.customTooltip)
+
+                    animation: {
+                        onComplete: lang.hitch(this, this._animationComplete)
+                    }
 
                 }
             });

diff --git a/src/ChartJS/widgets/RadarChart/widget/RadarChart.js b/src/ChartJS/widgets/RadarChart/widget/RadarChart.js
@@ -170,7 +170,11 @@ define([
                         //Boolean - Whether to fill the dataset with a colour
                         datasetFill : this.datasetFill,
 
-                        legendCallback : this._legendCallback
+                        legendCallback : this._legendCallback,
+
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 });
 

diff --git a/src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js b/src/ChartJS/widgets/StackedBarChart/widget/StackedBarChart.js
@@ -168,7 +168,11 @@ define([
                         scaleLineWidth : this.scaleLineWidth,
 
                         //The scale line color
-                        scaleLineColor : this.scaleLineColor
+                        scaleLineColor : this.scaleLineColor,
+
+                        animation: {
+                            onComplete: lang.hitch(this, this._animationComplete)
+                        }
                     })
                 };
 

diff --git a/test/widgets/ChartJS.mpk b/test/widgets/ChartJS.mpk