Fix axes inversion

Author: Madison May

__init__.py

@@ -0,0 +1,3 @@
+import sys
+
+sys.dont_write_bytecode = True

client.py

@@ -13,6 +13,8 @@
 import multiprocessing
 import monitor
 import config
+#!/usr/bin/env python -B
+
 import json
 import db
 
@@ -27,7 +29,6 @@ class DataHandler(tornado.web.RequestHandler):
 
     @tornado.web.asynchronous
     def get(self, datatype):
-        print datatype
         data = db.last(datatype, 50)
         data.addCallback(self.on_response)
 
@@ -75,7 +76,6 @@ def poll_monitor():
         try:
             if not result_queue.empty():
                 result = result_queue.get()
-                print "Reading: " + str(result)
                 for c in clients:
                     c.write_message(json.dumps(result))
         except KeyboardInterrupt:

config.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python -B
+
 import os
 csv_root = 'static/csvs/'
 csv_header = "Timestamp,Measurement\n"

db.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python -B
+
 import sqlite3, config, time
 from twisted.enterprise import adbapi 
 

monitor.py

@@ -1,4 +1,7 @@
+#!/usr/bin/env python -B
+
 import time, msgpack, multiprocessing, socket, config, csv, os, os.path, db, sys
+import pprint
 
 class Monitor(multiprocessing.Process):
 

monitor.pyc

@@ -1,3 +1,5 @@
+#!/usr/bin/env python -B
+
 import socket, os, os.path, time
 import random, msgpack, config, sys
 import time

server.py

@@ -1,4 +1,4 @@
-var csv_data = [
+var raw_data = [
   {
     key: "Temperature",
     values: [],
@@ -15,11 +15,11 @@ datatype_mapping = ["Temperature", "RelativeHumidity"]
 
 var datatype_index = {}
 
-var initial = csv_data.length;
+var initial = raw_data.length;
 var remaining = initial;
 
 for (var i=0; i<remaining; i++) {
-  datatype_index[csv_data[i].key] = i;
+  datatype_index[raw_data[i].key] = i;
 }
 
 function plot() {
@@ -35,7 +35,7 @@ function plot() {
         .tickFormat(d3.format(',.2f'));
 
     d3.select('#chart svg')
-        .datum(csv_data)
+        .datum(raw_data)
       .transition().duration(500)
         .call(chart);
 
@@ -53,9 +53,9 @@ function plot() {
     var data = JSON.parse(evt.data);
     var type = datatype_mapping[data.DataType];
     var index = datatype_index[type];
-    csv_data[index].values.unshift({x: data.Timestamp, y: data.Measurement});
+    raw_data[index].values.unshift({x: data.Timestamp, y: data.Measurement});
     d3.select('#chart svg')
-              .datum(csv_data)
+              .datum(raw_data)
               .transition().duration(0)
               .call(chart);
   };
@@ -65,14 +65,14 @@ function plot() {
 // load csvs in parallel
 for (var i=0; i<initial; i++) {
   (function(i) {
-    var key = csv_data[i].key;
+    var key = raw_data[i].key;
     $.get("/data/" + key, function(data){
       data = JSON.parse(data);
       console.log(data);
       data.forEach(function (tuple){
         var type = datatype_mapping[i];
         var index = datatype_index[type]
-        csv_data[index].values.push({x: tuple[0], y: tuple[1]});
+        raw_data[index].values.push({x: tuple[1], y: tuple[2]});
       })    
 
       remaining--;