From d6bfdfe4fa1a6c420cca4fe08e0205e41ac886a2 Mon Sep 17 00:00:00 2001
From: SaloniGoyal
Date: Mon, 20 Jun 2016 11:34:23 +0530
Subject: Client can pick x-axis and y-axis for plot
---
views/schematic.html | 24 +++++++++++--
views/script/form.js | 89 +++++++++++++++++++++++++++--------------------
views/script/gui.js | 6 +++-
views/style/schematic.css | 8 +++--
4 files changed, 84 insertions(+), 43 deletions(-)
diff --git a/views/schematic.html b/views/schematic.html
index 2669304..c8d7e8d 100644
--- a/views/schematic.html
+++ b/views/schematic.html
@@ -17,7 +17,7 @@
-
+
@@ -144,10 +144,28 @@ make chips
-
+
+
-
diff --git a/views/script/form.js b/views/script/form.js
index 11bf6e1..1c9512b 100644
--- a/views/script/form.js
+++ b/views/script/form.js
@@ -4,51 +4,66 @@ socket.on("plotData",function(data){
var keys = Object.keys(data);
var traceObj = {};
var traces = [];
-
+ var abscissa, ordinate;
console.log(Object.keys(data));
+ $('webtronics_plot_keys').innerHTML = "Available keys: " + Object.keys(data);
+
//Dynamically creating traces
- for(var i=0; i*{
}
#webtronics_graph_display{
- width:500px;
- height:300px;
+ width:520px;
+ height:310px;
}
+/*
+#webtronics_plot_cancel{
+ float: right;
+}*/
#webtronics_chips_box>*{
float:left;
--
cgit