Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper

[ros_wild_thumper.git] / www / index.html

diff --git a/www/index.html b/www/index.html
index 837640514b4e66b80b4de6b72cec6a8c6b0100fc..db7e48d8b2adcea71f0090abeeabbac4aa82a76a 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -21,6 +21,9 @@
                <script src="assets/javascripts/jquery.minicolors.js"></script>
                <script src="assets/javascripts/vue.js"></script>
                <script src="assets/javascripts/application.js"></script>
+               <script type="text/javascript">
+                       robothostname="wildthumper"
+               </script>
 
                <title>Wild Thumper control</title>
        </head>
@@ -47,6 +50,9 @@
                                        <li class="nav-item">
                                                <a class="nav-link" href="#drive" data-toggle="tab" role="tab">Drive</a>
                                        </li>
+                                       <li class="nav-item">
+                                               <a class="nav-link imagelink" href="#image" data-toggle="tab" role="tab">Image</a>
+                                       </li>
                                </ul>
                        </nav>
 
@@ -109,7 +115,18 @@
                                        </div>
                                </div>
                                <div id="drive" class="tab-pane" role="tabpanel">
-                                       <div class="cmd_vel_circle"></div>
+                                       <div class="row">
+                                               <div class="col-sd-10">
+                                                       <div class="cmd_vel_circle"></div>
+                                               </div>
+                                               <div class="col-sd-1">
+                                                       <input type="number" value="1.0" min="0.1" max="5.0" step="0.1" class="form-control" id="scale_trans">
+                                                       <input type="number" value="3.0" min="1.0" max="5.0" step="0.1" class="form-control" id="scale_rot">
+                                               </div>
+                                       </div>
+                               </div>
+                               <div id="image" class="tab-pane" role="tabpanel">
+                                       <img id="usb_cam" src="http://"+robothostname+":8080/stream?topic=/usb_cam/image_raw" style="transform:rotate(-90deg); transform-origin: 60% 60%;"></img>
                                </div>
                        </div>
                </div>