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

fixed douplicate functions for getting nodes and topics

Browse Source
This commit is contained in:
Glen Turner
2015-06-19 14:41:28 -07:00
parent 82196e461f
commit d146020719
13 changed files with 361 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
index.html
View File

@@ -19,10 +19,12 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<script src="include/js/roslib.js"></script>
<script type="text/javascript" src="include/js/roslib.min.js"></script>
<script type="text/javascript" src="include/js/roslib.js"></script>
<script type="text/javascript" src="ProjectFiles/js/ros_scripts.js"></script>
<script type="text/javascript" src="ProjectFiles/js/update_guis.js"></script>
<script type="text/javascript" src="backend/js/custom_topics.js"></script>
<script type="text/javascript" src="backend/js/ros_scripts.js"></script>
<script type="text/javascript" src="backend/js/update_guis.js"></script>
<audio id="audio" src="audio/beep-04.mp3" autostart="false" ></audio>
@@ -88,9 +90,9 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</div>
<!-- ##################################### END ROS BAG PANEL ######################################### -->
<!-- ##################################### ROBOT DISPLAT PANEL ######################################### -->
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
<div id="includedContent"></div>
<!-- ##################################### END ROS BAG PANEL ######################################### -->
<!-- ##################################### END DISPLAY PANEL ######################################### -->
@@ -114,7 +116,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<span>
<div class="input-group">
<input type="text" id="ConnectionIPInput" class="form-control" placeholder="bag_filename" placeholder="No IP Address yet">
<input type="text" id="ConnectionIPInput" class="form-control" placeholder="ROS Bridge Master IP" placeholder="No IP Address yet">
<span class="input-group-btn">
<button id="ConnectionButton" type="button" onclick="ros.attemptConnection()" class="btn btn-warning">
Connect
@@ -137,7 +139,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</div>
<div class="panel-body">
<div class="col-sm-1" id="ROSTopics">
<div id="ROSTopics">
N/A
</div>
</div>