Commit Graph

1801 Commits

Author SHA1 Message Date
Evert Timberg
029aad4f35 Update samples to no longer use old functions and instead modify the data directly 2015-09-21 21:00:58 -04:00
Evert Timberg
4e536c523e Test missed in last check-in 2015-09-21 21:00:09 -04:00
Evert Timberg
416a6ac1bd Remove unneeded functions from core controller. Updated dataset controllers to have a separate function to update the meta data for each dataset 2015-09-21 20:59:53 -04:00
Tanner Linsley
301efac8dd Merge pull request #1477 from etimberg/feature/scale-labels
Scale Labels
2015-09-21 17:52:09 -06:00
Tanner Linsley
407eb846d0 Update v1.x readme to reflect release status 2015-09-21 14:28:10 -06:00
Tanner Linsley
8c94ae0441 Ensure bar width at least 1px 2015-09-21 13:17:27 -06:00
Tanner Linsley
01fdd387d9 Merge pull request #1474 from nnnick/v2.0-feature-dynamic-bar-spacing
Bar spacing is now dynamic at small sizes.
2015-09-21 13:08:09 -06:00
Tanner Linsley
e3e66d2425 Time scale support 2015-09-21 13:04:41 -06:00
Tanner Linsley
154083b875 Bar spacing is now dynamic at small sizes.
Closes #1468
2015-09-21 12:57:04 -06:00
Tanner Linsley
3ce06ab387 Merge pull request #1473 from nnnick/v2.0-dev-timescale-fix
Time scale now draws all ticks, instead of half of them
2015-09-21 11:55:51 -06:00
Tanner Linsley
2a76ff0037 Time scale now draws all ticks, instead of half of them
Closes #1463
2015-09-21 11:52:17 -06:00
Tanner Linsley
848710b447 Merge pull request #1471 from etimberg/fix/mouse-coordinates
Convert screen coordinates into canvas coordinates when dealing with mouse events
2015-09-21 11:37:21 -06:00
Tanner Linsley
d537366f0c Merge pull request #1470 from etimberg/feature/updated_resize_fix
Updated PR to replace #1467
2015-09-21 11:36:43 -06:00
Evert Timberg
2e479e4589 Update tests for new scale labels 2015-09-20 19:41:48 -04:00
Evert Timberg
6ba0fc3e08 Update sample files 2015-09-20 19:25:17 -04:00
Evert Timberg
f4cdd20a38 Time scale has a label now 2015-09-20 19:24:46 -04:00
Evert Timberg
b7c7f1d6a4 Category scale has labels 2015-09-20 19:18:59 -04:00
Evert Timberg
9fecb37e30 Update tests for new config options 2015-09-20 19:06:34 -04:00
Evert Timberg
2667807c1d Logarithmic scale now has labels 2015-09-20 19:06:09 -04:00
Evert Timberg
b1060f20ec Linear scale has labels 2015-09-20 18:59:58 -04:00
Evert Timberg
162aaa993a Convert screen coordinates into canvas coordinates when dealing with mouse events 2015-09-20 17:57:27 -04:00
Evert Timberg
17cec5297d Update charts with default aspect ratio of 1 where it makes sense. If the canvas has no size specified, this will be used 2015-09-20 10:34:40 -04:00
Evert Timberg
8aa6288210 Ensure that radii are always >= 0 for doughnuts and polar area charts 2015-09-20 10:33:36 -04:00
Evert Timberg
8bddbff9aa Prevent a jump in the category scale when the labels need to rotate only when there is no margin yet applied. 2015-09-20 10:32:43 -04:00
Evert Timberg
814c2d7ffa Remove responsive file since it is not necessary 2015-09-20 10:30:43 -04:00
Evert Timberg
39252d4633 Use hidden iframe to detect resize + obey max width when getting maximum size. Updated the bar sample to start off hidden. Use the 'show' button to display the graph 2015-09-20 10:30:12 -04:00
Evert Timberg
7d0a7844ea Merge pull request #1469 from nnnick/revert-1467-feature/resize_problems
Revert "Fix resize problems when charts are initially hidden"
2015-09-19 17:53:35 -04:00
Evert Timberg
9474d72491 Revert "Fix resize problems when charts are initially hidden" 2015-09-19 17:52:58 -04:00
Tanner Linsley
862045e49a Merge pull request #1465 from nnnick/v2.0-dev-time-scale-bars-and-combo
Bar and combo support for time scale
2015-09-18 18:59:58 -06:00
Tanner Linsley
efa5ab7ec8 Merge pull request #1467 from etimberg/feature/resize_problems
Fix resize problems when charts are initially hidden
2015-09-18 18:59:39 -06:00
Evert Timberg
97cec8604a Only store the original device context ratio once 2015-09-18 19:22:54 -04:00
Evert Timberg
8d47693448 Make sure that doughnut and polar area inner & outer radius is >= 0 2015-09-18 18:59:55 -04:00
Evert Timberg
db5066cd23 Remove core.responsive file. Responsiveness is added during initialization 2015-09-18 18:44:00 -04:00
Evert Timberg
52c1c09e16 Revert "Commit built version of scale algo changes"
This reverts commit a36a3f8c09.
2015-09-18 18:41:45 -04:00
Evert Timberg
bcbd9a85e6 Merge remote-tracking branch 'upstream/v2.0-dev' into feature/resize_problems
Conflicts:
	gulpfile.js
