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

fixed merge conflicts

Browse Source
This commit is contained in:
Chuck
2019-06-26 15:45:51 -04:00
parent 60a31dc494 c1bc3ce0fc
commit 7054553fdb
4 changed files with 71 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@
<button type="button" onclick="triggerService('/left/aescape/mode/activateReadyController')" class="btn col-md-3">
Activate Ready Mode
</button>
<button id="executionLoadButton" type="button" onclick="triggerService('/aescape/bags/startPlayingLastRecording')" class="btn btn-primary col-md-3">
<button id="executionLoadButton" type="button" onclick="displayLoadingOptions()" class="btn btn-primary col-md-3">
Load Recording
</button>
<button id="executionStartButton" type="button" onclick="triggerService('/left/aescape/mode/activateExecutionController'); triggerTopic('/left/run_trajectory')" class="btn btn-primary col-md-3">
@@ -396,8 +396,8 @@
<i class="fas fa-times-circle" onclick="hideTaggingOptions('play', false)"></i>
</div>
</div>
<div>
<div class="col-md-8">
<div class="loading options open">
<div class="col-md-10">
<div class="dropdown">
<div>
<select id="bagList" placeholder="Select bag to play">
@@ -406,12 +406,9 @@
<!-- <i class="fas fa-sync-alt" onclick="updateRecordingsList()"></i> -->
</div>
</div>
<div class="col-md-4">
<button class="btn btn-primary" type="button" onclick="loadSelectedBagFile()">
<span>
Load Bag
</span>
</button>
<div class="col-md-2">
<i class="fas fa-check-circle" onclick="loadSelectedBagFile()"></i>
<i class="fas fa-times-circle" onclick=""></i>
</div>
</div>
<div id="playTagError" class="col-md-10"></div>

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

@@ -421,7 +421,7 @@ function invokeSafetyController(event)
{
var keyID = event.keyCode;
//8 == backspace, 46 == delete
if(keyID == 8 || keyID == 46) {
if(keyID == 46) {
triggerService('/aescape/safety_activate')
}
}

93
client/app/components/coordinator/js/update_guis.js
View File

@@ -47,36 +47,6 @@ function getBagTagList(callback)
}
setTimeout(function(){
var $select = $('#bagList').selectize({
valueField: 'name',
labelField: 'name',
searchField: ['name'],
options: [],
create: false,
placeholder : "Select bag to play"
});
function updateRecordingsList()
{
getBagList(function(results){
var selectize = $select[0].selectize;
selectize.clearOptions()
selectize.addOption(results.map(function(bagName){
return {name : bagName}
}));
})
};
window.setInterval(function(){
updateRecordingsList()
}, 1000);
}, 10000);
setTimeout(function(){
document.querySelector('.hand-panel-right .status-bar').style.height = document.querySelector('.hand-panel-left .status-bar').offsetHeight + 20 + "px";
$(function () {
@@ -156,17 +126,23 @@ function displayTaggingOptions(mode) {
}
function hideTaggingOptions(mode, updateValues=false) {
var modeTag = '#' + mode + 'Tag';
if(updateValues) {
var modeTag = '#' + mode + 'Tags';
var fileNameSelector = '#' + mode + 'BagFileName';
var categorySelector = '#' + mode + 'BagCategory';
var tagSelector = '#' + mode + 'BagTags';
updateBagMetadata(mode, bag_name, fileNameSelector, categorySelector, tagSelector)
var filename = $(fileNameSelector).val();
var category = $(categorySelector).val();
var tags = $(tagSelector).val();
updateBagMetadata(mode, bag_name, filename, category, tags)
}
//TO DO: Wait for the response from the backend before setting the display to none
document.getElementById(id).setAttribute('overflow', 'hidden');
document.getElementById(id).classList.remove('open');
document.getElementById(modeTag).setAttribute('overflow', 'hidden');
document.getElementById(modeTag).classList.remove('open');
}
function updateBagMetadata(mode, bag_name, modified_bag_name, category, tags) {
@@ -185,4 +161,55 @@ function updateBagMetadata(mode, bag_name, modified_bag_name, category, tags) {
})
}
function displayLoadingOptions() {
selector = "#bagList"
document.querySelector(selector).classList.add('open');
//get bag list
//select last recorded bag
//do animation
var $select = $('#bagList').selectize({
valueField: 'filename',
labelField: 'filename',
searchField: ['filename', 'category', 'tags'],
options: [],
create: false,
placeholder : "Select bag to play",
render : {
item: function(item, escape) {
return '<div>' +
(item.filename ? '<span class="name">' + escape(item.filename) + '</span>' : '') +
(item.category ? '<span class="email">' + escape(item.category) + '</span>' : '') +
'</div>';
},
option: function(item, escape) {
var label = item.filename || item.category;
var caption = item.filename ? item.category : null;
return '<div>' +
'<span class="label">' + escape(label) + '</span>' +
(caption ? '<span class="caption">' + escape(caption) + '</span>' : '') +
'</div>';
}
}
});
getBagList(function(results){
var selectize = $select[0].selectize;
selectize.clearOptions()
results = [{'filename' : 'hellobiathco', 'category' : 'hellobiathcat', 'tags' : ['hellobiathtag', 'hellobiatag2']}]
selectize.addOption(results);
if(results[0]) {
selectize.setValue(results[0].filename);
}
})
}
function hideLoadingOptions() {
var selector = '#bagList';
document.getElementById(selector).setAttribute('overflow', 'hidden');
document.getElementById(selector).classList.remove('open');
}

5
client/app/main.css
View File

@@ -402,11 +402,14 @@ html, body {
}
.tagging-options {
.tagging-options, .loading-options {
height: 0;
overflow: hidden;
transition: height 600ms ease 0ms;
}
.tagging-options.open {
height: 122px;
}
.loading-options.open {
height: 85px;
}