2 Commits
v2 ... develop

Author SHA1 Message Date
Matt DiCicco
1cf300f0c4 changed call to service rather than publisher for start playing 2019-07-18 14:49:56 -04:00
Matt DiCicco
9d05da0b48 fixes 2019-07-15 22:02:21 -04:00
2 changed files with 12 additions and 9 deletions

View File

@@ -381,6 +381,7 @@ playbackStatus.subscribe(function(message) {
if (status === "playing") { if (status === "playing") {
} else if (status === "stopped") { } else if (status === "stopped") {
triggerService('/aescape/bags/stopPlayingBag');
triggerService('/left/aescape/mode/activateReadyController'); triggerService('/left/aescape/mode/activateReadyController');
triggerService('/right/aescape/mode/activateReadyController'); triggerService('/right/aescape/mode/activateReadyController');
displayTaggingOptions('play'); displayTaggingOptions('play');

View File

@@ -246,7 +246,7 @@ function displayLoadingOptions() {
return '<span class="tag label label-info">' + escape(tag) + '</span>' return '<span class="tag label label-info">' + escape(tag) + '</span>'
}).join(' ') + }).join(' ') +
'</div>' + '</div>' +
'<div class="timestamp">' + escape('27 Jun 10:10am') + '</div>' + '<div class="timestamp">' + escape(item.created_at) + '</div>' +
'</div>' + '</div>' +
'</div>'; '</div>';
} }
@@ -317,15 +317,16 @@ function loadSelectedBagFile(selectedBagId, singleArmMode, callback) {
single_arm : singleArmMode 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 toSendString = JSON.stringify(toSend);
var topic = new ROSLIB.Topic({ var topic = new ROSLIB.Topic({
@@ -337,6 +338,7 @@ function loadSelectedBagFile(selectedBagId, singleArmMode, callback) {
var msg = new ROSLIB.Message({data:toSendString}); var msg = new ROSLIB.Message({data:toSendString});
topic.publish(msg); topic.publish(msg);
*/
} }