Evert Timberg
|
b22e1e3e9c
|
Update scatter chart. Still need to get tooltips working
|
2015-06-02 20:44:24 -04:00 |
|
Evert Timberg
|
635ec58616
|
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig
|
2015-06-02 20:07:07 -04:00 |
|
Evert Timberg
|
f44dd06826
|
Better animations when chart is first initialized.
|
2015-06-02 20:06:50 -04:00 |
|
Tanner Linsley
|
02d7442e4f
|
!bar borderWidth
|
2015-06-02 17:29:17 -06:00 |
|
Tanner Linsley
|
4ded634d75
|
no logging
|
2015-06-02 17:13:47 -06:00 |
|
Evert Timberg
|
80a25af502
|
Merge branch 'feature/v2.0dev-nestedConfig' of https://github.com/etimberg/Chart.js into feature/v2.0dev-nestedConfig
|
2015-06-02 18:55:41 -04:00 |
|
Evert Timberg
|
9b2d2efc7a
|
Animation on refresh
|
2015-06-02 18:54:18 -04:00 |
|
Tanner Linsley
|
6b0e609935
|
Bar Chart Stacked nestedConfig
|
2015-06-02 16:48:39 -06:00 |
|
Tanner Linsley
|
74d3890ba9
|
no legend yet... :(
|
2015-06-02 15:14:51 -06:00 |
|
Tanner Linsley
|
df4d2d2594
|
Stroked tooltip colors
|
2015-06-02 15:14:06 -06:00 |
|
Tanner Linsley
|
b7dc2339f4
|
line: skipNull functionality
|
2015-06-02 13:42:09 -06:00 |
|
Evert Timberg
|
edbb235668
|
Tooltip titles now work in the line chart. Getting ever closer to being done
|
2015-05-31 20:16:04 -04:00 |
|
Evert Timberg
|
92776ce0ac
|
Animations & tool tips show. The title is not correct yet.
|
2015-05-31 16:55:17 -04:00 |
|
Evert Timberg
|
e48c7f168b
|
Add back line fill option. This is set on a per dataset basis, but there is an override in the config. Demo this in the line sample.
|
2015-05-31 10:24:53 -04:00 |
|
Evert Timberg
|
8a550852da
|
Check in work from floobits with minor changes to fix some errors
|
2015-05-31 09:47:10 -04:00 |
|
Tanner Linsley
|
6af94298ec
|
Radar Chart
|
2015-05-27 10:28:00 -06:00 |
|
Tanner Linsley
|
1163efbcca
|
Merge remote-tracking branch 'origin/v2.0-dev' into v2.0-dev
Conflicts:
src/Chart.PolarArea.js
|
2015-05-26 22:06:20 -06:00 |
|
Tanner Linsley
|
3a32144d89
|
Polar Area deep data
|
2015-05-26 22:02:41 -06:00 |
|
Evert Timberg
|
e3519f5bd4
|
More nested config stuff. Not sure what all of the options in the line config do, but left them in. Ensured that tooltips work.
|
2015-05-26 21:16:18 -04:00 |
|
Evert Timberg
|
7d8b1712a7
|
Convert bar chart to use nested config. Noticed that the segmentShowStroke option wasn't used at all.
|
2015-05-26 19:30:34 -04:00 |
|
Evert Timberg
|
54b51038ca
|
Updated bar chart to use new nested config for bars. Removed unused relativeBars option. barBorderWidth was not used, but seems useful so we will keep it until later refactoring.
|
2015-05-26 19:11:05 -04:00 |
|
Evert Timberg
|
e774a893da
|
Use new animation options in the animation service.
|
2015-05-26 18:54:36 -04:00 |
|
Tanner Linsley
|
b03a057a76
|
Nested globals
|
2015-05-26 16:52:16 -06:00 |
|
Tanner Linsley
|
48dd1cf024
|
Merge pull request #1132 from etimberg/feature/v2.0dev-xy
Scale rewrite for v2.0
|
2015-05-26 16:26:52 -06:00 |
|
Evert Timberg
|
a2d477ac5e
|
Moved radial scale into Chat.Scale.js. Registered as "radialLinear" which will allow radialLogarithmic, etc in the future. Updated the polar area and radar charts to use the new scale config. The scales draw, but the points do not. This is no different than the current v2.0 branch
|
2015-05-24 14:33:12 -04:00 |
|
Evert Timberg
|
1352dfeb0f
|
Fix the y scales that were missed in the previous check in
|
2015-05-23 21:49:01 -04:00 |
|
Evert Timberg
|
d4e7765a50
|
Clean up some unused config options. Renamed 'show' to 'display' for scales since that was clearer and maintains backwards compatibility.
|
2015-05-23 21:44:50 -04:00 |
|
Evert Timberg
|
73b579c962
|
Remove old linear scale
|
2015-05-23 21:21:40 -04:00 |
|
Evert Timberg
|
b67afcd727
|
Bar chart converted to new scale system. Added bar chart multi axis sample.
|
2015-05-23 18:26:34 -04:00 |
|
Evert Timberg
|
a10e245e5a
|
Use correct tooltip events in each chart
|
2015-05-23 18:15:57 -04:00 |
|
Evert Timberg
|
181e866175
|
Fix line chart multi axis sample title
|
2015-05-23 17:50:27 -04:00 |
|
Evert Timberg
|
d998c803d3
|
Move line chart over to use new scale config. This adds support for multiple y axes. Added an example demonstrating this.
|
2015-05-23 15:19:30 -04:00 |
|
Evert Timberg
|
a559ab85cd
|
Ensure consistency in the helpers.toRadians name
|
2015-05-23 15:18:33 -04:00 |
|
Evert Timberg
|
c66edc9169
|
dataset axis to be used in the line chart and the bar chart
|
2015-05-23 15:18:08 -04:00 |
|
Evert Timberg
|
b7606c7a8d
|
Rename onHover to events to match the line chart
|
2015-05-23 15:15:04 -04:00 |
|
Evert Timberg
|
12e2ace039
|
Merge remote-tracking branch 'upstream/v2.0-dev' into feature/v2.0dev-xy
Conflicts:
src/Chart.Core.js
Fixed the sample files & chart type initialize methods so that this.data does not get set to undefined.
|
2015-05-20 09:03:22 -04:00 |
|
Evert Timberg
|
ed4b9945f8
|
Initial dataset scale class
|
2015-05-20 08:33:26 -04:00 |
|
Tanner Linsley
|
951e714e77
|
Playground and big changes
|
2015-05-20 00:03:45 -07:00 |
|
Evert Timberg
|
008bb1aab3
|
Set new tooltip templates for the scatter chart
|
2015-05-19 20:33:39 -04:00 |
|
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 |
|