Commit Graph

2009 Commits

Author SHA1 Message Date
Evert Timberg
4cc24d475a Clean up the scale service. It's now more of a helper function for fitting the scales. Since each chart needed to know it's scales, there wasn't much point in registering them into the service. When we support overlapping charts, we can do something fancier 2015-05-19 18:22:05 -04:00
etimberg
4b8c9bc30d Fix a drawing bug when drawTicks is false. 2015-05-18 20:59:21 -04:00
etimberg
978ed1bc1e Created a multi axis sample file. Added an option to draw ticks for the axes. This is useful when in a multi axis scenario so that the axis that does not draw grid lines does not have weird lines. 2015-05-18 20:39:59 -04:00
etimberg
676765e808 Initial config merge. Handles special cases for objects and arrays and merges smarter than simply replacing the default object. Tested by overriding the vertical axis 0 point colour. Also implemented dataset axis binding. If nothing is specified, the dataset is bound to the first x and y axis. 2015-05-18 14:19:34 -04:00
Evert Timberg
f2065265c8 Fix an error in the scale service that prevented the chart from filling the canvas fully. 2015-05-18 10:27:39 -04:00
Evert Timberg
a6e2eec9e0 Linear scale drawing improvements. Ensured that the scatter plot configuration has a different line colour for the 0 axis 2015-05-18 09:39:01 -04:00
Evert Timberg
2e383da0d8 Handle the beginAtZero option for a linear scale. Added a helper for Math.sign 2015-05-18 08:51:13 -04:00
Evert Timberg
e30a9d2a94 The scatter example page now has negative numbers in both directions 2015-05-18 08:44:06 -04:00
Evert Timberg
492292e94b Remove x label rotation code since we dynamically adjust the number of labels to show and as such do not need to rotate 2015-05-18 08:43:38 -04:00
Evert Timberg
454f519b6d Fix jshint warnings 2015-05-18 08:27:18 -04:00
Evert Timberg
56d53e3ad4 Ensure that you always have at least 2 ticks on the linear axis 2015-05-17 13:29:17 -04:00
Evert Timberg
67b3d32218 Initial implementation of a scatter chart. Uses a new style of config from the other charts. For now, the config is not changeable. 2015-05-17 13:20:37 -04:00
Evert Timberg
d7ad5b6340 Add a scatter chart sample 2015-05-17 13:19:37 -04:00
Evert Timberg
db1365c8ce Initial check in of the scale service and the scale constructor registration. An initial implementation of a linear scale that can be drawn in both horizontal and vertical orientations. 2015-05-16 19:40:52 -04:00
Evert Timberg
b5b0081108 Some helper functions needed for better scales. 2015-05-16 19:38:31 -04:00
Evert Timberg
2ce4291e98 Merge pull request #1122 from ismeta/fix-span-tag
Fixes #886 - Close span tags properly in legend generation template.
2015-05-16 08:37:38 -04:00
Vanessa Ung
598a6f3485 Fixes #886 - Close span tags properly in legend generation template. 2015-05-16 15:31:56 +10:00
Tanner Linsley
fff81c455d Tooltip Position, Active Element Position, Tooltip animation follow 2015-05-15 23:07:21 -06:00
Tanner Linsley
ad972a0c5c Pie cleanup. 2015-05-15 22:45:17 -06:00
Tanner Linsley
872c92cd4b Doughnut/Pie Chart refactor 2015-05-15 22:34:08 -06:00
Tanner Linsley
1d8d19d404 Prettified, and half way through doughut 2015-05-15 20:54:01 -06:00
Tanner Linsley
ed6f234205 Bar chart pivot fix 2015-05-15 17:14:09 -06:00
Tanner Linsley
09c11440dd inGroupRange function for bar charts label mode 2015-05-15 17:07:41 -06:00
Tanner Linsley
e58421a08a Line Chart label hoverMode & tooltips 2015-05-15 17:03:51 -06:00
Tanner Linsley
fb580a6e48 lineChart single hoverMode tooltips, fallbackColor global 2015-05-15 16:40:01 -06:00
Tanner Linsley
f79ebdaa88 Stable Bar Chart, DRY core functions 2015-05-15 00:04:42 -06:00
Tanner Linsley
b432a3d6db labelMode tooltips and hover events 2015-05-14 23:18:47 -06:00
Tanner Linsley
ef4c46f2be labelMode Tooltips almost there! 2015-05-14 17:25:56 -06:00
Tanner Linsley
69b1239aa1 Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev 2015-05-12 17:24:09 -06:00
Tanner Linsley
4ef57315da Getting into 'label' hoverMode tooltips 2015-05-12 17:22:47 -06:00
Evert Timberg
d26f37236d Update package.json for color lib location 2015-05-12 18:01:28 -04:00
Tanner Linsley
63e115e7a8 hoverMode: "single" tooltips 2015-05-12 15:47:24 -06:00
Tanner Linsley
9f98334d6f Mid-code commit 2015-05-12 15:42:20 -06:00
Tanner Linsley
15f724f146 Rough Tooltips for 'single' hoverMode 2015-05-12 12:55:48 -06:00
Tanner Linsley
afb22d15ae Better events 2015-05-12 10:35:55 -06:00
etimberg
e709b13e77 Merge branch 'etimberg-fix/bar_chart_negative_values' into v2.0-dev
Merge in the changes to allow bar charts to support negative values.
2015-05-12 08:01:22 -04:00
etimberg
460399f651 Merge branch 'fix/bar_chart_negative_values' of https://github.com/etimberg/Chart.js into etimberg-fix/bar_chart_negative_values
# Conflicts:
#	samples/bar.html
#	src/Chart.Bar.js
#	src/Chart.Core.js
2015-05-12 08:00:14 -04:00
Tanner Linsley
132272d140 Revert build files
This reverts built files
2015-05-12 01:18:37 -06:00
Tanner Linsley
9e4d90e110 Color Animation, Color Autopilot 2015-05-12 01:13:16 -06:00
Tanner Linsley
df91739b77 hoverMode, onHover, key fixes 2015-05-11 19:43:17 -06:00
Tanner Linsley
d3f7071983 Merge pull request #1114 from etimberg/feature/get_bar_at_event
Create a getBarAtEvent function that returns the single bar that was clicked on
2015-05-11 19:27:52 -06:00
etimberg
d287a01b44 Make sure that the _start item is cleaned up during save. 2015-05-11 21:22:37 -04:00
Derek Perkins
0eadc86d24 Added 2.0 alpha notes 2015-05-11 19:00:04 -06:00
Tanner Linsley
b8691c9581 Revert "Merge pull request #856 from tannerlinsley/editable-chart-config"
This reverts commit a8063de6b8, reversing
changes made to 7f513b87ee.
2015-05-11 18:57:14 -06:00
Derek Perkins
c7b117631b Merge pull request #1113 from tannerlinsley/deep-data
Deep data
2015-05-11 18:53:28 -06:00
Tanner Linsley
0e29cfdfda Bar attempt #5 2015-05-11 18:12:44 -06:00
Tanner Linsley
cf07df07d6 Bar Attempt # 4 2015-05-08 16:20:21 -06:00
Evert Timberg
4e3dd8ae3f Merge pull request #1066 from tannerlinsley/add-stacked-area
Add StackedArea chart type to community extensions
2015-05-06 20:31:27 -04:00
Tanner Linsley
4b34bbadf9 Merge pull request #1098 from WouterSioen/fix-typo
Fix typo
2015-05-05 16:01:30 -06:00
Evert Timberg
cc57b9e581 Merge pull request #1098 from WouterSioen/fix-typo
Fix typo
2015-05-05 14:39:35 -04:00