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
41cc57bb
Commit
41cc57bb
authored
Jan 28, 2019
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
roll back a little
parent
01d32650
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
camvc2.html
src/camvc2.html
+1
-1
camvc_interface.js
src/camvc_interface.js
+12
-10
No files found.
src/camvc2.html
View file @
41cc57bb
...
@@ -281,7 +281,7 @@ input {
...
@@ -281,7 +281,7 @@ input {
<div
id=
"idDivCameraImage"
style=
"position:absolute;left:256; top:0; width:544; height:256;"
>
<div
id=
"idDivCameraImage"
style=
"position:absolute;left:256; top:0; width:544; height:256;"
>
<div
id=
"idCameraImage_div"
style=
"position:absolute;top:0px;left:0px;width:100%;height:100%;z-index:0"
onClick=
"startRefresh()"
>
<div
id=
"idCameraImage_div"
style=
"position:absolute;top:0px;left:0px;width:100%;height:100%;z-index:0"
onClick=
"startRefresh()"
>
</div>
</div>
<img
id=
"idCameraImage"
src=
"images/empty.png?_TIMESTAMP_"
style=
"width:100%;height:100%;z-index:-3;
display:none;
"
onClick=
"startRefresh()"
>
<img
id=
"idCameraImage"
src=
"images/empty.png?_TIMESTAMP_"
style=
"width:100%;height:100%;z-index:-3;"
onClick=
"startRefresh()"
>
<div
id=
"idDivCameraImageCover"
style=
"position:absolute;left:0; top:0; width:100%; height:100%;"
>
<div
id=
"idDivCameraImageCover"
style=
"position:absolute;left:0; top:0; width:100%; height:100%;"
>
<img
src=
"images/empty.png?_TIMESTAMP_"
style=
"width:1; height:1"
>
<img
src=
"images/empty.png?_TIMESTAMP_"
style=
"width:1; height:1"
>
</div>
</div>
...
...
src/camvc_interface.js
View file @
41cc57bb
...
@@ -574,6 +574,7 @@ camInterface.prototype.gotHistogram=function() {
...
@@ -574,6 +574,7 @@ camInterface.prototype.gotHistogram=function() {
}
}
var
jp4obj
;
var
jp4obj
;
var
jp4obj_enabled
=
false
;
camInterface
.
prototype
.
gotShadow
=
function
()
{
camInterface
.
prototype
.
gotShadow
=
function
()
{
// alert ("gotShadow: typeof(this)="+typeof(this)+"\ntypeof(gRequests)="+typeof(gRequests));
// alert ("gotShadow: typeof(this)="+typeof(this)+"\ntypeof(gRequests)="+typeof(gRequests));
...
@@ -624,8 +625,10 @@ camInterface.prototype.gotShadow=function() {
...
@@ -624,8 +625,10 @@ camInterface.prototype.gotShadow=function() {
}
else
{
}
else
{
// this requires jquery
// this requires jquery
if
(
jp4obj_enabled
)
{
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
});
}
}
}
document
.
getElementById
(
"idImageLink"
).
href
=
gRequests
.
shadowImage
.
src
;
document
.
getElementById
(
"idImageLink"
).
href
=
gRequests
.
shadowImage
.
src
;
// frAmeselSetImage ("idMagnifier_frAmesel", gRequests.shadowImage.src);
// frAmeselSetImage ("idMagnifier_frAmesel", gRequests.shadowImage.src);
...
@@ -662,15 +665,14 @@ camInterface.prototype.gotShadow=function() {
...
@@ -662,15 +665,14 @@ camInterface.prototype.gotShadow=function() {
frAmeselSetImage
(
"idWindow_frAmesel"
,
newsrc
);
frAmeselSetImage
(
"idWindow_frAmesel"
,
newsrc
);
});
});
if
(
jp4obj_enabled
){
//new src
var
newsrc
=
(
$
(
"#idCameraImage_div"
).
find
(
"#display"
)[
0
]).
toDataURL
();
var
newsrc
=
(
$
(
"#idCameraImage_div"
).
find
(
"#display"
)[
0
]).
toDataURL
();
//frAmeselSetImage ("idMagnifier_frAmesel", gRequests.shadowImage.src);
//frAmeselSetImage ("idWindow_frAmesel",gRequests.shadowImage.src);
frAmeselSetImage
(
"idMagnifier_frAmesel"
,
newsrc
);
frAmeselSetImage
(
"idMagnifier_frAmesel"
,
newsrc
);
frAmeselSetImage
(
"idWindow_frAmesel"
,
newsrc
);
frAmeselSetImage
(
"idWindow_frAmesel"
,
newsrc
);
}
else
{
frAmeselSetImage
(
"idMagnifier_frAmesel"
,
gRequests
.
shadowImage
.
src
);
frAmeselSetImage
(
"idWindow_frAmesel"
,
gRequests
.
shadowImage
.
src
);
}
requestsNextState
(
true
);
// **** back to the main loop: GOOD
requestsNextState
(
true
);
// **** back to the main loop: GOOD
...
...
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