changed call to service rather than publisher for start playing

client/app/components/coordinator/coordinator.html

@@ -127,7 +127,7 @@
                                         <div class="status-list">
                                             <div class="commanded">
                                                 <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>
                                                 <ul class="list-group list-group-horizontal text-center">
@@ -144,7 +144,7 @@
                                             </div>
                                             <div class="observed">
                                               <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">
                                                       <span>N/A</span>
                                                       <div>
@@ -351,13 +351,16 @@
                                 </div>
                                 <div class="panel-body text-center">
                                     <div class="button-area">
-                                        <button id="executionLoadButton" type="button" onclick="displayLoadingOptions()" class="btn btn-primary col-md-4">
+                                        <button id="executionLoadButton" type="button" onclick="displayLoadingOptions()" class="btn btn-primary col-md-3">
                                             Load Recording
                                         </button>
-                                        <button id="executionStartButton" type="button" onclick="playLoadedRecording()" class="btn btn-primary col-md-4">
+                                        <button id="executionLoadButton" type="button" onclick="triggerService('/aescape/massageReady')" class="btn btn-primary col-md-3">
+                                            Complete Body Scaling
+                                        </button>
+                                        <button id="executionStartButton" type="button" onclick="playLoadedRecording()" class="btn btn-primary col-md-3">
                                             Play Loaded Recording
                                         </button>
-                                        <button id="executionStopButton" type="button" onclick="stopPlayingRecording()" class="btn btn-primary col-md-4">
+                                        <button id="executionStopButton" type="button" onclick="stopPlayingRecording()" class="btn btn-primary col-md-3">
                                             Stop Playing Recording
                                         </button>
                                     </div>
@@ -545,7 +548,7 @@
                                                 <div class="status-list">
                                                     <div class="commanded">
                                                         <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>
                                                         <ul class="list-group list-group-horizontal text-center">
@@ -562,7 +565,7 @@
                                                     </div>
                                                     <div class="observed">
                                                       <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">
                                                               <span>N/A</span>
                                                               <div>

client/app/components/coordinator/js/ros_scripts.js

@@ -372,13 +372,16 @@ 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") {
 
     } else if (status === "stopped") {
+      triggerService('/aescape/bags/stopPlayingBag');
       triggerService('/left/aescape/mode/activateReadyController');
       triggerService('/right/aescape/mode/activateReadyController');
       displayTaggingOptions('play');
@@ -388,7 +391,6 @@ playbackStatus.subscribe(function(message) {
       triggerService('/right/aescape/mode/activateReadyController');
       displayMessage(true, "Loaded the selected bag file!")
     }
-    lastPlaybackStatus = status;
   }
 });
 
