planarian

test_tube_scanner/scanner/static/scanner/js/main.js

@@ -22,7 +22,7 @@ class ScannerManager {
         this.axial_pos    = options.axial_pos; 
         this.area_px      = options.area_px; 
         this.frame_count  = options.frame_count; 
-        this.uuid  = options.uuid; 
+        this.scan_state   = options.scan_state;
     }
 
     init_controls() {
@@ -43,6 +43,8 @@ class ScannerManager {
             if (payload.xy)     { this.x.textContent=payload.x.toFixed(2); this.y.textContent=payload.y.toFixed(2); }
             if (payload.state)  { this.debug.insertAdjacentHTML('afterbegin', `<li>[ ${++this.debug_count} - ${payload.state} ]: ${payload.msg}</li>`); }
             if (payload.ts)     { this.ts.textContent = timestampToLocalISOString(payload.ts); }
+            if (payload.scan_state)   { this.scan_state.textContent=payload.scan_state;}
+
             if (payload.detected && use_tracking) { 
                 this.cx.textContent = payload.cx; this.cy.textContent = payload.cy;
                 this.speed_px_s.textContent = payload.speed_px_s; 

test_tube_scanner/scanner/static/scanner/js/stats.js

@@ -4,6 +4,7 @@
     const mem_used = sId('mem-used');
     const disk_used = sId('disk-used');
     const ramdisk_used = sId('ramdisk-used');
+    const swap_used = sId('swap-used');
 
     let autoTimer = null;
 
@@ -12,10 +13,11 @@
             const r = await fetch(stats_endpoint, { credentials: 'same-origin' });
             if (!r.ok) throw new Error('HTTP ' + r.status);
             const j = await r.json();
-            //console.log(j);
             const cpu_percent = j.cpu_info.cpu_percent+'%'; cpu_used.style.setProperty("--cpu-used", cpu_percent); cpu_used.title=`Cpu: ${cpu_percent}`;
             const shm_length = j.shm.length; shm_used.style.setProperty("--shm_used", shm_length);  shm_used.title= `Shm: ${shm_length}`;
-            const virtual_memory = j.memory_info.virtual_memory.percent+'%'; mem_used.style.setProperty("--mem-used", virtual_memory); mem_used.title=`Mem: ${virtual_memory}`;
+            const virtual_memory = j.memory_info.virtual_memory.percent+'%'; mem_used.style.setProperty("--mem-used", virtual_memory); mem_used.title=`Mem: ${virtual_memory}`; 
+            const swap_memory =    j.memory_info.swap_memory.percent+'%'; swap_used.style.setProperty("--swap-used", swap_memory); swap_used.title=`swap: ${swap_memory}`;
+
             const root_percent = j.disk_info.root.percent+'%'; disk_used.style.setProperty("--disk-used", root_percent); disk_used.title=`Disk: ${root_percent}`;
             let ramdisk_percent = "0%";
             if (! j.ramdisk_info)  ramdisk_percent = j.ramdisk_info.percent+'%';