Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scale rewrite for v2.0 #1132

Merged
merged 29 commits into from
May 26, 2015
Merged

Scale rewrite for v2.0 #1132

merged 29 commits into from
May 26, 2015

Commits on May 16, 2015

  1. Some helper functions needed for better scales.

    @etimberg
    etimberg committed May 16, 2015
    Configuration menu
    Copy the full SHA
    b5b0081 View commit details
    Browse the repository at this point in the history

  2. Initial check in of the scale service and the scale constructor regis… 

    …tration. An initial implementation of a linear scale that can be drawn in both horizontal and vertical orientations.
    @etimberg
    etimberg committed May 16, 2015
    Configuration menu
    Copy the full SHA
    db1365c View commit details
    Browse the repository at this point in the history

Commits on May 17, 2015

  1. Add a scatter chart sample

    @etimberg
    etimberg committed May 17, 2015
    Configuration menu
    Copy the full SHA
    d7ad5b6 View commit details
    Browse the repository at this point in the history

  2. Initial implementation of a scatter chart. Uses a new style of config… 

    … from the other charts. For now, the config is not changeable.
    @etimberg
    etimberg committed May 17, 2015
    Configuration menu
    Copy the full SHA
    67b3d32 View commit details
    Browse the repository at this point in the history

  3. Ensure that you always have at least 2 ticks on the linear axis

    @etimberg
    etimberg committed May 17, 2015
    Configuration menu
    Copy the full SHA
    56d53e3 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2015

  1. Fix jshint warnings

    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    454f519 View commit details
    Browse the repository at this point in the history

  2. Remove x label rotation code since we dynamically adjust the number o… 

    …f labels to show and as such do not need to rotate
    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    492292e View commit details
    Browse the repository at this point in the history

  3. The scatter example page now has negative numbers in both directions

    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    e30a9d2 View commit details
    Browse the repository at this point in the history

  4. Handle the beginAtZero option for a linear scale. Added a helper for … 

    …Math.sign
    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    2e383da View commit details
    Browse the repository at this point in the history

  5. Linear scale drawing improvements. Ensured that the scatter plot conf… 

    …iguration has a different line colour for the 0 axis
    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    a6e2eec View commit details
    Browse the repository at this point in the history

  6. Fix an error in the scale service that prevented the chart from filli… 

    …ng the canvas fully.
    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    f206526 View commit details
    Browse the repository at this point in the history

  7. Initial config merge. Handles special cases for objects and arrays an… 

    …d 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.
    @etimberg
    etimberg committed May 18, 2015
    Configuration menu
    Copy the full SHA
    676765e View commit details
    Browse the repository at this point in the history

Commits on May 19, 2015

  1. Created a multi axis sample file. Added an option to draw ticks for t… 

    …he 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.
    @etimberg
    etimberg committed May 19, 2015
    Configuration menu
    Copy the full SHA
    978ed1b View commit details
    Browse the repository at this point in the history

  2. Fix a drawing bug when drawTicks is false.

    @etimberg
    etimberg committed May 19, 2015
    Configuration menu
    Copy the full SHA
    4b8c9bc View commit details
    Browse the repository at this point in the history

  3. Clean up the scale service. It's now more of a helper function for fi… 

    …tting 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
    @etimberg
    etimberg committed May 19, 2015
    Configuration menu
    Copy the full SHA
    4cc24d4 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2015

  1. Set new tooltip templates for the scatter chart

    @etimberg
    etimberg committed May 20, 2015
    Configuration menu
    Copy the full SHA
    008bb1a View commit details
    Browse the repository at this point in the history

  2. Initial dataset scale class

    @etimberg
    etimberg committed May 20, 2015
    Configuration menu
    Copy the full SHA
    ed4b994 View commit details
    Browse the repository at this point in the history

  3. 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.
    @etimberg
    etimberg committed May 20, 2015
    Configuration menu
    Copy the full SHA
    12e2ace View commit details
    Browse the repository at this point in the history

Commits on May 23, 2015

  1. Rename onHover to events to match the line chart

    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    b7606c7 View commit details
    Browse the repository at this point in the history

  2. dataset axis to be used in the line chart and the bar chart

    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    c66edc9 View commit details
    Browse the repository at this point in the history

  3. Ensure consistency in the helpers.toRadians name

    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    a559ab8 View commit details
    Browse the repository at this point in the history

  4. Move line chart over to use new scale config. This adds support for m… 

    …ultiple y axes. Added an example demonstrating this.
    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    d998c80 View commit details
    Browse the repository at this point in the history

  5. Fix line chart multi axis sample title

    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    181e866 View commit details
    Browse the repository at this point in the history

  6. Use correct tooltip events in each chart

    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    a10e245 View commit details
    Browse the repository at this point in the history

  7. Bar chart converted to new scale system. Added bar chart multi axis s… 

    …ample.
    @etimberg
    etimberg committed May 23, 2015
    Configuration menu
    Copy the full SHA
    b67afcd View commit details
    Browse the repository at this point in the history

Commits on May 24, 2015

  1. Remove old linear scale

    @etimberg
    etimberg committed May 24, 2015
    Configuration menu
    Copy the full SHA
    73b579c View commit details
    Browse the repository at this point in the history

  2. Clean up some unused config options. Renamed 'show' to 'display' for … 

    …scales since that was clearer and maintains backwards compatibility.
    @etimberg
    etimberg committed May 24, 2015
    Configuration menu
    Copy the full SHA
    d4e7765 View commit details
    Browse the repository at this point in the history

  3. Fix the y scales that were missed in the previous check in

    @etimberg
    etimberg committed May 24, 2015
    Configuration menu
    Copy the full SHA
    1352dfe View commit details
    Browse the repository at this point in the history

  4. Moved radial scale into Chat.Scale.js. Registered as "radialLinear" w… 

    …hich 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
    @etimberg
    etimberg committed May 24, 2015
    Configuration menu
    Copy the full SHA
    a2d477a View commit details
    Browse the repository at this point in the history