Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-web-camvc
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-camvc
Commits
499a3e4d
Commit
499a3e4d
authored
May 20, 2020
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated for newer version of jquery-jp4.js
parent
abcbbeef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
camvc_camcomm.js
src/camvc_camcomm.js
+1
-0
camvc_interface.js
src/camvc_interface.js
+4
-1
No files found.
src/camvc_camcomm.js
View file @
499a3e4d
...
@@ -378,6 +378,7 @@ function requestsNextState(success) {
...
@@ -378,6 +378,7 @@ function requestsNextState(success) {
gRequests
.
sendHttpReq
();
/// Will trigger either requestsNextState(true) or requestsNextState(false)
gRequests
.
sendHttpReq
();
/// Will trigger either requestsNextState(true) or requestsNextState(false)
break
;
break
;
case
COMM_STATE_IMG
:
case
COMM_STATE_IMG
:
//console.log("Getting new image @ "+Date.now()/1000);
gRequests
.
getImage
();
gRequests
.
getImage
();
/// start image loading, onLoad/timeout should trigger either requestsNextState(true) or requestsNextState(false)
/// start image loading, onLoad/timeout should trigger either requestsNextState(true) or requestsNextState(false)
break
;
break
;
...
...
src/camvc_interface.js
View file @
499a3e4d
...
@@ -599,10 +599,12 @@ camInterface.prototype.gotShadow=function() {
...
@@ -599,10 +599,12 @@ camInterface.prototype.gotShadow=function() {
if
(
jp4obj
!=
undefined
){
if
(
jp4obj
!=
undefined
){
/*
var tmp = jp4obj.data.getAddr();
var tmp = jp4obj.data.getAddr();
if (img_port!=tmp[1]){
if (img_port!=tmp[1]){
jp4obj.data.setAddr(img_addr,img_port);
jp4obj.data.setAddr(img_addr,img_port);
}
}
*/
var
format
=
jp4obj
.
data
.
getFormat
();
var
format
=
jp4obj
.
data
.
getFormat
();
var
format_note
=
document
.
getElementById
(
"format_note"
);
var
format_note
=
document
.
getElementById
(
"format_note"
);
...
@@ -625,7 +627,8 @@ camInterface.prototype.gotShadow=function() {
...
@@ -625,7 +627,8 @@ camInterface.prototype.gotShadow=function() {
}
else
{
}
else
{
// this requires jquery
// this requires jquery
jp4obj
=
$
(
"#idCameraImage_div"
).
jp4
({
ip
:
img_addr
,
port
:
img_port
,
width
:
document
.
getElementById
(
"idDivCameraImage"
).
offsetWidth
,
fast
:
true
,
lowres
:
1
,
note
:
true
});
//jp4obj = $("#idCameraImage_div").jp4({ip:img_addr,port:img_port,width:document.getElementById("idDivCameraImage").offsetWidth,fast:true,lowres:1,note:true});
jp4obj
=
$
(
"#idCameraImage_div"
).
jp4
({
src
:
"http://"
+
img_addr
+
":"
+
img_port
+
"/img"
,
width
:
document
.
getElementById
(
"idDivCameraImage"
).
offsetWidth
,
fast
:
true
,
lowres
:
1
,
note
:
true
});
}
}
document
.
getElementById
(
"idImageLink"
).
href
=
gRequests
.
shadowImage
.
src
;
document
.
getElementById
(
"idImageLink"
).
href
=
gRequests
.
shadowImage
.
src
;
...
...
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