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

Remove dataDisplay

Browse Source
This commit is contained in:
David Walsh
2019-03-28 11:26:45 -04:00
parent 713e696ef6
commit e85717fa9f
2 changed files with 17 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
data_display/data_display.html
View File

@@ -42,61 +42,3 @@
</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
View File

@@ -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">
<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>
$(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/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>
<body>
<div class="container">
@@ -61,37 +61,26 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
Not Connected
</span></a>
</li>
<!-- <li>
<a href="#DataDisplay" data-toggle="tab">
Data Display
</a>
</li> -->
<li class="active">
<a href="#Coordinator" data-toggle="tab">
Coordinator
</a>
</li>
<li>
<a href="#Vision" data-toggle="tab">
Vision
</a>
</li>
</ul>
<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">
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
<div id="coordinatorContent"></div>
<!-- ##################################### END DISPLAY PANEL ######################################### -->
</div>
<div class="tab-pane" id="Vision">
<div id="visionContent"></div>
</div>
<div class="tab-pane" id="rosbridgeconnection">