c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

clear channel feeds more efficiently; add spline type to charts

Browse Source
This commit is contained in:
Lee Lawlor
2014-04-03 23:08:00 -04:00
parent 99fe498041
commit a59507718d
9 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/charts/_config.html.erb
View File

@ -28,6 +28,7 @@
<option>line</option>
<option>bar</option>
<option>column</option>
<option>spline</option>
</select>
</td>
</tr>
@ -171,7 +172,7 @@
// draw initial chart with saved options
var width = <%= (@width) ? @width : 450 %>;
var height = <%= @height ? @height : 260 %>;
updateChart(<%= index %>, false, width, height, <%= @channel.id %>);
updateChart(<%= index %>, false, width, height, <%= @channel.id %>);
});
@ -179,7 +180,7 @@
$('#button<%= index %>').click(function() {
var width = <%= (@width) ? @width : 450 %>;
var height = <%= @height ? @height : 260 %>;
updateChart(<%= index %>, true, width, height, <%= @channel.id %>);
updateChart(<%= index %>, true, width, height, <%= @channel.id %>);
});
@ -192,5 +193,6 @@
$(this).val(selectedValue);
});
</script>

3
app/views/charts/show.html.erb
View File

@ -121,6 +121,9 @@
column: {
color: '<%= params[:color] || "#d62020" %>'
},
spline: {
color: '<%= params[:color] || "#d62020" %>'
},
series: {
marker: {
radius: 3