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
03fe3594
Commit
03fe3594
authored
May 18, 2020
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated for new jquery-jp4 plugin
parent
b7d797ad
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
13 deletions
+16
-13
index.php
src/index/index.php
+9
-8
jp4-viewer.js
src/jp4-viewer/jp4-viewer.js
+1
-1
multicam.js
src/multicam/multicam.js
+3
-2
photo-finish.js
src/photofinish/photo-finish.js
+3
-2
No files found.
src/index/index.php
View file @
03fe3594
...
@@ -191,7 +191,8 @@ function init_jp4_previews(){
...
@@ -191,7 +191,8 @@ function init_jp4_previews(){
$
(
'.port_preview'
).
each
(
function
(){
$
(
'.port_preview'
).
each
(
function
(){
index
=
parseInt
(
$
(
this
).
attr
(
"index"
));
index
=
parseInt
(
$
(
this
).
attr
(
"index"
));
if
(
jp4_previews_enable
)
{
if
(
jp4_previews_enable
)
{
$
(
this
).
jp4
({
ip
:
location
.
host
,
port
:
2323
+
index
,
width
:
300
,
fast
:
true
,
lowres
:
4
});
//$(this).jp4({ip:location.host,port:2323+index,width:300,fast:true,lowres:4});
$
(
this
).
jp4
({
src
:
"http://"
+
location
.
host
+
":"
+
(
2323
+
index
)
+
"/img"
,
width
:
300
,
fast
:
true
,
lowres
:
4
});
}
else
{
}
else
{
$
(
this
).
html
(
"<img width='300' src='http://"
+
location
.
host
+
":"
+
(
2323
+
index
)
+
"/img' />"
);
$
(
this
).
html
(
"<img width='300' src='http://"
+
location
.
host
+
":"
+
(
2323
+
index
)
+
"/img' />"
);
}
}
...
...
src/jp4-viewer/jp4-viewer.js
View file @
03fe3594
...
@@ -65,7 +65,7 @@ function handleImage(e) {
...
@@ -65,7 +65,7 @@ function handleImage(e) {
//console.log(SETTINGS.width);
//console.log(SETTINGS.width);
view
.
jp4
({
image
:
myimg
,
fromhtmlinput
:
true
,
width
:
SETTINGS
.
width
,
fast
:
true
,
lowres
:
SETTINGS
.
quality
,
webworker_path
:
"../js"
});
view
.
jp4
({
src
:
myimg
,
fromhtmlinput
:
true
,
width
:
SETTINGS
.
width
,
fast
:
true
,
lowres
:
SETTINGS
.
quality
,
webworker_path
:
"../js"
});
//view.jp4({image:"test.jp4", input: false, width:1200,fast:true, lowres:1});
//view.jp4({image:"test.jp4", input: false, width:1200,fast:true, lowres:1});
$
(
"#jp4view"
).
append
(
view
);
$
(
"#jp4view"
).
append
(
view
);
...
...
src/multicam/multicam.js
View file @
03fe3594
...
@@ -477,8 +477,9 @@ function refresh_previews(){
...
@@ -477,8 +477,9 @@ function refresh_previews(){
//console.log("preview does not exist");
//console.log("preview does not exist");
var
jp4prev
=
elem
.
find
(
".port_preview[index="
+
j
+
"]"
);
var
jp4prev
=
elem
.
find
(
".port_preview[index="
+
j
+
"]"
);
var
preview
=
jp4prev
.
jp4
({
var
preview
=
jp4prev
.
jp4
({
ip
:
cam
.
ip
,
//ip: cam.ip,
port
:
cam
.
ports
[
j
].
port
,
//port: cam.ports[j].port,
src
:
"http://"
+
cam
.
ip
+
":"
+
cam
.
ports
[
j
].
port
+
"/img"
,
width
:
200
,
width
:
200
,
fast
:
true
,
fast
:
true
,
lowres
:
4
,
lowres
:
4
,
...
...
src/photofinish/photo-finish.js
View file @
03fe3594
...
@@ -50,8 +50,9 @@ $(function(){
...
@@ -50,8 +50,9 @@ $(function(){
});
});
display_object
=
$
(
"#display-panel"
).
jp4
({
display_object
=
$
(
"#display-panel"
).
jp4
({
ip
:
location
.
host
,
//ip:location.host,
port
:
2323
,
//port:2323,
src
:
"http://"
+
location
.
host
+
":2323/img"
,
width
:
600
,
width
:
600
,
fast
:
true
,
fast
:
true
,
lowres
:
0
,
lowres
:
0
,
...
...
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