moved files around to make it more user friendly
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
<div id="content">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Example Pannel Heading
|
||||
Example Pannel Heading My Changes
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="row">
|
||||
@@ -66,6 +66,23 @@ function getTopics() {
|
||||
return ros.topics
|
||||
};
|
||||
|
||||
function getNodes() {
|
||||
|
||||
var topicsClient = new ROSLIB.Service({
|
||||
ros : ros,
|
||||
name : '/rosapi/nodes',
|
||||
serviceType : '/rosapi/nodes'
|
||||
});
|
||||
|
||||
var request = new ROSLIB.ServiceRequest();
|
||||
|
||||
topicsClient.callService(request, function(result) {
|
||||
ros.nodes = result.nodes;
|
||||
});
|
||||
|
||||
return ros.nodes
|
||||
};
|
||||
|
||||
function getTime() {
|
||||
|
||||
var topicsClient = new ROSLIB.Service({
|
||||
@@ -50,8 +50,25 @@ function updateTopicsGUI()
|
||||
|
||||
};
|
||||
|
||||
function updateNodesGUI()
|
||||
{
|
||||
|
||||
nodes = getNodes()
|
||||
if(nodes != null){
|
||||
var innerHTML = "";
|
||||
for (var i = 0; i < nodes.length; i++ )
|
||||
{
|
||||
innerHTML = innerHTML.concat(nodes[i]);
|
||||
innerHTML = innerHTML.concat("<br>");
|
||||
}
|
||||
document.getElementById("ROSNodes").innerHTML = innerHTML;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
window.setInterval(function(){
|
||||
updateTopicsGUI()
|
||||
updateNodesGUI()
|
||||
}, 500);
|
||||
|
||||
function validateForm()
|
||||
28
index.html
28
index.html
@@ -19,7 +19,7 @@
|
||||
|
||||
<script>
|
||||
$(function(){
|
||||
$("#RobotInfo").load("RobotDisplayPanel.html");
|
||||
$("#RobotInfo").load("ProjectFiles/HTML/RobotDisplayPanel.html");
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -27,15 +27,15 @@
|
||||
<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/ros_scripts.js"></script>
|
||||
<script type="text/javascript" src="include/js/update_guis.js"></script>
|
||||
<script type="text/javascript" src="ProjectFiles/js/ros_scripts.js"></script>
|
||||
<script type="text/javascript" src="ProjectFiles/js/update_guis.js"></script>
|
||||
|
||||
|
||||
<audio id="audio" src="audio/beep-04.mp3" autostart="false" ></audio>
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
|
||||
<link rel="import" href="RobotDisplayPanel.html">
|
||||
<link rel="import" href="ProjectFiles/HTML/RobotDisplayPanel.html">
|
||||
|
||||
|
||||
|
||||
@@ -84,15 +84,15 @@
|
||||
|
||||
<div class="col-sm-6">
|
||||
<input type="text" class="form-control" id="ConnectionIPInput" value="No IP Address yet"/>
|
||||
<script type="text/javascript">
|
||||
document.getElementById("ConnectionIPInput").value = ros.connectionName;
|
||||
</script>
|
||||
</div>
|
||||
|
||||
<div class="col-sm-2">
|
||||
<button id="ConnectionButton" type="button" onclick="ros.attemptConnection()">
|
||||
Connect
|
||||
</button>
|
||||
<script type="text/javascript">
|
||||
document.getElementById("ConnectionIPInput").value = ros.connectionName;
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -100,7 +100,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
ROS Topics
|
||||
@@ -112,6 +111,19 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
ROS Nodes
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<div class="col-sm-1" id="ROSNodes">
|
||||
N/A
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user