Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-web-393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-web-393
Commits
3ac1c2f5
Commit
3ac1c2f5
authored
Jan 22, 2019
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
snapshot button
parent
c1c83ec5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
377 additions
and
34 deletions
+377
-34
jquery-jp4.js
src/jp4-canvas/jquery-jp4.js
+45
-33
index.html
src/multicam/index.html
+4
-0
multicam.js
src/multicam/multicam.js
+311
-0
multicam.php
src/multicam/multicam.php
+11
-0
index.php
src/snapshot/index.php
+6
-1
No files found.
src/jp4-canvas/jquery-jp4.js
View file @
3ac1c2f5
...
@@ -136,8 +136,10 @@
...
@@ -136,8 +136,10 @@
}
}
if
(
this
.
status
===
200
)
{
if
(
this
.
status
===
200
)
{
var
imgdata
=
URL
.
createObjectURL
(
http
.
response
);
obj
.
blob
=
window
.
URL
.
createObjectURL
(
http
.
response
);
process_image
(
imgdata
);
process_image
(
obj
.
blob
);
delete
this
;
//URL.revokeObjectURL(imgdata);
}
}
};
};
...
@@ -189,40 +191,47 @@
...
@@ -189,40 +191,47 @@
heavyImage
.
onload
=
function
(){
heavyImage
.
onload
=
function
(){
EXIF
.
getData
(
this
,
function
()
{
if
(
obj
.
blob
){
console
.
log
(
"revoking object"
);
window
.
URL
.
revokeObjectURL
(
obj
.
blob
);
}
var
cnv_w
;
var
cnv_h
;
if
(
settings
.
lowres
!=
0
){
EXIF
.
getData
(
this
,
function
()
{
cnv_w
=
this
.
width
/
settings
.
lowres
;
cnv_h
=
this
.
height
/
settings
.
lowres
;
}
else
{
cnv_w
=
this
.
width
;
cnv_h
=
this
.
height
;
}
//update canvas size
var
cnv_w
;
canvas
.
attr
(
"width"
,
cnv_w
);
var
cnv_h
;
canvas
.
attr
(
"height"
,
cnv_h
);
if
(
settings
.
lowres
!=
0
){
parseEXIFMakerNote
(
this
);
cnv_w
=
this
.
width
/
settings
.
lowres
;
cnv_h
=
this
.
height
/
settings
.
lowres
;
canvas
.
drawImage
({
}
else
{
x
:
0
,
y
:
0
,
cnv_w
=
this
.
width
;
source
:
this
,
cnv_h
=
this
.
height
;
width
:
cnv_w
,
}
height
:
cnv_h
,
//source: heavyImage,
//update canvas size
load
:
redraw
,
canvas
.
attr
(
"width"
,
cnv_w
);
sx
:
0
,
canvas
.
attr
(
"height"
,
cnv_h
);
sy
:
0
,
sWidth
:
this
.
width
,
parseEXIFMakerNote
(
this
);
sHeight
:
this
.
height
,
//scale: scale,
canvas
.
drawImage
({
fromCenter
:
false
x
:
0
,
y
:
0
,
});
source
:
this
,
});
width
:
cnv_w
,
height
:
cnv_h
,
//source: heavyImage,
load
:
redraw
,
sx
:
0
,
sy
:
0
,
sWidth
:
this
.
width
,
sHeight
:
this
.
height
,
//scale: scale,
fromCenter
:
false
});
});
};
};
heavyImage
.
src
=
imagedata
;
heavyImage
.
src
=
imagedata
;
...
@@ -231,6 +240,9 @@
...
@@ -231,6 +240,9 @@
function
redraw
(){
function
redraw
(){
//URL.revokeObjectURL($(this).source.src);
//console.log(this);
//for debugging
//for debugging
//IMAGE_FORMAT="JPEG";
//IMAGE_FORMAT="JPEG";
...
...
src/multicam/index.html
View file @
3ac1c2f5
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
<script
src=
"../js/jcanvas.js"
></script>
<script
src=
"../js/jcanvas.js"
></script>
<script
src=
"../js/exif.js"
></script>
<script
src=
"../js/exif.js"
></script>
<script
src=
"../js/jquery-jp4.js"
></script>
<script
src=
"../js/jquery-jp4.js"
></script>
<script
src=
"../js/zip/zip.js"
></script>
<link
rel=
"stylesheet"
href=
"../js/bootstrap/css/bootstrap.css"
>
<link
rel=
"stylesheet"
href=
"../js/bootstrap/css/bootstrap.css"
>
...
@@ -25,6 +26,9 @@
...
@@ -25,6 +26,9 @@
<div
class=
'rec_inner'
></div>
<div
class=
'rec_inner'
></div>
</div>
</div>
</td>
</td>
<td>
<button
id=
'snapshot'
title=
'download snapshot'
class=
"btn btn-sm btn-danger"
>
snapshot
</button>
</td>
</tr>
</tr>
<tr
id=
"toggle_awb"
title=
'Auto White Balance'
>
<tr
id=
"toggle_awb"
title=
'Auto White Balance'
>
<td>
Auto WB:
</td>
<td>
Auto WB:
</td>
...
...
src/multicam/multicam.js
View file @
3ac1c2f5
...
@@ -79,6 +79,8 @@ function parseURL(){
...
@@ -79,6 +79,8 @@ function parseURL(){
function
init
(){
function
init
(){
zip
.
workerScriptsPath
=
"../js/zip/"
;
parseURL
();
parseURL
();
if
(
!
ips_from_url
){
if
(
!
ips_from_url
){
...
@@ -120,6 +122,7 @@ function init(){
...
@@ -120,6 +122,7 @@ function init(){
});
});
init_test_button
();
init_test_button
();
init_snapshot_button
();
}
}
...
@@ -742,3 +745,311 @@ function multi_ajax(url,callback){
...
@@ -742,3 +745,311 @@ function multi_ajax(url,callback){
}
}
}
}
var
pointers
=
[];
function
init_snapshot_button
(){
$
(
"#snapshot"
).
on
(
'click'
,
function
(){
//reset pointers
pointers
=
[];
// get combined diagnostcs - need timestamps and pointers
multi_ajax
(
"../diagnostics.php"
,
function
(
data
){
pointers
.
push
(
$
(
data
));
// when everything is collected
if
(
pointers
.
length
==
cams
.
length
){
//find the latest
snapshot_download_all
(
pointers
);
}
});
// download images
});
}
function
snapshot_find_latest_ts
(
ptrs
){
// loop through the 1st one backwards
var
c
=
$
(
$
(
ptrs
[
0
]).
find
(
'timestamps'
)[
0
]).
find
(
'ts'
);
var
total_ports
=
0
;
for
(
var
i
=
0
;
i
<
ptrs
.
length
;
i
++
){
total_ports
+=
$
(
ptrs
[
i
]).
find
(
'port'
).
length
;
}
var
ts
=
[];
var
pattern
=
""
;
var
common_ts_found
=
false
;
for
(
var
i
=
c
.
length
-
1
;
i
>=
0
;
i
--
){
var
pattern
=
c
[
i
].
innerText
;
var
counter
=
0
;
for
(
var
j
=
0
;
j
<
ptrs
.
length
;
j
++
){
var
l
=
$
(
ptrs
[
j
]).
find
(
'ts[ts=
\'
'
+
pattern
+
'
\'
]'
).
length
;
counter
+=
l
;
}
if
(
counter
==
total_ports
){
common_ts_found
=
true
;
break
;
}
}
if
(
common_ts_found
){
console
.
log
(
"Downloading "
+
pattern
);
return
pattern
;
}
else
{
console
.
log
(
"ERROR: didn't find a common timestamp among cameras and ports"
);
return
false
;
}
}
var
ZW
;
var
zip_filename
=
"zip.zip"
;
var
blobs
=
[];
var
filenames
=
[];
var
snapshot_counter
=
0
;
var
zip_counter
=
0
;
var
blob_coounter
=
0
;
function
snapshot_download_all
(
ptrs
){
// create zipWriter
/*
zip.createWriter(new zip.BlobWriter("application/zip"),function(zipWriter){
ZW = zipWriter;
});
*/
var
ts
=
snapshot_find_latest_ts
(
ptrs
);
if
(
ts
){
zip_filename
=
ts
.
replace
(
/
\.
/ig
,
"_"
)
+
".zip"
;
snapshot_counter
=
0
;
zip_counter
=
0
;
blob_counter
=
0
;
filenames
=
[];
blobs
=
[];
for
(
var
i
=
0
;
i
<
ptrs
.
length
;
i
++
){
var
ip
=
$
(
ptrs
[
i
]).
find
(
'camera'
).
attr
(
'ip'
);
var
bchn
=
get_base_channel
(
ip
);
//console.log(ip+": base channel = "+base_chn);
var
buf_pointers
=
$
(
ptrs
[
i
]).
find
(
'ts[ts=
\'
'
+
ts
+
'
\'
]'
);
for
(
var
j
=
0
;
j
<
cams
[
i
].
ports
.
length
;
j
++
){
// everything is ordered
var
port
=
cams
[
i
].
ports
[
j
].
port
;
var
pointer
=
$
(
buf_pointers
[
j
]).
attr
(
'ptr'
);
var
url
=
"http://"
+
ip
+
":"
+
port
+
"/"
+
pointer
+
"/timestamp_name/bchn"
+
bchn
+
"/bimg"
;
snapshot_download_single
(
url
);
}
}
}
}
function
get_base_channel
(
ip
){
var
base
=
0
;
for
(
var
i
=
0
;
i
<
cams
.
length
;
i
++
){
if
(
cams
[
i
].
ip
==
ip
){
break
;
}
else
{
base
+=
cams
[
i
].
ports
.
length
;
}
}
return
base
;
}
// from snapshot.js
function
snapshot_download_single
(
addr
){
snapshot_counter
++
;
// get ze blob
var
http
=
new
XMLHttpRequest
();
http
.
open
(
"GET"
,
addr
,
true
);
http
.
responseType
=
"blob"
;
http
.
onload
=
function
(
e
){
if
(
this
.
status
===
200
)
{
// To access the header, had to add
// printf("Access-Control-Expose-Headers: Content-Disposition\r\n");
// to imgsrv
var
filename
=
this
.
getResponseHeader
(
"Content-Disposition"
);
filename
=
filename_from_content_disposition
(
filename
);
// store in case zip cannot zip
filenames
.
push
(
filename
);
blobs
.
push
(
http
.
response
);
blob_counter
++
;
//var blob = http.response;
//blob.type = "image/jpeg";
if
(
blob_counter
==
snapshot_counter
){
zip_blobs
();
//add_test_blob_to_zip();
}
//pass_to_file_reader(filename,http.response);
}
}
http
.
send
();
}
function
add_test_blob_to_zip
(){
var
textblob
=
new
Blob
(
[
"Lorem ipsum dolor sit amet, consectetuer adipiscing elit..."
],
{
type
:
"text/plain"
}
);
ZW
.
add
(
"test.txt"
,
new
zip
.
BlobReader
(
textblob
),
function
(){
ZW
.
close
(
function
(
zippedBlob
){
pass_to_file_reader
(
zip_filename
,
zippedBlob
);
});
});
}
function
zip_blobs
(){
zip
.
createWriter
(
new
zip
.
BlobWriter
(
"application/zip"
),
function
(
writer
)
{
var
f
=
0
;
function
nextFile
(
f
)
{
fblob
=
blobs
[
f
];
writer
.
add
(
filenames
[
f
],
new
zip
.
BlobReader
(
fblob
),
function
()
{
// callback
f
++
;
if
(
f
<
filenames
.
length
)
{
nextFile
(
f
);
}
else
close
();
});
}
function
close
()
{
// close the writer
writer
.
close
(
function
(
blob
)
{
// save with FileSaver.js
pass_to_file_reader
(
zip_filename
,
blob
);
});
}
nextFile
(
f
);
},
onerror
);
/*
for(var i=0;i<filenames.length;i++){
// add to zip writer
ZW.add(filenames[i],new zip.BlobReader(blobs[i]),function(){
zip_counter++;
if (snapshot_counter==zip_counter){
ZW.close(function(zippedBlob){
// right befre closing
// save zip
pass_to_file_reader(zip_filename,zippedBlob);
});
}
});
}
*/
}
function
filename_from_content_disposition
(
str
){
var
parameters
=
str
.
split
(
";"
);
for
(
var
i
=
0
;
i
<
parameters
.
length
;
i
++
)
parameters
[
i
]
=
parameters
[
i
].
split
(
"="
);
for
(
var
i
=
0
;
i
<
parameters
.
length
;
i
++
)
{
if
(
parameters
[
i
][
0
].
trim
()
==
"filename"
){
str
=
parameters
[
i
][
1
].
replace
(
/"/ig
,
""
);
str
=
str
.
trim
();
}
}
return
str
;
}
// from here:
// https://diegolamonica.info/multiple-files-download-on-single-link-click/
// http://jsfiddle.net/diegolamonica/ssk8z9pa/
// (helped a lot) https://stackoverflow.com/questions/19327749/javascript-blob-filename-without-link
function
pass_to_file_reader
(
filename
,
fileblob
){
var
url
=
window
.
URL
.
createObjectURL
(
fileblob
);
var
a
=
$
(
'<a>'
)
.
attr
(
'href'
,
url
)
.
attr
(
'download'
,
filename
)
// Firefox does not fire click if the link is outside
// the DOM
.
appendTo
(
'body'
);
a
[
0
].
click
();
//a.click();
// delay?
setTimeout
(
function
(){
a
.
remove
();
},
200
);
//return;
// The code below will not work because .readAsDataURL() is limited in Chrome to 2MB, but no limit in FF.
/*
var reader = new FileReader();
reader.filename = filename;
reader.onloadend = function(e){
//console.log("Load ended!");
var file = [this.filename,e.target.result];
var theAnchor = $('<a>')
.attr('href', file[1])
.attr('download',file[0])
// Firefox does not fire click if the link is outside
// the DOM
.appendTo('body');
theAnchor[0].click();
//theAnchor.click();
//delay
setTimeout(function(){
theAnchor.remove();
},200);
};
reader.onload = function(e){
//console.log("onload");
};
reader.readAsDataURL(filedata);
*/
}
src/multicam/multicam.php
View file @
3ac1c2f5
<?php
<?php
include
"../include/elphel_functions_include.php"
;
$cmd
=
"donothing"
;
$cmd
=
"donothing"
;
if
(
isset
(
$_GET
[
'cmd'
]))
if
(
isset
(
$_GET
[
'cmd'
]))
...
@@ -41,6 +43,9 @@ switch($cmd){
...
@@ -41,6 +43,9 @@ switch($cmd){
write_config
(
$config
,
$ips
);
write_config
(
$config
,
$ips
);
print
(
"ok"
);
print
(
"ok"
);
break
;
break
;
case
"snapshot"
:
send_zipped_images
(
$ips
);
break
;
case
"read"
:
case
"read"
:
default
:
default
:
// will never need read - config is in http://camip/var/multicam.xml
// will never need read - config is in http://camip/var/multicam.xml
...
@@ -88,6 +93,12 @@ function getports(){
...
@@ -88,6 +93,12 @@ function getports(){
$xml
.=
"</Document>
\n
"
;
$xml
.=
"</Document>
\n
"
;
return
$xml
;
return
$xml
;
}
function
send_zipped_images
(
$ips
){
}
}
?>
?>
\ No newline at end of file
src/snapshot/index.php
View file @
3ac1c2f5
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
$port0
=
2323
;
$port0
=
2323
;
$path
=
"/sys/devices/soc0/elphel393-detect_sensors@0"
;
$path
=
"/sys/devices/soc0/elphel393-detect_sensors@0"
;
$base_channel
=
0
;
$available_ports
=
Array
();
$available_ports
=
Array
();
$trig_master
=
-
1
;
$trig_master
=
-
1
;
...
@@ -57,6 +58,10 @@
...
@@ -57,6 +58,10 @@
$dl_exif_histories
=
1
;
$dl_exif_histories
=
1
;
}
}
if
(
isset
(
$_GET
[
'bchn'
])){
$base_channel
=
$_GET
[
'bchn'
];
}
if
(
$trig_master
>=
0
){
if
(
$trig_master
>=
0
){
if
(
isset
(
$_GET
[
'trig'
])){
if
(
isset
(
$_GET
[
'trig'
])){
...
@@ -78,7 +83,7 @@
...
@@ -78,7 +83,7 @@
$filenames
=
Array
();
$filenames
=
Array
();
$rqs
=
Array
();
$rqs
=
Array
();
foreach
(
$available_ports
as
$port
){
foreach
(
$available_ports
as
$port
){
array_push
(
$rqs
,
"http://
{
$_SERVER
[
'SERVER_ADDR'
]
}
:
$port
/timestamp_name/bimg"
);
array_push
(
$rqs
,
"http://
{
$_SERVER
[
'SERVER_ADDR'
]
}
:
$port
/timestamp_name/b
chn
$base_channel
/b
img"
);
}
}
// '1' in the end - get response with headers
// '1' in the end - get response with headers
$cdata
=
curl_multi_start
(
$rqs
,
1
);
$cdata
=
curl_multi_start
(
$rqs
,
1
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment