Issue #105 - Update highcharts plot function for JSON formatted packet

NASA-AMMOS · May 19, 2020 · 9f48361 · 9f48361
1 parent ebd3d67
commit 9f48361
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/ait/gui/__init__.py b/ait/gui/__init__.py
@@ -660,8 +660,6 @@ def handle():
                     if v.uid == uid:
                         pkt_defn = v
                         break
-                else:
-                    continue
 
                 wsock.send(json.dumps({
                     'packet': pkt_defn.name,
@@ -705,8 +703,6 @@ def handle():
                         if v.uid == uid:
                             pkt_defn = v
                             break
-                    else:
-                        continue
 
                     wsock.send(json.dumps({
                         'packet': pkt_defn.name,

diff --git a/ait/gui/static/js/ait/gui/Plot.js b/ait/gui/static/js/ait/gui/Plot.js
@@ -208,17 +208,18 @@ class HighchartsBackend
         Object.assign(options, overrides)
     }
 
-    plot(delta) {
-        const pname = delta['packet']
+    plot(data) {
+        const pname = data['packet']
+        let delta = data['data']
         const names = this._plot._packets[pname]
         if (!names) return
 
         names.forEach( (name) => {
             const series = this._plot._chart.get(pname + '.' + name)
 
             if (series) {
-                const x = this._plot._time.get(packet).getTime()
-                const y = packet.__get__(name)
+                const x = this._plot._time.get(delta).getTime()
+                const y = delta[name]
 
                 series.addPoint([x, y], false)