diff --git a/client/app/components/coordinator/coordinator.html b/client/app/components/coordinator/coordinator.html index 81902d7..0f19bf4 100644 --- a/client/app/components/coordinator/coordinator.html +++ b/client/app/components/coordinator/coordinator.html @@ -127,7 +127,7 @@
-
Commanded
+
N/A
-
Observed
+
N/A
@@ -545,7 +545,7 @@
-
Commanded
+
N/A
    @@ -562,7 +562,7 @@
-
Observed
+
N/A
diff --git a/client/app/components/coordinator/js/ros_scripts.js b/client/app/components/coordinator/js/ros_scripts.js index 3eb13ff..c5079a3 100644 --- a/client/app/components/coordinator/js/ros_scripts.js +++ b/client/app/components/coordinator/js/ros_scripts.js @@ -372,9 +372,11 @@ var playbackStatus = new ROSLIB.Topic({ playbackStatus.subscribe(function(message) { message = JSON.parse(message.data); + console.log("message"); + console.log(message); status = message.status; bagName = message.bag_file; - if (status != lastPlaybackStatus) { + if (true) { if (status === "playing") { diff --git a/client/app/main.css b/client/app/main.css index 72b7274..cb0de41 100644 --- a/client/app/main.css +++ b/client/app/main.css @@ -480,6 +480,11 @@ html, body { background : #3671F9; width: 100%; margin-bottom: 10px; + height: 30px; + } + + .slider-options .col-md-2 { + padding: 0px; } .progress-bar { diff --git a/client/app/utilities/ros_scripts.js b/client/app/utilities/ros_scripts.js index c1e1c10..de6e9f4 100644 --- a/client/app/utilities/ros_scripts.js +++ b/client/app/utilities/ros_scripts.js @@ -66,15 +66,7 @@ function disableUI() { } document.querySelector('.dropdown').classList.add("disabled"); - document.querySelectorAll('.force-bar .force-value span').forEach(function(element){ - element.innerHTML = 0.0 - }); - - document.querySelectorAll('.force-bar .progress-bar').forEach(function(element){ - element.style.width = totalForcePercent + "%"; - element.innerHTML = totalForce + " N"; - element.setAttribute('aria-valuenow', totalForce); - }); + } catch(err) { console.log(err);