Skip to content

E
elphel-web-393
Commit 4ff8c216 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files
Options

moved to lib

parent 129d9d9a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 871 additions and 344 deletions
src/jp4-canvas/Makefile
View file @ 4ff8c216
...@@ -5,7 +5,8 @@ INSTALL = install ...@@ -5,7 +5,8 @@ INSTALL = install
DOCS= jp4-canvas.html \ DOCS= jp4-canvas.html \
jp4-canvas.js jp4-canvas.js
LIBS= exif.js \ LIBS= elphel.js \
exif.js \
jquery-jp4.js \ jquery-jp4.js \
jcanvas.min.js jcanvas.min.js
......
src/jp4-canvas/elphel.js 0 → 100644
View file @ 4ff8c216
This diff is collapsed.
src/jp4-canvas/get-image.php
View file @ 4ff8c216
...@@ -10,7 +10,14 @@ if (isset($_GET['rel'])) ...@@ -10,7 +10,14 @@ if (isset($_GET['rel']))
else else
die(); die();
/*
header("Location: http://{$_SERVER['HTTP_HOST']}:$port/$rel");
die();
*/
header('Content-type:image/jpeg'); header('Content-type:image/jpeg');
echo file_get_contents("http://localhost:$port/$rel"); echo file_get_contents("http://localhost:$port/$rel");
die();
?> ?>
src/jp4-canvas/jp4-canvas.html
View file @ 4ff8c216
...@@ -7,18 +7,19 @@ ...@@ -7,18 +7,19 @@
<body> <body>
<table> <table>
<tr> <tr>
<td><div id='test1'></div></td>
<td><div id='test2'></div></td> <td><div id='test2'></div></td>
<td><div id='test4'></div></td>
</tr> </tr>
<tr> <tr>
<td><div id='test1'></div></td>
<td><div id='test3'></div></td> <td><div id='test3'></div></td>
<td><div id='test4'></div></td>
</tr> </tr>
</table> </table>
<script src="js/elphel.js"></script>
<script src="js/jquery-2.2.3.min.js"></script> <script src="js/jquery-2.2.3.min.js"></script>
<script src="js/jcanvas.min.js"></script> <script src="js/jcanvas.min.js"></script>
<script src="js/exif.js"></script> <script src="js/exif.js"></script>
<script src="jp4-canvas.js"></script>
<script src="js/jquery-jp4.js"></script> <script src="js/jquery-jp4.js"></script>
<script src="jp4-canvas.js"></script>
</body> </body>
</html> </html>
src/jp4-canvas/jp4-canvas.js
View file @ 4ff8c216
...@@ -8,8 +8,17 @@ Copyright (C) 2016 Elphel, Inc. ...@@ -8,8 +8,17 @@ Copyright (C) 2016 Elphel, Inc.
*/ */
$(function(){ $(function(){
$("#test1").jp4({port:2323,width:600});
$("#test2").jp4({port:2324,width:600}); var t1 = $("#test1").jp4({port:2323,width:600,image:"images/elphelimg_lowpass_1.jp4",fast:true});
$("#test3").jp4({port:2325,width:600});
$("#test4").jp4({port:2326,width:600}); var t2 = $("#test2").jp4({port:2323,width:600,image:"images/elphelimg_lowpass_1.jp4",precise:true});
t1.cnv.on("canvas_ready",function(){
console.log("canvas1 ready");
});
t2.cnv.on("canvas_ready",function(){
console.log("canvas2 ready");
});
}); });
src/jp4-canvas/jquery-jp4.js
View file @ 4ff8c216
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment