Commit 41cc57bb authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

roll back a little

parent 01d32650
...@@ -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>
......
...@@ -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,7 +625,9 @@ camInterface.prototype.gotShadow=function() { ...@@ -624,7 +625,9 @@ 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}); if (jp4obj_enabled) {
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;
...@@ -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", newsrc);
frAmeselSetImage ("idWindow_frAmesel", newsrc);
//frAmeselSetImage ("idMagnifier_frAmesel", gRequests.shadowImage.src); }else{
//frAmeselSetImage ("idWindow_frAmesel",gRequests.shadowImage.src); frAmeselSetImage ("idMagnifier_frAmesel", gRequests.shadowImage.src);
frAmeselSetImage ("idWindow_frAmesel",gRequests.shadowImage.src);
frAmeselSetImage ("idMagnifier_frAmesel", newsrc); }
frAmeselSetImage ("idWindow_frAmesel", newsrc);
requestsNextState(true); // **** back to the main loop: GOOD requestsNextState(true); // **** back to the main loop: GOOD
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment