senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.com/aescape/lab_ui into v2

Browse Source
This commit is contained in:
Rohit
2019-07-10 14:23:43 -04:00
parent accffb70b3 a0629b9806
commit 56c8423d7f
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/app/components/coordinator/coordinator.html
View File

@@ -127,7 +127,7 @@
<div class="status-list"> <div class="status-list">
<div class="commanded"> <div class="commanded">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Commanded</div> <!-- <div class="progress-bar-label">Commanded</div> -->
<div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div> <div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
</div> </div>
<ul class="list-group list-group-horizontal text-center"> <ul class="list-group list-group-horizontal text-center">
@@ -144,7 +144,7 @@
</div> </div>
<div class="observed"> <div class="observed">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Observed</div> <!-- <div class="progress-bar-label">Observed</div> -->
<div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200"> <div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">
<span>N/A</span> <span>N/A</span>
<div> <div>
@@ -545,7 +545,7 @@
<div class="status-list"> <div class="status-list">
<div class="commanded"> <div class="commanded">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Commanded</div> <!-- <div class="progress-bar-label">Commanded</div> -->
<div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div> <div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
</div> </div>
<ul class="list-group list-group-horizontal text-center"> <ul class="list-group list-group-horizontal text-center">
@@ -562,7 +562,7 @@
</div> </div>
<div class="observed"> <div class="observed">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Observed</div> <!-- <div class="progress-bar-label">Observed</div> -->
<div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200"> <div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">
<span>N/A</span> <span>N/A</span>
<div> <div>

4
client/app/components/coordinator/js/ros_scripts.js
View File

@@ -372,9 +372,11 @@ var playbackStatus = new ROSLIB.Topic({
playbackStatus.subscribe(function(message) { playbackStatus.subscribe(function(message) {
message = JSON.parse(message.data); message = JSON.parse(message.data);
console.log("message");
console.log(message);
status = message.status; status = message.status;
bagName = message.bag_file; bagName = message.bag_file;
if (status != lastPlaybackStatus) { if (true) {
if (status === "playing") { if (status === "playing") {

5
client/app/main.css
View File

@@ -480,6 +480,11 @@ html, body {
background : #3671F9; background : #3671F9;
width: 100%; width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
height: 30px;
}
.slider-options .col-md-2 {
padding: 0px;
} }
.progress-bar { .progress-bar {

10
client/app/utilities/ros_scripts.js
View File

@@ -66,15 +66,7 @@ function disableUI() {
} }
document.querySelector('.dropdown').classList.add("disabled"); 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) { } catch(err) {
console.log(err); console.log(err);