Merge branch 'master' of github.com:Elphel/elphel-web-393

43d5a21d · Andrey Filippov · cc37d73e · 3a824467 · 43d5a21d · 43d5a21d
Commit 43d5a21d authored Oct 15, 2016 by Andrey Filippov
8 changed files
--- a/Makefile
+++ b/Makefile
 # Runs 'make', 'make install', and 'make clean' in specified subdirectories
-SUBDIRS := src/php_top src/python_tests src/debugfs-webgui # src1
+SUBDIRS := src/php_top src/python_tests src/debugfs-webgui src/jp4-canvas # src1
 INSTALLDIRS = $(SUBDIRS:%=install-%)
 CLEANDIRS =   $(SUBDIRS:%=clean-%)


--- a/src/jp4-canvas/Makefile
+++ b/src/jp4-canvas/Makefile
+DOCUMENTROOT=$(DESTDIR)/www/pages
+OWN = -o root -g root
+INSTDOCS = 0644
+INSTALL = install
+DOCS=       jp4-canvas.html \
+            jp4-canvas.js 
+
+LIBS=       exif.js \
+            jquery-jp4.js \
+            jcanvas.min.js
+            
+PHP_SCRIPTS=get-image.php
+
+all:
+	@echo "make all in src"
+
+install:
+	@echo "make install in src"
+	$(INSTALL) $(OWN) -d $(DOCUMENTROOT) $(DOCUMENTROOT)/js
+	$(INSTALL) $(OWN) -m $(INSTDOCS) $(DOCS) $(DOCUMENTROOT)
+	$(INSTALL) $(OWN) -m $(INSTDOCS) $(LIBS) $(DOCUMENTROOT)/js
+	$(INSTALL) $(OWN) -m $(INSTDOCS) $(PHP_SCRIPTS) $(DOCUMENTROOT)
+
+clean:
+	@echo "make clean in src"
--- a/src/jp4-canvas/exif.js
+++ b/src/jp4-canvas/exif.js
--- a/src/jp4-canvas/get-image.php
+++ b/src/jp4-canvas/get-image.php
+<?php
+
+if (isset($_GET['port']))
+    $port = $_GET['port'];
+else
+    die();
+
+if (isset($_GET['rel']))
+    $rel = $_GET['rel'];
+else
+    die();
+
+header('Content-type:image/jpeg');
+echo file_get_contents("http://localhost:$port/$rel");
+    
+?> 
--- a/src/jp4-canvas/jcanvas.min.js
+++ b/src/jp4-canvas/jcanvas.min.js
--- a/src/jp4-canvas/jp4-canvas.html
+++ b/src/jp4-canvas/jp4-canvas.html
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <meta name="author" content="?"/>
+  </head>
+  <body>
+    <table>
+    <tr>
+      <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>
+    </tr>
+    </table>
+    <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>
+  </body>
+</html> 
--- a/src/jp4-canvas/jp4-canvas.js
+++ b/src/jp4-canvas/jp4-canvas.js
+/*
+FILE NAME  : jp4-canvas.js
+DESCRIPTION: Converts jp4/jp46 files into human perceivable format in html5 canvas.             
+VERSION: 1.0
+AUTHOR: Oleg K Dzhimiev <oleg@elphel.com>
+LICENSE: AGPL, see http://www.gnu.org/licenses/agpl.txt
+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});
+});
--- a/src/jp4-canvas/jquery-jp4.js
+++ b/src/jp4-canvas/jquery-jp4.js