moved to lib

4ff8c216 · Oleg Dzhimiev · 129d9d9a · 4ff8c216 · 4ff8c216 · 4ff8c216
Commit 4ff8c216 authored Nov 16, 2016 by Oleg Dzhimiev
6 changed files
--- a/src/jp4-canvas/Makefile
+++ b/src/jp4-canvas/Makefile
@@ -5,7 +5,8 @@ INSTALL = install
 DOCS=       jp4-canvas.html \
            jp4-canvas.js 

-LIBS=       exif.js \
+LIBS=       elphel.js \
+            exif.js \
            jquery-jp4.js \
            jcanvas.min.js
            

--- a/src/jp4-canvas/elphel.js
+++ b/src/jp4-canvas/elphel.js
--- a/src/jp4-canvas/get-image.php
+++ b/src/jp4-canvas/get-image.php
@@ -10,7 +10,14 @@ if (isset($_GET['rel']))
 else
    die();

+/*
+header("Location: http://{$_SERVER['HTTP_HOST']}:$port/$rel");
+die();
+*/
+
 header('Content-type:image/jpeg');
 echo file_get_contents("http://localhost:$port/$rel");
-    
+
+die();
+
 ?> 
--- a/src/jp4-canvas/jp4-canvas.html
+++ b/src/jp4-canvas/jp4-canvas.html
@@ -7,18 +7,19 @@
  <body>
    <table>
    <tr>
+      <td><div id='test1'></div></td>
      <td><div id='test2'></div></td>
-      <td><div id='test4'></div></td>
    </tr>
    <tr>
-      <td><div id='test1'></div></td>
      <td><div id='test3'></div></td>
+      <td><div id='test4'></div></td>
    </tr>
    </table>
+    <script src="js/elphel.js"></script>
    <script src="js/jquery-2.2.3.min.js"></script>
    <script src="js/jcanvas.min.js"></script>
    <script src="js/exif.js"></script>
-    <script src="jp4-canvas.js"></script>
    <script src="js/jquery-jp4.js"></script>
+    <script src="jp4-canvas.js"></script>
  </body>
 </html> 
--- a/src/jp4-canvas/jp4-canvas.js
+++ b/src/jp4-canvas/jp4-canvas.js
@@ -8,8 +8,17 @@ Copyright (C) 2016 Elphel, Inc.
 */

 $(function(){
-  $("#test1").jp4({port:2323,width:600});
-  $("#test2").jp4({port:2324,width:600});
-  $("#test3").jp4({port:2325,width:600});
-  $("#test4").jp4({port:2326,width:600});
+  
+  var t1 = $("#test1").jp4({port:2323,width:600,image:"images/elphelimg_lowpass_1.jp4",fast:true});
+
+  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");
+  });
+  
 });
--- a/src/jp4-canvas/jquery-jp4.js
+++ b/src/jp4-canvas/jquery-jp4.js