Skip to content
This repository was archived by the owner on Feb 21, 2021. It is now read-only.

issue #1149: solved problem with usbcam and rename it #1156

Merged
aitormf merged 1 commit into from
May 23, 2018
Merged

issue #1149: solved problem with usbcam and rename it #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions src/drivers/cameraserver_web/package.json
View file
Open in desktop

This file was deleted.

0 src/drivers/cameraserver_web/.DS_Store → src/drivers/camserverWeb/.DS_Store
View file
Open in desktop
File renamed without changes.
0 src/drivers/cameraserver_web/main.js → src/drivers/camserverWeb/main.js
View file
Open in desktop
File renamed without changes.
0 ...rivers/cameraserver_web/package-lock.json → src/drivers/camserverWeb/package-lock.json
View file
Open in desktop
File renamed without changes.
15 changes: 15 additions & 0 deletions src/drivers/camserverWeb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "CamServerWeb",
"version": "0.1.0",
"main": "main.js",
"scripts": {
"start": "electron ."
},
"devDependencies": {
"electron": "^1.8.4",
"js-yaml": "^3.10.0"
},
"dependencies": {
"jquery": "^3.3.1"
}
}
0 ...rivers/cameraserver_web/public/config.yml → src/drivers/camserverWeb/public/config.yml
View file
Open in desktop
File renamed without changes.
0 ...raserver_web/public/css/bootstrap.min.css → ...camserverWeb/public/css/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...eraserver_web/public/css/cameraserver.css → .../camserverWeb/public/css/cameraserver.css
View file
Open in desktop
File renamed without changes.
0 ...ers/cameraserver_web/public/css/fondo.png → ...drivers/camserverWeb/public/css/fondo.png
View file
Open in desktop
File renamed without changes
0 ...ic/fonts/glyphicons-halflings-regular.eot → ...ic/fonts/glyphicons-halflings-regular.eot
View file
Open in desktop
File renamed without changes.
0 ...ic/fonts/glyphicons-halflings-regular.svg → ...ic/fonts/glyphicons-halflings-regular.svg
View file
Open in desktop
File renamed without changes
0 ...ic/fonts/glyphicons-halflings-regular.ttf → ...ic/fonts/glyphicons-halflings-regular.ttf
View file
Open in desktop
File renamed without changes.
0 ...c/fonts/glyphicons-halflings-regular.woff → ...c/fonts/glyphicons-halflings-regular.woff
View file
Open in desktop
File renamed without changes.
0 .../fonts/glyphicons-halflings-regular.woff2 → .../fonts/glyphicons-halflings-regular.woff2
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions ...rivers/cameraserver_web/public/index.html → src/drivers/camserverWeb/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>CameraServer-Web</title>
<title>CamServerWeb</title>
<meta name="description" content="">

<!-- core CSS -->
Expand All @@ -17,7 +17,7 @@
<nav class="navbar navbar-inverse" role="banner">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand " href="#"><i class="fa fa-bolt"></i> JdeRobot Driver CameraServer Web</a>
<a class="navbar-brand " href="#"><i class="fa fa-bolt"></i> JdeRobot Driver CamServerWeb</a>
</div>
</div>
<!--/.container-->
Expand All @@ -43,7 +43,7 @@ <h1><p id = "activeCam"></p></h1>
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="configLabel">CameraServer Config</h4>
<h4 class="modal-title" id="configLabel">CamServer Config</h4>
</div>
<div id = "confignav" class="modal-body">
<br>
Expand Down Expand Up @@ -91,9 +91,9 @@ <h4 class="modal-title" id="configLabel">CameraServer Config</h4>
</script>
<script src="js/jquery.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="js/cameraserverweb.js"></script>
<script src="js/CameraServer.js"></script>
<script src="js/apiCameraServer.js"></script>
<script src="js/camserverWeb.js"></script>
<script src="js/CamServer.js"></script>
<script src="js/apiCamServer.js"></script>
<script type="text/javascript" src="http://static.robotwebtools.org/EventEmitter2/current/eventemitter2.min.js"></script>
<script type="text/javascript" src="http://static.robotwebtools.org/roslibjs/current/roslib.min.js"></script>
</body>
Expand Down
0 ...ameraserver_web/public/js/CameraServer.js → ...ivers/camserverWeb/public/js/CamServer.js
View file
Open in desktop
File renamed without changes.
14 changes: 11 additions & 3 deletions ...raserver_web/public/js/apiCameraServer.js → ...rs/camserverWeb/public/js/apiCamServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ API.CameraServer = function (conf){


function cameraOn(){

videoSource = $("#videoSource").val();
var constraints = {};
if (videoSource == null) {
Expand All @@ -63,8 +62,16 @@ API.CameraServer = function (conf){
}).catch(function(err) {
alert(err.name + ": " + err.message);
});
}
}

function cameraOff(){
let stream = video.srcObject;
let tracks = stream.getTracks();
tracks.forEach(function(track) {
track.stop();
});
video.srcObject = null;
}

video.addEventListener('canplay', function(ev){
if (!hasRunOnce) {
Expand All @@ -81,7 +88,7 @@ API.CameraServer = function (conf){
this.startStreaming = function () {
if(cameraTimer == null) {
self.ros.connect("ws://" + config.serv.dir + ":" + config.serv.port);
document.getElementById("activeCam").innerHTML = "CamereServer active in address " + config.serv.dir + " and port " + config.serv.port;
document.getElementById("activeCam").innerHTML = "CamServer active in address " + config.serv.dir + " and port " + config.serv.port;
cameraOn();
cameraTimer = setInterval(function(){
canvas.width = width;
Expand All @@ -108,6 +115,7 @@ API.CameraServer = function (conf){
}

this.restart = function() {
cameraOff();
self.ros.close();
}
}
0 ...meraserver_web/public/js/bootstrap.min.js → ...s/camserverWeb/public/js/bootstrap.min.js
View file
Open in desktop
File renamed without changes.
0 ...raserver_web/public/js/cameraserverweb.js → ...rs/camserverWeb/public/js/camserverWeb.js
View file
Open in desktop
File renamed without changes.
0 .../cameraserver_web/public/js/jquery.min.js → ...vers/camserverWeb/public/js/jquery.min.js
View file
Open in desktop
File renamed without changes.
0 ...ameraserver_web/public/js/roslibjs.min.js → ...rs/camserverWeb/public/js/roslibjs.min.js
View file
Open in desktop
File renamed without changes.
0 src/drivers/cameraserver_web/run.js → src/drivers/camserverWeb/run.js
View file
Open in desktop
File renamed without changes.