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

roll back a little

parent 01d32650

src/camvc2.html

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ input { 
   <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>

     <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%;">

       <img src="images/empty.png?_TIMESTAMP_" style="width:1; height:1">

     </div>

src/camvc_interface.js

+12 −10
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ camInterface.prototype.gotHistogram=function() { 
}



var jp4obj;

var jp4obj_enabled = false;



camInterface.prototype.gotShadow=function() {

//  alert ("gotShadow: typeof(this)="+typeof(this)+"\ntypeof(gRequests)="+typeof(gRequests));
@@ -624,8 +625,10 @@ camInterface.prototype.gotShadow=function() { 
	

  }else{

	// 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});

	}

  }

  

  document.getElementById("idImageLink").href= gRequests.shadowImage.src;

//  frAmeselSetImage ("idMagnifier_frAmesel",    gRequests.shadowImage.src);
@@ -662,15 +665,14 @@ camInterface.prototype.gotShadow=function() { 
	  frAmeselSetImage ("idWindow_frAmesel", newsrc);

  });

  

  

  //new src

  if (jp4obj_enabled){

	  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 ("idWindow_frAmesel", newsrc);

  }else{

	  frAmeselSetImage ("idMagnifier_frAmesel",    gRequests.shadowImage.src);

	  frAmeselSetImage ("idWindow_frAmesel",gRequests.shadowImage.src);	  

  }

  

  requestsNextState(true); // **** back to the main loop: GOOD