Remove dataDisplay
This commit is contained in:
David Walsh
@@ -42,61 +42,3 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<!-- ##################################### D-PAD ######################################### -->
|
|
||||||
<!--
|
|
||||||
|
|
||||||
<p>Click in the actual image. Relative coordinates will be displayed.</p>
|
|
||||||
<p id="rez"></p>
|
|
||||||
<div>
|
|
||||||
<img id="myImage" src="/backend/images/D-pad.png">
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- ##################################### END D-PAD ######################################### -->
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##################################### Example Progress Bar ######################################### -->
|
|
||||||
|
|
||||||
<div class="panel panel-default">
|
|
||||||
|
|
||||||
<div class="panel-heading">
|
|
||||||
Example Pannel Heading
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="panel-body">
|
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-2">
|
|
||||||
<label>
|
|
||||||
Bar Title
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-2">
|
|
||||||
<div class="progress">
|
|
||||||
<div id="progressBar1" class="progress-bar progress-bar-striped active" role="progressbar"
|
|
||||||
aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:100%" >
|
|
||||||
No data recieved yet. </div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ##################################### END Example Progress Bar ######################################### -->
|
|
||||||
|
|
||||||
<!-- ##################################### Example Image ######################################### -->
|
|
||||||
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
Camera Image
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-lg-4">
|
|
||||||
<img height="350" alt="No Camera Image" id="imageStream" src="http://localhost:8080/stream?topic=/camera/image"></img>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ##################################### END Example Image ######################################### -->
|
|
||||||
|
|||||||
45
index.html
45
index.html
@@ -29,15 +29,6 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
|
|||||||
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<script>
|
|
||||||
$(function(){
|
|
||||||
$("#dataDisplayContent").load("data_display/data_display.html");
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script type="text/javascript" src="data_display/js/ros_scripts.js"></script>
|
|
||||||
<script type="text/javascript" src="data_display/js/update_guis.js"></script>
|
|
||||||
|
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(function(){
|
$(function(){
|
||||||
@@ -47,6 +38,15 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
|
|||||||
<script type="text/javascript" src="coordinator/js/ros_scripts.js"></script>
|
<script type="text/javascript" src="coordinator/js/ros_scripts.js"></script>
|
||||||
<script type="text/javascript" src="coordinator/js/update_guis.js"></script>
|
<script type="text/javascript" src="coordinator/js/update_guis.js"></script>
|
||||||
|
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(function(){
|
||||||
|
$("#visionContent").load("vision/vision.html");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
<script type="text/javascript" src="vision/js/ros_scripts.js"></script>
|
||||||
|
<script type="text/javascript" src="vision/js/update_guis.js"></script>
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@@ -61,37 +61,26 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
|
|||||||
Not Connected
|
Not Connected
|
||||||
</span></a>
|
</span></a>
|
||||||
</li>
|
</li>
|
||||||
<!-- <li>
|
|
||||||
<a href="#DataDisplay" data-toggle="tab">
|
|
||||||
Data Display
|
|
||||||
</a>
|
|
||||||
</li> -->
|
|
||||||
<li class="active">
|
<li class="active">
|
||||||
<a href="#Coordinator" data-toggle="tab">
|
<a href="#Coordinator" data-toggle="tab">
|
||||||
Coordinator
|
Coordinator
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="#Vision" data-toggle="tab">
|
||||||
|
Vision
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div id="my-tab-content" class="tab-content">
|
<div id="my-tab-content" class="tab-content">
|
||||||
|
|
||||||
<div class="tab-pane" id="DataDisplay">
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
|
|
||||||
<div id="dataDisplayContent"></div>
|
|
||||||
<!-- ##################################### END DISPLAY PANEL ######################################### -->
|
|
||||||
|
|
||||||
</div>
|
|
||||||
<div class="tab-pane active" id="Coordinator">
|
<div class="tab-pane active" id="Coordinator">
|
||||||
|
|
||||||
|
|
||||||
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
|
|
||||||
<div id="coordinatorContent"></div>
|
<div id="coordinatorContent"></div>
|
||||||
<!-- ##################################### END DISPLAY PANEL ######################################### -->
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="tab-pane" id="Vision">
|
||||||
|
<div id="visionContent"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="tab-pane" id="rosbridgeconnection">
|
<div class="tab-pane" id="rosbridgeconnection">
|
||||||
|
|||||||
Reference in New Issue
Block a user