Commit Graph

55 Commits

Author SHA1 Message Date
Maschell 686e85e525 Merge branch 'master' of https://github.com/F1Vis/f1vis
# Conflicts:
#	js/diagrams.js
2017-12-30 23:25:58 +01:00
Maschell 0f9cfa38e3 - Removed the unneeded area/area2 function
- The x axis does now scale correct
- The circle/point also scale
- code cleanup
- Fixed background grid
2017-12-30 23:22:43 +01:00
Jan Philipp Timme 93fb410ab5 Change type from area to line so lines don't drop on end 2017-12-30 22:45:10 +01:00
Maschell b21e7734f0 The X axis is now scaled correctly. 2017-12-30 20:59:31 +01:00
Maschell c0fd35ca66 Merge branch 'master' of https://github.com/F1Vis/f1vis 2017-12-30 20:49:53 +01:00
Marcel a7a850c2f3 Removed some magic values, increased the size of the small graph 2017-12-30 20:49:44 +01:00
sirsandmann cbb34ba930 Tried to add Zoom Behaviour 2017-12-30 20:35:39 +01:00
sirsandmann d337deb792 Corrected Context Graph 2017-12-30 20:13:36 +01:00
Jan Philipp Timme ad0a44ca3e Fix weird scaling 2017-12-30 19:44:51 +01:00
Jan Philipp Timme 89c770a308 Increase diagram width 2017-12-30 19:12:05 +01:00
Jan Philipp Timme b509dcebb2 Merge remote-tracking branch 'origin/Zoom_Branch' 2017-12-30 18:49:53 +01:00
sirsandmann 29f879bf5b Init with zooming and brushing 2017-12-30 18:48:54 +01:00
Jan Philipp Timme 18566d9bc2 Return dummy driver code in case qualifying data is not available 2017-12-30 18:15:25 +01:00
Jan Philipp Timme bf990a02c0 Add doubleclick event to prepare for adding animating expanding the chart 2017-12-30 14:00:26 +01:00
Jan Philipp Timme a0d405c710 Add very subtle grid lines on x axis 2017-12-30 13:26:15 +01:00
Jan Philipp Timme db72436ba6 Keep endpoints centered on mouseover 2017-12-30 13:14:40 +01:00
Jan Philipp Timme b641a188b1 Increase endpoint size 2017-12-30 13:09:45 +01:00
Jan Philipp Timme ecf4a56125 Fix missing animations on point mouse events 2017-12-30 12:33:11 +01:00
sirsandmann 002d8fcb90 Added simple Statistic structure. 2017-12-30 01:18:26 +01:00
Jan Philipp Timme c1d8b95aa0 Tooltip with dynamic height depending on text to display 2017-12-29 23:52:12 +01:00
Jan Philipp Timme 73536d4871 Do not add generic data points for pitstops 2017-12-29 23:48:22 +01:00
Jan Philipp Timme ab5a112c66 Make tooltip readable for pitstops 2017-12-29 23:24:57 +01:00
Jan Philipp Timme 8d77aea929 Make tooltip readable 2017-12-29 23:23:37 +01:00
Jan Philipp Timme 078094e779 Reduce opacity of lines when in background 2017-12-29 20:51:06 +01:00
Jan Philipp Timme 17539a5da4 Repair missing pit stop dots 2017-12-29 20:46:13 +01:00
Jan Philipp Timme 508e224883 Merge branch 'master' of github.com:F1Vis/f1vis 2017-12-29 17:13:27 +01:00
Jan Philipp Timme 9b3b8d9d59 Remove some console.log 2017-12-29 17:13:17 +01:00
Flo 9a94ac0cc3
Merge pull request #6 from F1Vis/flo_branch
Fixed undefined time texts
2017-12-29 17:13:16 +01:00
sirsandmann bc09c1eb17 Fixed undefined time texts 2017-12-29 17:12:01 +01:00
Jan Philipp Timme daa5246179 Fix courseselection 2017-12-29 17:11:02 +01:00
Flo 0846729561
Merge branch 'master' into flo_branch 2017-12-29 16:51:55 +01:00
sirsandmann 5d5e0d3d52 Added Rectangle Text for Endpoints 2017-12-29 16:42:41 +01:00
Jan Philipp Timme 36cecd401b Merge branch 'master' of github.com:F1Vis/f1vis 2017-12-29 16:28:45 +01:00
Jan Philipp Timme bbd92e3bda Enhance mouse experience 2017-12-29 16:28:34 +01:00
sirsandmann 6b2e74f292 Added right Y-Axis names for driver ended race 1 round after first 2017-12-29 14:20:58 +01:00
Flo 491a47cb28
Merge branch 'master' into flo_branch 2017-12-28 15:02:09 +01:00
sirsandmann 9877869f5b Added Rectangle for not regular ended races 2017-12-28 14:59:07 +01:00
Marcel f15c62f9a8 resolved merge conflict 2017-12-22 13:17:10 +01:00
Marcel f6134b16b9 fixed the queries.getRaceById function, the course selector does now update correctly 2017-12-22 13:13:52 +01:00
Jan Philipp Timme 42924dc2c3 Add some rough error handling to diagrams.js 2017-12-22 12:53:46 +01:00
sirsandmann 4eb25265c2 Added Tick Data for Y-Axis 2017-12-19 21:35:47 +01:00
sirsandmann e7a6131bfb Fixed Highlight Bug with Linepoints 2017-12-17 23:45:51 +01:00
Marcel 3ec19571ed Resolve merge conflict 2017-12-17 23:19:00 +01:00
sirsandmann 4f60b315f1 Resolved Merge Conflict 2017-12-17 23:11:54 +01:00
sirsandmann 6713b50716 Highlighting added. 2017-12-17 23:00:33 +01:00
Marcel 312aa854ac - (temporarily) disabled the loading window (until it's working properly..)
- changed the dimensons of the diagram. Now all mouseover text fit in
- Only show years with lapData.
- return arrays instead of objects in the preprocessor for the races and seaons
2017-12-17 10:38:48 +01:00
sirsandmann 20d3bdd1fb Added Circles for Pitstops and Hover Behaviour with text, depending on Pitstop or normal line Data. 2017-12-16 21:54:07 +01:00
sirsandmann da3c852058 Modified EnhancedLapData per Driver, added Dots and simple Hover Logic 2017-12-16 01:18:24 +01:00
Marcel 720bdb713d added a new data structure 2017-12-15 14:00:44 +01:00
sirsandmann 9fcee3e8cf Added Pitstoppoints 2017-12-13 00:12:11 +01:00