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
9535c4cc
Commit
9535c4cc
authored
Apr 02, 2019
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added tiff to camvc
parent
14cd2d87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
camvc_camcomm.js
src/camvc_camcomm.js
+10
-0
camvc_interface.js
src/camvc_interface.js
+6
-2
No files found.
src/camvc_camcomm.js
View file @
9535c4cc
...
...
@@ -565,6 +565,8 @@ Requests.prototype.parseXML=function(xml) {
function
getIfDefinedFCNV
(
obj
)
{
return
(
typeof
(
obj
)
!=
"undefined"
)?((
obj
.
firstChild
)?
obj
.
firstChild
.
nodeValue
:
""
):
""
;}
function
getIfDefined0FCNV
(
obj
)
{
return
(
obj
.
length
&&
(
typeof
(
obj
[
0
])
!=
"undefined"
))?((
obj
[
0
].
firstChild
)?
obj
[
0
].
firstChild
.
nodeValue
:
""
):
""
;}
var
veryFirstImage
=
true
;
Requests
.
prototype
.
getImage
=
function
()
{
// if (!document.imageEnabled) { requestsNextState(true); return; } // **** back to the main loop: SKIPPED
if
(
getBuTton
(
'idEnableImageRefresh_CB'
).
s
==
0
)
{
requestsNextState
(
true
);
return
;
}
/// **** back to the main loop: SKIPPED
...
...
@@ -573,6 +575,14 @@ Requests.prototype.getImage=function() {
/// document.requests.img++; debugComm(8192);
if
(
gPRoot
[
"comp_run"
].
getValue
()
==
'run'
){
this
.
shadowImage
.
src
=
this
.
imgsrv
+
this
.
imgUrl
+
"&_time="
+
t
.
getTime
();
// for TIFF format there will be no onload event, need to fire it manually
if
(
gPRoot
[
"color"
].
getValue
()
==
15
&&
veryFirstImage
){
var
e
=
document
.
createEvent
(
'HTMLEvents'
);
e
.
initEvent
(
"load"
,
false
,
true
);
this
.
shadowImage
.
dispatchEvent
(
e
);
//$(this.shadowImage).trigger("onload");
}
veryFirstImage
=
false
;
// document.title+="bimg";
}
else
if
(
this
.
ExifCircbufImgNeeded
)
{
var
newUrl
=
this
.
imgsrv
+
this
.
circbuf_fp
+
this
.
imgUrl
;
...
...
src/camvc_interface.js
View file @
9535c4cc
...
...
@@ -576,6 +576,9 @@ camInterface.prototype.gotHistogram=function() {
var
jp4obj
;
camInterface
.
prototype
.
gotShadow
=
function
()
{
console
.
log
(
"Onload!"
);
// alert ("gotShadow: typeof(this)="+typeof(this)+"\ntypeof(gRequests)="+typeof(gRequests));
if
((
gPRoot
[
"comp_run"
].
getValue
()
!=
'run'
)
&&
(
gRequests
.
shadowImage
.
src
.
indexOf
(
gRequests
.
circbuf_fp
)
>=
0
))
{
gRequests
.
ExifCircbufImgNeeded
=
false
;
...
...
@@ -623,7 +626,7 @@ camInterface.prototype.gotShadow=function() {
jp4obj
.
data
.
resize
(
document
.
getElementById
(
"idDivCameraImage"
).
offsetWidth
);
}
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
});
}
...
...
@@ -659,7 +662,8 @@ camInterface.prototype.gotShadow=function() {
$
(
$
(
"#idCameraImage_div"
).
find
(
"#working"
)[
0
]).
off
(
"canvas_ready"
).
on
(
"canvas_ready"
,
function
(){
var
newsrc
=
(
$
(
"#idCameraImage_div"
).
find
(
"#display"
)[
0
]).
toDataURL
();
frAmeselSetImage
(
"idMagnifier_frAmesel"
,
newsrc
);
frAmeselSetImage
(
"idWindow_frAmesel"
,
newsrc
);
frAmeselSetImage
(
"idWindow_frAmesel"
,
newsrc
);
$
(
gRequests
.
shadowImage
).
trigger
(
"load"
);
});
...
...
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