@@ -577,7 +579,8 @@ function startTeachRecoding() {
   async.waterfall([
       function(callback) {
           triggerService('/left/aescape/hardware/calibrateRobotiq', false, function(err, res){
-            callback(err, res);
+            //callback(err, res);
+            callback(null, null);
           });
       },
       function(response, callback) {

client/app/components/coordinator/js/update_guis.js

@@ -89,11 +89,9 @@ function displayTaggingOptions(mode) {
   fileNameSelectize.clearOptions()
   // /aescape/bags/getBagList
   getBagList(function(results){
-    fileNameSelectize.addOption(results.map(function(element){
+    fileNameSelectize.addOption(results)
-      return {name : element.filename}
-    }));
     if(results[0]) {
-      fileNameSelectize.setValue(results[0].filename);
+      fileNameSelectize.setValue(results[0]._id);
     }
   })
   
@@ -141,7 +139,7 @@ function hideTaggingOptions(mode, updateValues=false) {
   }
 
   var modeTag = '#' + mode + 'Tags';
-  var fileNameSelector = '#' + mode + 'BagFileName';
+  var bagLabelSelector = '#' + mode + 'BagFileName';
   var categorySelector = '#' + mode + 'BagCategory';
   var tagSelector = '#' + mode + 'BagTags';
   var errorSelector = '#' + mode + 'TagError';
@@ -149,24 +147,23 @@ function hideTaggingOptions(mode, updateValues=false) {
 
 
   if(updateValues) {
-    var filename = $(fileNameSelector).val();
+    var bagLabel = $(bagLabelSelector).val();
     var category = $(categorySelector).val();
-    var tags = $(tagSelector).val();
+    var tags = $(tagSelector).val() || [];
 
     getBagList(function(results){
-      if(!(results && results[0] && results[0].filename)) {
+      if(!(results && results[0] && results[0]._id)) {
-        console.log(results);
         displayMessage(false, "Could not retrieve the last recorded bag :(");
         return;
       }
-      bag_name = results[0].filename;
+      bag_id = results[0]._id;
-      updateBagMetadata(mode, bag_name, filename, category, tags, function(updateError) {
+      updateBagMetadata(mode, bag_id, bagLabel, category, tags, function(updateError) {
         if(updateError) {
           displayMessage(flase, updateError);
         } else {
           displayMessage("Bag data saved successfully!");
           //clear selectize
-            $(fileNameSelector).selectize()[0].selectize.destroy();
+            $(bagLabelSelector).selectize()[0].selectize.destroy();
             $(categorySelector).selectize()[0].selectize.destroy();
             $(tagSelector).selectize()[0].selectize.destroy();
         }
@@ -178,18 +175,18 @@ function hideTaggingOptions(mode, updateValues=false) {
   document.querySelector(modeTag).classList.remove('open');
 }
 
-function updateBagMetadata(mode, bag_name, modified_bag_name, category, tags, callback) {
+function updateBagMetadata(mode, bag_id, bag_label, category, tags, callback) {
   if(!mode) {
     return callback();
   }
-  if(!bag_name) {
+  if(!bag_id) {
     return callback();
   }
 
   var toSend = {
     mode : mode, 
-    bag_name : bag_name, 
+    bag_id : bag_id, 
-    modified_bag_name : modified_bag_name, 
+    bag_label : bag_label, 
     category : category, 
     tags : tags
   }
@@ -214,32 +211,33 @@ function displayLoadingOptions() {
   //Putting this in a timeout to wait for the animation to finish completing
   setTimeout(function(){
     document.querySelector(selector).style.overflow = "visible";
-  }, 420)
+  }, 420) //This is not a Hitchhiker's reference. This is not a 420 reference. This value has been computed to match the speed of the larger drop down.
 
     var $select = $('#loadBagList').selectize({
-      valueField: 'filename',
+      valueField: '_id',
-      labelField: 'filename',
+      labelField: 'name',
-      searchField: ['filename', 'category', 'tags'],
+      searchField: ['name', 'category', 'tags'],
       options: [], 
       create: false,
       placeholder : "Select bag to play", 
       render : {
         item: function(item, escape) {
-          filename = item.filename;
+          name = item.name;
           category = item.category || 'None';
             return '<div class="bag-select-element">' +
               '<div class="bag-select-element">' +
-                '<span class="filename">' + escape(filename) + '</span>' +
+                '<span class="filename">' + escape(name) + '</span>' +
                 '<span class="category">' + ' (' + escape(category)  + ') ' + '</span>' + 
               '</div>' + 
             '</div>';
         },
         option: function(item, escape) {
-            filename = item.filename;
+
+            name = item.name;
             category = item.category || 'None';
             return '<div class="bag-select-element bag-option">' +
               '<div class="primary">' + 
-                '<div class="filename">' + escape(filename) + '</div>' +
+                '<div class="filename">' + escape(name) + '</div>' +
                 '<div class="category">' + escape(category) + '</div>' + 
               '</div>' + 
               '<div class="secondary">' + 
@@ -248,7 +246,7 @@ function displayLoadingOptions() {
                     return '<span class="tag label label-info">' + escape(tag) + '</span>' 
                   }).join(' ') + 
                 '</div>' +
-                '<div class="timestamp">' + escape('27 Jun 10:10am')  + '</div>' + 
+                '<div class="timestamp">' + escape(item.created_at)  + '</div>' + 
               '</div>' + 
             '</div>';
         }
@@ -263,6 +261,7 @@ function displayLoadingOptions() {
       var selectize = $select[0].selectize;
       selectize.clearOptions();
       //results = [{filename : 'testfile', category: 'testcategory', tags : ['testtag1', 'testtag2', 'testtag3']}, {filename : 'testfile2', category: 'testcategory2', tags : ['testtag21', 'testtag22', 'testtag23']}]
+      console.log(results);
       selectize.addOption(results);
       if(results[0]) {
         selectize.setValue(results[0].filename);
@@ -293,12 +292,10 @@ function hideLoadingOptions(loadBag) {
     singleArmMode = false
   }
 
-  console.log("singleArmMode");
-  console.log(singleArmMode)
   if(loadBag) {
-    var selectedBagName = $('#loadBagList').val();
+    var selectedBagId = $('#loadBagList').val();
     disableUI();
-    loadSelectedBagFile(selectedBagName, singleArmMode, function(updateError){
+    loadSelectedBagFile(selectedBagId, singleArmMode, function(updateError){
       // if(updateError) {
       //   displayMessage(false, "Something went wrong in the backend while fetching the bag files :(")
       // } else {
@@ -314,21 +311,22 @@ function hideLoadingOptions(loadBag) {
 
 
 
-function loadSelectedBagFile(selectedBagName, singleArmMode, callback) {
+function loadSelectedBagFile(selectedBagId, singleArmMode, callback) {
   var toSend = {
-    bag_name : selectedBagName, 
+    bag_id : selectedBagId, 
     single_arm : singleArmMode
   }
 
-  // triggerService('/aescape/bags/startPlayingRecording', toSend, function(error, result) {
+  triggerService('/aescape/bags/startPlayingRecording', toSend, function(error, result) {
-  //   if(!result) {
+    if(!result) {
-  //     return callback("Something went wrong in the backend while updating.");
+      return callback("Something went wrong in the backend while updating.");
-  //   }
+    }
-  //   else {
+    else {
-  //     return callback();
+      return callback();
-  //   }
+    }
-  // })
+  })
 
+  /*
   var toSendString = JSON.stringify(toSend);
 
   var topic = new ROSLIB.Topic({
@@ -340,6 +338,7 @@ function loadSelectedBagFile(selectedBagName, singleArmMode, callback) {
   var msg = new ROSLIB.Message({data:toSendString});
 
   topic.publish(msg);
+  */
 }
 
 

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 {

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);

client/index.html

@@ -38,6 +38,7 @@
         }
         </script>
 
+        <!-- TO DO: Use requirejs to reliably load these all the dependancies in order -->
         <script>
             $(function(){
                 $("#coordinatorContent").load("app/components/coordinator/coordinator.html");