Euler angles-based grid

stelian56 · Feb 20, 2015 · 8fd0256 · 8fd0256
1 parent 025a0d8
commit 8fd0256
Show file tree

Hide file tree

Showing 11 changed files with 1,538 additions and 1,229 deletions.
diff --git a/bmconfig.json b/bmconfig.json
@@ -4,14 +4,9 @@
         "maxUpdateRate": 100,
         "readings": [
             {
-                "name": "quat",
-                "command": "getTaredOrientationAsQuaternion",
-                "components": ["q0", "q1", "q2", "q3"]
-            },
-            {
-                "name": "acc",
-                "command": "getCorrectedAccelerometerVector",
-                "components": ["x", "y", "z"]
+                "name": "angles",
+                "command": "getTaredOrientationAsEulerAngles",
+                "components": ["pitch", "yaw", "roll"]
             }
         ]
     },

diff --git a/bmserver.py → bodymusic.py b/bmserver.py → bodymusic.py
@@ -16,7 +16,6 @@
 
 config_file_name = "bmconfig.json"
 log_dir = "log"
-log_file_regex = re.compile(".+\.(.+)\.log")
 
 class BMHttpHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def __init__(self, on_start, on_stop, on_playback, *args):
@@ -165,15 +164,19 @@ def __init__(self, config, update_rate, on_sensor_data, stop_event):
         self.sensors = None
 
     def create_log_file(self):
-        file_names = glob.glob("%s/*.log" % log_dir)
+        today = datetime.date.today()
+        file_names = glob.glob("%s/%s.*.log" % (log_dir, today))
         file_count = len(file_names)
-        suffix = "1"
+        suffix = 1
         if file_count > 0:
-            file_names.sort()
-            last_file_name = file_names.pop()
-            match = log_file_regex.match(last_file_name)
-            suffix = int(match.group(1)) + 1
-        file_path = "%s/%s.%s.log" % (log_dir, datetime.date.today(), suffix)
+            regex = re.compile(".+\.(.+)\.log")
+            suffixes = []
+            for file_name in file_names:
+                match = regex.match(file_name)
+                suffixes.append(int(match.group(1)))
+            suffixes.sort()
+            suffix = suffixes.pop() + 1
+        file_path = "%s/%s.%s.log" % (log_dir, today, suffix)
         dir_name = os.path.dirname(file_path)
         if not os.path.exists(dir_name):
             os.makedirs(dir_name)
@@ -183,7 +186,6 @@ def init(self):
         self.log_file = self.create_log_file()
         if not self.log_file:
             return False
-        print "Started logging to %s" % self.log_file.name
         device_list = api.getComPorts(filter = api.TSS_FIND_DNG|api.TSS_FIND_WL)
         for device_port in device_list:
             com_port, device_name, device_type = device_port
@@ -231,6 +233,7 @@ def init(self):
             eval(expression)
             sensor.startStreaming()
         print "Started sensors at update rate %dHz" % self.update_rate
+        print "Started logging to %s" % self.log_file.name
         return True
 
     def stop(self):

diff --git a/css/bm.css b/css/bm.css
diff --git a/css/bodymusic.css b/css/bodymusic.css
@@ -0,0 +1,75 @@
+body {
+margin: 10px;
+}
+.bodymusic_ribbon  {
+width: 100%;
+margin-top: 10px;
+margin-bottom: 10px;
+}
+.bodymusic_legendicon {
+display: inline-block;
+width: 15px;
+height: 15px;
+margin-left: 15px;
+}
+.bodymusic_legendlabel {
+margin-left: 3px;
+}
+.bodymusic_staff {
+position: relative;
+width: 100%;
+border: 1px solid black;
+}
+.bodymusic_plot {
+position: relative;
+width: 100%;
+margin: -1px 0 0 0;
+border: 1px solid black;
+z-index: 1;
+}
+.bodymusic_veil {
+position: absolute;
+top: 0;
+left: 0;
+right: 0;
+height: 100%;
+margin: 0;
+background-color: black;
+opacity: 0.3;
+}
+.bodymusic_tooltip {
+position: absolute;
+display: none;
+padding: 5px;
+background-color: #ffffcc;
+border: 1px solid black;
+z-index: 2;
+}
+svg {
+width: 100%;
+height: 100%;
+}
+line {
+display: none;
+}
+circle {
+display: none;
+}
+ellipse {
+display: none;
+}
+text {
+font-size: 0.9em;
+}
+.bodymusic_updaterate {
+    margin-left: 5px;
+    margin-right: 10px;
+    width: 60px;
+}
+.bodymusic_logfile {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+.bodymusic_button {
+    margin-right: 10px;
+}
diff --git a/html/bm.html b/html/bm.html
diff --git a/html/bodymusic.html b/html/bodymusic.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<script src="/js/jquery-2.1.1.js"></script>
+<script src="/js/bodymusic.js"></script>
+<link rel="stylesheet" type="text/css" href="/css/bodymusic.css"/>
+<title>Body Music</title>
+</head>
+
+<body/>
+
+</html>
diff --git a/html/play.html b/html/play.html
diff --git a/js/bm.js b/js/bm.js