]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Old doughnuts are no good.
authorTanner Linsley <tannerlinsley@gmail.com>
Tue, 16 Jun 2015 06:20:06 +0000 (00:20 -0600)
committerTanner Linsley <tannerlinsley@gmail.com>
Tue, 16 Jun 2015 06:20:06 +0000 (00:20 -0600)
src/controllers/controller.doughnut.js

index 63aad31735f6aabb49cfd842d3e5e5b1b8dcbc21..8e5b4e131552586e8d1f8122fef0b5b1b29cbcc3 100644 (file)
        });
 
 
-
-
-
-
-
-
-
-       return;
-
-       Chart.Type.extend({
-               //Passing in a name registers this chart in the Chart namespace
-               name: "Doughnut",
-               //Providing a defaults will also register the deafults in the chart namespace
-               defaults: defaultConfig,
-               //Initialize is fired when the chart is initialized - Data is passed in as a parameter
-               //Config is automatically merged by the core of Chart.js, and is available at this.options
-               initialize: function() {
-
-                       //Set up tooltip events on the chart
-                       helpers.bindEvents(this, this.chart.options.events, this.events);
-
-                       //Create a new bar for each piece of data
-                       helpers.each(this.data.datasets, function(dataset, datasetIndex) {
-                               dataset.metaData = [];
-                               helpers.each(dataset.data, function(dataPoint, index) {
-                                       dataset.metaData.push(new Chart.Arc({
-                                               _chart: this.chart,
-                                               _datasetIndex: datasetIndex,
-                                               _index: index,
-                                               _model: {}
-                                       }));
-                               }, this);
-                       }, this);
-
-                       // Create tooltip instance exclusively for this chart with some defaults.
-                       this.tooltip = new Chart.Tooltip({
-                               _chart: this.chart,
-                               _data: this.data,
-                               _options: this.options,
-                       }, this);
-
-                       this.resetElements();
-
-                       // Update the chart with the latest data.
-                       this.update();
-
-               },
-
-               resetElements: function() {
-                       this.outerRadius = (helpers.min([this.chart.width, this.chart.height]) - this.chart.options.elements.arc.borderWidth / 2) / 2;
-                       this.innerRadius = this.chart.options.cutoutPercentage ? (this.outerRadius / 100) * (this.chart.options.cutoutPercentage) : 1;
-                       this.radiusLength = (this.outerRadius - this.innerRadius) / this.data.datasets.length;
-
-                       // Update the points
-                       helpers.each(this.data.datasets, function(dataset, datasetIndex) {
-                               // So that calculateCircumference works
-                               dataset.total = 0;
-                               helpers.each(dataset.data, function(value) {
-                                       dataset.total += Math.abs(value);
-                               }, this);
-
-                               dataset.outerRadius = this.outerRadius - (this.radiusLength * datasetIndex);
-                               dataset.innerRadius = dataset.outerRadius - this.radiusLength;
-
-                               helpers.each(dataset.metaData, function(arc, index) {
-                                       helpers.extend(arc, {
-                                               _model: {
-                                                       x: this.chart.width / 2,
-                                                       y: this.chart.height / 2,
-                                                       startAngle: Math.PI * -0.5, // use - PI / 2 instead of 3PI / 2 to make animations better. It means that we never deal with overflow during the transition function
-                                                       circumference: (this.chart.options.animation.animateRotate) ? 0 : this.calculateCircumference(metaSlice.value),
-                                                       outerRadius: (this.chart.options.animation.animateScale) ? 0 : dataset.outerRadius,
-                                                       innerRadius: (this.chart.options.animation.animateScale) ? 0 : dataset.innerRadius,
-
-                                                       backgroundColor: arc.custom && arc.custom.backgroundColor ? arc.custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, this.chart.options.elements.arc.backgroundColor),
-                                                       hoverBackgroundColor: arc.custom && arc.custom.hoverBackgroundColor ? arc.custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, this.chart.options.elements.arc.hoverBackgroundColor),
-                                                       borderWidth: arc.custom && arc.custom.borderWidth ? arc.custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, this.chart.options.elements.arc.borderWidth),
-                                                       borderColor: arc.custom && arc.custom.borderColor ? arc.custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, this.chart.options.elements.arc.borderColor),
-
-                                                       label: helpers.getValueAtIndexOrDefault(dataset.label, index, this.chart.data.labels[index])
-                                               },
-                                       });
-
-                                       arc.pivot();
-                               }, this);
-
-                       }, this);
-               },
-               update: function(animationDuration) {
-
-
-               },
-               draw: function(easeDecimal) {
-                       easeDecimal = easeDecimal || 1;
-                       this.clear();
-
-                       this.eachElement(function(arc) {
-                               arc.transition(easeDecimal).draw();
-                       }, this);
-
-                       this.tooltip.transition(easeDecimal).draw();
-               },
-               events: function(e) {
-
-                       this.lastActive = this.lastActive || [];
-
-                       // Find Active Elements
-                       if (e.type == 'mouseout') {
-                               this.active = [];
-                       } else {
-
-                               this.active = function() {
-                                       switch (this.chart.options.hover.mode) {
-                                               case 'single':
-                                                       return this.getSliceAtEvent(e);
-                                               case 'label':
-                                                       return this.getSlicesAtEvent(e);
-                                               case 'dataset':
-                                                       return this.getDatasetAtEvent(e);
-                                               default:
-                                                       return e;
-                                       }
-                               }.call(this);
-                       }
-
-                       // On Hover hook
-                       if (this.chart.options.hover.onHover) {
-                               this.chart.options.hover.onHover.call(this, this.active);
-                       }
-
-                       if (e.type == 'mouseup' || e.type == 'click') {
-                               if (this.chart.options.onClick) {
-                                       this.chart.options.onClick.call(this, e, this.active);
-                               }
-                       }
-
-                       var dataset;
-                       var index;
-                       // Remove styling for last active (even if it may still be active)
-                       if (this.lastActive.length) {
-                               switch (this.chart.options.hover.mode) {
-                                       case 'single':
-                                               dataset = this.data.datasets[this.lastActive[0]._datasetIndex];
-                                               index = this.lastActive[0]._index;
-
-                                               this.lastActive[0]._model.backgroundColor = this.lastActive[0].custom && this.lastActive[0].custom.backgroundColor ? this.lastActive[0].custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, this.chart.options.elements.arc.backgroundColor);
-                                               this.lastActive[0]._model.borderColor = this.lastActive[0].custom && this.lastActive[0].custom.borderColor ? this.lastActive[0].custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, this.chart.options.elements.arc.borderColor);
-                                               this.lastActive[0]._model.borderWidth = this.lastActive[0].custom && this.lastActive[0].custom.borderWidth ? this.lastActive[0].custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, this.chart.options.elements.arc.borderWidth);
-                                               break;
-                                       case 'label':
-                                               for (var i = 0; i < this.lastActive.length; i++) {
-                                                       dataset = this.data.datasets[this.lastActive[i]._datasetIndex];
-                                                       index = this.lastActive[i]._index;
-
-                                                       this.lastActive[i]._model.backgroundColor = this.lastActive[i].custom && this.lastActive[i].custom.backgroundColor ? this.lastActive[i].custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, this.chart.options.elements.arc.backgroundColor);
-                                                       this.lastActive[i]._model.borderColor = this.lastActive[i].custom && this.lastActive[i].custom.borderColor ? this.lastActive[i].custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.borderColor, index, this.chart.options.elements.arc.borderColor);
-                                                       this.lastActive[i]._model.borderWidth = this.lastActive[i].custom && this.lastActive[i].custom.borderWidth ? this.lastActive[i].custom.borderWidth : helpers.getValueAtIndexOrDefault(dataset.borderWidth, index, this.chart.options.elements.arc.borderWidth);
-                                               }
-                                               break;
-                                       case 'dataset':
-                                               break;
-                                       default:
-                                               // Don't change anything
-                               }
-                       }
-
-                       // Built in hover styling
-                       if (this.active.length && this.chart.options.hover.mode) {
-                               switch (this.chart.options.hover.mode) {
-                                       case 'single':
-                                               dataset = this.data.datasets[this.active[0]._datasetIndex];
-                                               index = this.active[0]._index;
-
-                                               this.active[0]._model.backgroundColor = this.active[0].custom && this.active[0].custom.hoverBackgroundColor ? this.active[0].custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.color(this.active[0]._model.backgroundColor).saturate(0.5).darken(0.1).rgbString());
-                                               this.active[0]._model.borderColor = this.active[0].custom && this.active[0].custom.hoverBorderColor ? this.active[0].custom.hoverBorderColor : helpers.getValueAtIndexOrDefault(dataset.hoverBorderColor, index, this.active[0]._model.borderColor);
-                                               this.active[0]._model.borderWidth = this.active[0].custom && this.active[0].custom.hoverBorderWidth ? this.active[0].custom.hoverBorderWidth : helpers.getValueAtIndexOrDefault(dataset.hoverBorderWidth, index, this.active[0]._model.borderWidth);
-                                               break;
-                                       case 'label':
-                                               for (var i = 0; i < this.active.length; i++) {
-                                                       dataset = this.data.datasets[this.active[i]._datasetIndex];
-                                                       index = this.active[i]._index;
-
-                                                       this.active[i]._model.backgroundColor = this.active[i].custom && this.active[i].custom.hoverBackgroundColor ? this.active[i].custom.hoverBackgroundColor : helpers.getValueAtIndexOrDefault(dataset.hoverBackgroundColor, index, helpers.color(this.active[i]._model.backgroundColor).saturate(0.5).darken(0.1).rgbString());
-                                                       this.active[i]._model.borderColor = this.active[i].custom && this.active[i].custom.hoverBorderColor ? this.active[i].custom.hoverBorderColor : helpers.getValueAtIndexOrDefault(dataset.hoverBorderColor, index, this.active[0]._model.borderColor);
-                                                       this.active[i]._model.borderWidth = this.active[i].custom && this.active[i].custom.hoverBorderWidth ? this.active[i].custom.hoverBorderWidth : helpers.getValueAtIndexOrDefault(dataset.hoverBorderWidth, index, this.active[i]._model.borderWidth);
-                                               }
-                                               break;
-                                       case 'dataset':
-                                               break;
-                                       default:
-                                               // Don't change anything
-                               }
-                       }
-
-
-                       // Built in Tooltips
-                       if (this.chart.options.tooltips.enabled) {
-
-                               // The usual updates
-                               this.tooltip.initialize();
-
-                               // Active
-                               if (this.active.length) {
-                                       this.tooltip._model.opacity = 1;
-
-                                       helpers.extend(this.tooltip, {
-                                               _active: this.active,
-                                       });
-
-                                       this.tooltip.update();
-                               } else {
-                                       // Inactive
-                                       this.tooltip._model.opacity = 0;
-                               }
-                       }
-
-
-                       // Hover animations
-                       this.tooltip.pivot();
-
-                       if (!this.animating) {
-                               var changed;
-
-                               helpers.each(this.active, function(element, index) {
-                                       if (element !== this.lastActive[index]) {
-                                               changed = true;
-                                       }
-                               }, this);
-
-                               // If entering, leaving, or changing elements, animate the change via pivot
-                               if ((!this.lastActive.length && this.active.length) ||
-                                       (this.lastActive.length && !this.active.length) ||
-                                       (this.lastActive.length && this.active.length && changed)) {
-
-                                       this.stop();
-                                       this.render(this.chart.options.hover.animationDuration);
-                               }
-                       }
-
-                       // Remember Last Active
-                       this.lastActive = this.active;
-                       return this;
-               },
-               getSliceAtEvent: function(e) {
-                       var elements = [];
-
-                       var location = helpers.getRelativePosition(e);
-
-                       this.eachElement(function(arc, index) {
-                               if (arc.inRange(location.x, location.y)) {
-                                       elements.push(arc);
-                               }
-                       }, this);
-                       return elements;
-               },
-               /*getSlicesAtEvent: function(e) {
-                       var elements = [];
-
-                       var location = helpers.getRelativePosition(e);
-
-                       this.eachElement(function(arc, index) {
-                               if (arc.inLabelRange(location.x, location.y)) {
-                                       elements.push(arc);
-                               }
-                       }, this);
-                       return elements;
-               },*/
-       });
-
-       Chart.types.Doughnut.extend({
-               name: "Pie",
-               defaults: helpers.merge(defaultConfig, {
-                       cutoutPercentage: 0
-               })
-       });
-
 }).call(this);