2015-09-18 18:38:47 -04:00
Tanner Linsley
677c249b61 Bar and combo support for time scale 2015-09-18 11:31:25 -06:00
Evert Timberg
723c85320f Unit tests for logarithmic scale. Fixed some issues in stacked mode since it's not possible for a 0 crossing to occur with a log scale. 2015-09-17 20:29:41 -04:00
Tanner Linsley
92682abbae Merge pull request #1459 from nnnick/v2.0-dev-feature-time-axis
V2.0 dev feature time axis
2015-09-17 15:54:44 -06:00
Evert Timberg
dd4a67e85c Merge pull request #1067 from rvaidya/master
Added a scaleBackgroundColors configuration option for radar charts, to...
2015-09-17 17:28:00 -04:00
Evert Timberg
a88d448fc8 Merge pull request #1458 from mennodekker/patch-1
Fixed issue #1163 hover.mode = 'dataset' no longer throws an error
2015-09-17 07:24:15 -04:00
Menno Dekker
5047678799 Tabs to spaces + fixed error 2015-09-17 10:08:42 +02:00
Menno Dekker
5ff2b530b9 Hover on dataset now works just like hover on label
Fixed some errors in de hover on dataset mode, only tested on bar charts
2015-09-17 09:43:02 +02:00
Tanner Linsley
2598446d54 Time Scale Rewrite 2015-09-15 11:40:01 -06:00
Tanner Linsley
c479022c20 Merge pull request #1456 from etimberg/feature/logarithmic_scale
Logarithmic scale
2015-09-14 18:58:17 -06:00
Evert Timberg
eb657bce36 Hide labels when the user returns null from the userCallback. This is the same as the category scale 2015-09-14 20:34:49 -04:00
Evert Timberg
c1f0a39982 Fixes to show all lines but not all labels. Added a variable in the template function to make debugging nicer. 2015-09-14 20:32:23 -04:00
Evert Timberg
e0cdfc6d2d Update logarithmic sample. Created a new logarithmic sample using AC circuit simulation data of an RLC filter. 2015-09-14 19:46:28 -04:00
Evert Timberg
b172a382f1 Remove dead code in logarithmic scale. Fixed a padding bug that had previously been fixed in the linear scale 2015-09-14 19:45:13 -04:00
Evert Timberg
77f90a85ef Merge remote-tracking branch 'upstream/v2.0-dev' into feature/logarithmic_scale 2015-09-14 18:59:52 -04:00
Evert Timberg
e6220f474b Attempting to make resize better 2015-09-14 18:50:52 -04:00