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
e34c4282
Commit
e34c4282
authored
Nov 17, 2016
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
+refresh
parent
4ff8c216
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
12 deletions
+8
-12
jp4-canvas.js
src/jp4-canvas/jp4-canvas.js
+4
-11
jquery-jp4.js
src/jp4-canvas/jquery-jp4.js
+4
-1
No files found.
src/jp4-canvas/jp4-canvas.js
View file @
e34c4282
...
@@ -9,16 +9,9 @@ Copyright (C) 2016 Elphel, Inc.
...
@@ -9,16 +9,9 @@ Copyright (C) 2016 Elphel, Inc.
$
(
function
(){
$
(
function
(){
var
t1
=
$
(
"#test1"
).
jp4
({
port
:
2323
,
width
:
600
,
image
:
"images/elphelimg_lowpass_1.jp4"
,
fast
:
true
});
var
t1
=
$
(
"#test1"
).
jp4
({
port
:
2323
,
width
:
600
,
fast
:
true
});
var
t2
=
$
(
"#test2"
).
jp4
({
port
:
2324
,
width
:
600
,
fast
:
true
});
var
t2
=
$
(
"#test2"
).
jp4
({
port
:
2323
,
width
:
600
,
image
:
"images/elphelimg_lowpass_1.jp4"
,
precise
:
true
});
var
t3
=
$
(
"#test3"
).
jp4
({
port
:
2325
,
width
:
600
,
fast
:
true
});
var
t4
=
$
(
"#test4"
).
jp4
({
port
:
2326
,
width
:
600
,
fast
:
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 @
e34c4282
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
var
settings
=
$
.
extend
({
var
settings
=
$
.
extend
({
port
:
""
,
port
:
""
,
image
:
"test.jp4"
,
image
:
"test.jp4"
,
refresh
:
false
,
mosaic
:
[[
"Gr"
,
"R"
],[
"B"
,
"Gb"
]],
mosaic
:
[[
"Gr"
,
"R"
],[
"B"
,
"Gb"
]],
fast
:
false
,
fast
:
false
,
precise
:
false
,
precise
:
false
,
...
@@ -54,6 +55,7 @@
...
@@ -54,6 +55,7 @@
var
rq
=
""
;
var
rq
=
""
;
if
(
settings
.
port
!=
""
){
if
(
settings
.
port
!=
""
){
rq
=
"get-image.php?port="
+
settings
.
port
+
"&rel=bimg&ts="
+
Date
.
now
();
rq
=
"get-image.php?port="
+
settings
.
port
+
"&rel=bimg&ts="
+
Date
.
now
();
settings
.
refresh
=
true
;
}
else
{
}
else
{
rq
=
settings
.
image
;
rq
=
settings
.
image
;
}
}
...
@@ -134,7 +136,8 @@
...
@@ -134,7 +136,8 @@
Elphel
.
drawScaled
(
cnv_working
,
cnv_display
,
settings
.
width
);
Elphel
.
drawScaled
(
cnv_working
,
cnv_display
,
settings
.
width
);
console
.
log
(
elem
.
attr
(
"id"
)
+
" processing finished, total time: "
+
(
Date
.
now
()
-
t0
)
/
1000
+
" s"
);
console
.
log
(
elem
.
attr
(
"id"
)
+
" processing finished, total time: "
+
(
Date
.
now
()
-
t0
)
/
1000
+
" s"
);
$
(
this
).
trigger
(
"canvas_ready"
);
$
(
this
).
trigger
(
"canvas_ready"
);
//get_image();
if
(
settings
.
refresh
)
get_image
();
}
}
});
});
}
}
...
...
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