...
 
Commits (6)
......@@ -21,18 +21,33 @@
<builder arguments="web-camvc" command="${workspace_loc:/elphel-web-camvc/scripts/run_bitbake.sh}" enableCleanBuild="false" id="org.eclipse.cdt.build.core.settings.default.builder.321313473" incrementalBuildTarget="-c install -f -v" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder" />
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.382067643" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs" />
<tool id="org.eclipse.cdt.build.core.settings.holder.1135988409" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1575641265" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1" />
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.302618452" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType" />
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1261984734" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1870897222" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1" />
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1373446415" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType" />
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.839097784" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1841913640" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1" />
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.946080580" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType" />
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1651015067" name="LLVM bytecode assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1395829212" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1" />
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1565334424" languageId="org.eclipse.cdt.managedbuilder.llvm.ui.llvmAssembly" languageName="LLVM bytecode assembly" sourceContentType="org.eclipse.cdt.managedbuilder.llvm.ui.llvmAssemblySource" superClass="org.eclipse.cdt.build.core.settings.holder.inType" />
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1602304504" name="UPC" superClass="org.eclipse.cdt.build.core.settings.holder">
<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1910222284" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__arm__=1" />
</option>
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1018834749" languageId="org.eclipse.cdt.core.parser.upc.upc" languageName="UPC" sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType" />
</tool>
</toolChain>
......@@ -60,4 +75,5 @@
<resource resourceType="PROJECT" workspacePath="/elphel-web-camvc" />
</configuration>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets" />
</cproject>
\ No newline at end of file
......@@ -260,11 +260,11 @@ function abstractToNative($absPar) {
case "csr": return array ("COLOR_SATURATION_RED"=>100);
case "comp_run": return array ("COMPRESSOR_RUN"=>array("stop","single","run"));
case "sens_run": return array ("SENSOR_RUN"=>array("stop","single","run"));
case "sensor": return array ("SENSOR"=>array(56 => "MT9F002", 4 => "ZR32112", 8 => "ZR32212",32 => "KAC1310",36 => "KAC5000",48 => "MI1300",49 => "MT9M001",50 => "MT9D001",51 => "MT9T001",52 => "MT9P001",64 => "IBIS51300"));
case "decXmask": return array ("SENSOR"=>array(56 => 255, 4 => 139, 8 => 139, 32 => 32907, 36 => 15, 48 => 139, 49 => 139, 50 => 139, 51 => 255, 52 => 255, 64 => 0));
case "decYmask": return array ("SENSOR"=>array(56 => 255, 4 => 139, 8 => 139, 32 => 32907, 36 => 13, 48 => 139, 49 => 139, 50 => 139, 51 => 255, 52 => 255, 64 => 0));
case "binXmask": return array ("SENSOR"=>array(56 => 255, 4 => 0, 8 => 0, 32 => 0, 36 => 3, 48 => 0, 49 => 0, 50 => 0, 51 => 255, 52 => 255, 64 => 0));
case "binYmask": return array ("SENSOR"=>array(56 => 255, 4 => 0, 8 => 0, 32 => 0, 36 => 3, 48 => 0, 49 => 0, 50 => 0, 51 => 255, 52 => 255, 64 => 0));
case "sensor": return array ("SENSOR"=>array(56 => "MT9F002", 4 => "ZR32112", 8 => "ZR32212",32 => "KAC1310",36 => "KAC5000",48 => "MI1300",49 => "MT9M001",50 => "MT9D001",51 => "MT9T001",52 => "MT9P001",64 => "IBIS51300", 68 => "LEPTON35"));
case "decXmask": return array ("SENSOR"=>array(56 => 255, 4 => 139, 8 => 139, 32 => 32907, 36 => 15, 48 => 139, 49 => 139, 50 => 139, 51 => 255, 52 => 255, 64 => 0, 68 => 255));
case "decYmask": return array ("SENSOR"=>array(56 => 255, 4 => 139, 8 => 139, 32 => 32907, 36 => 13, 48 => 139, 49 => 139, 50 => 139, 51 => 255, 52 => 255, 64 => 0, 68 => 255));
case "binXmask": return array ("SENSOR"=>array(56 => 255, 4 => 0, 8 => 0, 32 => 0, 36 => 3, 48 => 0, 49 => 0, 50 => 0, 51 => 255, 52 => 255, 64 => 0, 68 => 255));
case "binYmask": return array ("SENSOR"=>array(56 => 255, 4 => 0, 8 => 0, 32 => 0, 36 => 3, 48 => 0, 49 => 0, 50 => 0, 51 => 255, 52 => 255, 64 => 0, 68 => 255));
case "hrw": return array ("HISTWND_RWIDTH"=>0x10000);
case "hrh": return array ("HISTWND_RHEIGHT"=>0x10000);
case "hrl": return array ("HISTWND_RLEFT"=>0x10000);
......
......@@ -231,6 +231,7 @@ input {
<script src="js/jquery-3.1.1.js"></script>
<script src="js/jcanvas.js"></script>
<script src="js/exif.js"></script>
<script src="js/UTIF.js"></script>
<script src="js/jquery-jp4.js"></script>
</head>
......
......@@ -378,6 +378,7 @@ function requestsNextState(success) {
gRequests.sendHttpReq(); /// Will trigger either requestsNextState(true) or requestsNextState(false)
break;
case COMM_STATE_IMG:
//console.log("Getting new image @ "+Date.now()/1000);
gRequests.getImage();
/// start image loading, onLoad/timeout should trigger either requestsNextState(true) or requestsNextState(false)
break;
......@@ -565,6 +566,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 +576,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;
......
......@@ -576,6 +576,7 @@ camInterface.prototype.gotHistogram=function() {
var jp4obj;
camInterface.prototype.gotShadow=function() {
// 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;
......@@ -598,10 +599,12 @@ camInterface.prototype.gotShadow=function() {
if (jp4obj!=undefined){
/*
var tmp = jp4obj.data.getAddr();
if (img_port!=tmp[1]){
jp4obj.data.setAddr(img_addr,img_port);
}
*/
var format = jp4obj.data.getFormat();
var format_note = document.getElementById("format_note");
......@@ -623,8 +626,9 @@ camInterface.prototype.gotShadow=function() {
jp4obj.data.resize(document.getElementById("idDivCameraImage").offsetWidth);
}else{
// this requires jquery
jp4obj = $("#idCameraImage_div").jp4({ip:img_addr,port:img_port,width:document.getElementById("idDivCameraImage").offsetWidth,fast:true,lowres:1,note:true});
// 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({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;
......@@ -659,7 +663,11 @@ 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);
var format = jp4obj.data.getFormat();
if (format=="TIFF"){
$(gRequests.shadowImage).trigger("load");
}
});
......