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.

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

Graph interface and capability enhancements #17

Merged
merged 2 commits into from Dec 28, 2017

Conversation

CDuffers
Copy link
Contributor

Include options for stacking, reordering feeds and storing CSV display options.
Graph changes when stacked:
image

Feed list changes (reorder feeds arrows & stack):
image

CSV Output changes (CSV Headers):
image

embed.php:
Include flot.stack to support stacked graphs

view.php:
Include flot.stack to support stacked graphs
Add column within feed-options-table to support move up/ down within the table
Add "CSV Headers" option within CSV output

graph.js:
Change Tooltip to adhere to the DP settings for each
Extracted CSV show/ hide into a new function (csvShowHide) to support setting this at graph load
Added function arrayMove() to support the re-ordering of feeds (particularly useful when stacking series)
Page responses to new items (stack, csvtimeformat, csvnullvalues, csvheaders)
Changed pushfeedlist() to set decimal places to 1 if datatype=2 or the first value found is an integer (e.g. power feeds), this could be fooled with a lucky first entry being an integer, but as the user can change this, potentially an acceptable approach
Changed graph_reload() to support stacking series and changed fill opacity to 1 if series is stacked bars, 0.5 if 'fill', else 0
Changed graph_draw() to
1. include move up/ down controls and stack options per feed
2. set stats to show to specified DP
Change printcsv() to:
1. exit cleanly if no data is specified yet
2. display header line
When #graph-select changed:
1. read CSV header settings and set defaults if not defined
2. set the CSV setting drop downs to show the saved details
When #graph-save changed include the CSV settings within the array to be stored
…te_enhancements

Remote updates being pulled into local
@glynhudson glynhudson merged commit f1160f2 into emoncms:master Dec 28, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants