Index: trunk/FACT++/Makefile.am =================================================================== --- trunk/FACT++/Makefile.am (revision 13478) +++ trunk/FACT++/Makefile.am (revision 13479) @@ -40,4 +40,5 @@ mcp feedback ratescan ratecontrol \ magicweather \ + smartfact \ fitsdump fitscheck @@ -81,4 +82,5 @@ drivectrl.man \ datalogger.man \ + smartfact.man \ fitsdump.man \ fitscheck.man @@ -251,4 +253,9 @@ libConfiguration.la +smartfact_SOURCES = src/smartfact.cc src/LocalControl.h src/PixelMap.cc +smartfact_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la + magicweather_SOURCES = src/magicweather.cc src/LocalControl.h magicweather_LDADD = libDim++.la libDim.la libDimExtension.la \ Index: trunk/FACT++/Makefile.in =================================================================== --- trunk/FACT++/Makefile.in (revision 13478) +++ trunk/FACT++/Makefile.in (revision 13479) @@ -50,6 +50,7 @@ drivectrl$(EXEEXT) mcp$(EXEEXT) feedback$(EXEEXT) \ ratescan$(EXEEXT) ratecontrol$(EXEEXT) magicweather$(EXEEXT) \ - fitsdump$(EXEEXT) fitscheck$(EXEEXT) $(am__EXEEXT_1) \ - $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) + smartfact$(EXEEXT) fitsdump$(EXEEXT) fitscheck$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ + $(am__EXEEXT_4) @HAS_GUI_TRUE@am__append_1 = fact @HAS_VIEWER_TRUE@am__append_2 = viewer @@ -348,4 +349,8 @@ scheduler_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \ libDim++.la libDim.la libDimExtension.la libConfiguration.la +am_smartfact_OBJECTS = src/smartfact.$(OBJEXT) src/PixelMap.$(OBJEXT) +smartfact_OBJECTS = $(am_smartfact_OBJECTS) +smartfact_DEPENDENCIES = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la libConfiguration.la am_test_OBJECTS = src/test.$(OBJEXT) test_OBJECTS = $(am_test_OBJECTS) @@ -441,6 +446,6 @@ $(magicweather_SOURCES) $(mcp_SOURCES) $(ratecontrol_SOURCES) \ $(ratescan_SOURCES) $(readfits_SOURCES) sched.c \ - $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \ - $(triggerschedule_SOURCES) $(viewer_SOURCES) + $(scheduler_SOURCES) $(smartfact_SOURCES) $(test_SOURCES) \ + $(time_SOURCES) $(triggerschedule_SOURCES) $(viewer_SOURCES) DIST_SOURCES = $(libConfiguration_la_SOURCES) $(libDim___la_SOURCES) \ $(libDim_la_SOURCES) $(libDimExtension_la_SOURCES) \ @@ -458,6 +463,7 @@ $(logtime_SOURCES) $(magicweather_SOURCES) $(mcp_SOURCES) \ $(ratecontrol_SOURCES) $(ratescan_SOURCES) $(readfits_SOURCES) \ - sched.c $(scheduler_SOURCES) $(test_SOURCES) $(time_SOURCES) \ - $(triggerschedule_SOURCES) $(am__viewer_SOURCES_DIST) + sched.c $(scheduler_SOURCES) $(smartfact_SOURCES) \ + $(test_SOURCES) $(time_SOURCES) $(triggerschedule_SOURCES) \ + $(am__viewer_SOURCES_DIST) man1dir = $(mandir)/man1 NROFF = nroff @@ -715,4 +721,5 @@ @HAS_HELP2MAN_TRUE@ drivectrl.man \ @HAS_HELP2MAN_TRUE@ datalogger.man \ +@HAS_HELP2MAN_TRUE@ smartfact.man \ @HAS_HELP2MAN_TRUE@ fitsdump.man \ @HAS_HELP2MAN_TRUE@ fitscheck.man @@ -858,4 +865,9 @@ drivectrl_SOURCES = src/drivectrl.cc src/LocalControl.h src/HeadersFTM.cc drivectrl_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la + +smartfact_SOURCES = src/smartfact.cc src/LocalControl.h src/PixelMap.cc +smartfact_LDADD = libDim++.la libDim.la libDimExtension.la \ libStateMachine.la libTools.la libTime.la \ libConfiguration.la @@ -1446,4 +1458,9 @@ @rm -f scheduler$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS) +src/smartfact.$(OBJEXT): src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) +smartfact$(EXEEXT): $(smartfact_OBJECTS) $(smartfact_DEPENDENCIES) + @rm -f smartfact$(EXEEXT) + $(AM_V_CXXLD)$(CXXLINK) $(smartfact_OBJECTS) $(smartfact_LDADD) $(LIBS) src/test.$(OBJEXT): src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) @@ -1648,4 +1665,5 @@ -rm -f src/readfits.$(OBJEXT) -rm -f src/scheduler.$(OBJEXT) + -rm -f src/smartfact.$(OBJEXT) -rm -f src/test.$(OBJEXT) -rm -f src/time.$(OBJEXT) @@ -1772,4 +1790,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/readfits.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/scheduler.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/smartfact.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/time.Po@am__quote@ Index: trunk/FACT++/src/feedback.cc =================================================================== --- trunk/FACT++/src/feedback.cc (revision 13478) +++ trunk/FACT++/src/feedback.cc (revision 13479) @@ -776,4 +776,5 @@ const float *ptr = reinterpret_cast(fBiasNom.getData()); fVoltGapd.assign(ptr, ptr+416); + Info("Nominal bias voltages received."); return; } @@ -1210,4 +1211,5 @@ fBiasA("BIAS_CONTROL/CURRENT", (void*)NULL, 0, this), fBiasData("FAD_CONTROL/FEEDBACK_DATA", (void*)NULL, 0, this), + fBiasNom("BIAS_CONTROL/NOMINAL", (void*)NULL, 0, this), fCameraTemp("FSC_CONTROL/TEMPERATURE", (void*)NULL, 0, this), fDimReference("FEEDBACK/REFERENCE", "F:416", Index: trunk/FACT++/src/smartfact.cc =================================================================== --- trunk/FACT++/src/smartfact.cc (revision 13478) +++ trunk/FACT++/src/smartfact.cc (revision 13479) @@ -143,5 +143,5 @@ for (int i=0; i<7; i++) - out << fMagicWeatherData[i] << '\n'; + out << "#ffffff\t" << fMagicWeatherData[i] << '\n'; ofstream fout("www/magicweather.txt"); @@ -216,11 +216,11 @@ out << fDriveControlSourceName << '\n'; out << setprecision(5); - out << ra << '\n'; - out << dec << '\n'; + out << "#ffffff\t" << ra << '\n'; + out << "#ffffff\t" << dec << '\n'; out << setprecision(3); - out << woff << '\n'; - out << wang << '\n'; - - ofstream fout("www/drive-source.txt"); + out << "#ffffff\t" << woff << '\n'; + out << "#ffffff\t" << wang << '\n'; + + ofstream fout("www/drive.txt"); fout << out.str(); } @@ -392,17 +392,52 @@ return kStateRunning; + fLastUpdate=now; + ostringstream out; out << uint64_t(nearbyint(now.UnixTime()*1000)) << '\n'; out << setprecision(3); + // -------------- System status -------------- + out << "n/a\n"; + + // ------------------ Drive ----------------- + if (fStatusDriveControl.second>=5) // Armed, Moving, Tracking + { + const State rc = fNetwork.GetState("DRIVE_CONTROL", fStatusDriveControl.second); + out << "#ffffff\t"; + out << rc.name << '\t'; + out << fDriveControlPointingZd << '\t'; + out << fDriveControlPointingAz << '\t'; + out << fDriveControlTrackingDev << '\t'; + out << fDriveControlSourceName << '\n'; + } + else + out << "#ffffff\t\t\t\t\t\n"; + // --------------- MagicWeather ------------- if (fStatusMagicWeather.second==3) { - out << fMagicWeatherData[kTemp] << '\n'; + const float diff = fMagicWeatherData[kTemp]-fMagicWeatherData[kDew]; + string col1 = "#fff8f0"; + if (diff>0.3) + col1="#fffff0"; + if (diff>0.7) + col1="#f0fff0"; + + const float wind = fMagicWeatherData[kGusts]; + string col2 = "#f0fff0"; + if (wind>35) + col2="#fffff0"; + if (wind>50) + col2="#fff8f0"; + + out << col1 << "\t"; + out << fMagicWeatherData[kTemp] << '\t'; out << fMagicWeatherData[kDew] << '\n'; + out << col2 << "\t"; out << fMagicWeatherData[kGusts] << '\n'; } else - out << "\n\n\n"; + out << "#ffffff\t\t\n\n"; // --------------- BiasControl ------------- @@ -411,26 +446,21 @@ fStatusBiasControl.second==9) // Off { + string col = fBiasControlVoltageMed>3?"#fff8f0":"#ffffff"; + if (fBiasControlCurrentMax>280) + col = "#fffff0"; + if (fBiasControlCurrentMax>350) + col = "#fff8f0"; + + out << col << "\t"; + out << fBiasControlCurrentMed << '\t'; + out << fBiasControlCurrentMax << '\t'; out << fBiasControlVoltageMed << '\n'; - out << fBiasControlCurrentMed << '\n'; - out << fBiasControlCurrentMax << '\n'; } else - out << "\n\n\n"; - - // ------------------ Drive ----------------- - if (fStatusDriveControl.second>=5) // Armed, Moving, Tracking - { - const State rc = fNetwork.GetState("DRIVE_CONTROL", fStatusDriveControl.second); - out << rc.name << '\n'; - out << fDriveControlPointingZd << '\n'; - out << fDriveControlPointingAz << '\n'; - out << fDriveControlTrackingDev << '\n'; - out << fDriveControlSourceName << '\n'; - } - else - out << "\n\n\n\n\n"; + out << "#ffffff\t\t\t\n"; + // ------------------------------------------ - ofstream fout("www/status.txt"); + ofstream fout("www/fact.txt"); fout << out.str(); Index: trunk/FACT++/www/index.css =================================================================== --- trunk/FACT++/www/index.css (revision 13478) +++ trunk/FACT++/www/index.css (revision 13479) @@ -7,7 +7,7 @@ border-width: 1px 1px 2px 1px; text-shadow: 0 1px 0 #37b2eb; - -moz-border-radius: 5px 5px 0 0; - -webkit-border-top-left-radius: 5px; - -webkit-border-top-right-radius: 5px; + /*-moz-border-radius: 5px 5px 0 0;*/ + /*-webkit-border-top-left-radius: 5px;*/ + /*-webkit-border-top-right-radius: 5px;*/ font-size: 13px; } @@ -30,5 +30,4 @@ .tcol1 { - border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; } @@ -37,5 +36,13 @@ border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; - text-align:center; + text-align:right; + margin-left:5px; + margin-right:5px; +} + +.tcol0 { + border-left: 1px solid #ccc; + border-bottom: 1px solid #ccc; + text-align:left; margin-left:5px; margin-right:5px; @@ -84,7 +91,7 @@ vertical-align: middle; padding: 6px; - -moz-border-radius: 0 0 5px 5px; - -webkit-border-bottom-left-radius: 5px; - -webkit-border-bottom-right-radius: 5px; + /*-moz-border-radius: 0 0 5px 5px;*/ + /*-webkit-border-bottom-left-radius: 5px;*/ + /*-webkit-border-bottom-right-radius: 5px;*/ text-shadow: 0 -1px 0 #333; font-size: 12px; Index: trunk/FACT++/www/index.html =================================================================== --- trunk/FACT++/www/index.html (revision 13478) +++ trunk/FACT++/www/index.html (revision 13479) @@ -1,4 +1,5 @@ - + + @@ -7,116 +8,56 @@ + - - - + - - - - - - - - +
- - - -
» FACT «
Wed, 25 Apr 2012 10:45:23 GMT
-
+ + + + + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
logbookbooting...
+ + + - - - -
- - Index: trunk/FACT++/www/index.js =================================================================== --- trunk/FACT++/www/index.js (revision 13478) +++ trunk/FACT++/www/index.js (revision 13479) @@ -22,8 +22,5 @@ function onload() { - loadPage("fact"); - - refresh_text(); - refresh_graphics(); + loadPage("fact", 0); } @@ -54,10 +51,11 @@ } + buildPage(name, xmlHttp.responseText, (z+1)%2); + changePage(z); + //changePage(name, xmlHttp.resposeText); - //slideOut(name, xmlHttp.responseText); - - displayPage(name, xmlHttp.responseText, 1); - onresize(true); + //displayPage(name, xmlHttp.responseText); + //onresize(true); } }; @@ -67,12 +65,15 @@ -function displayPage(name, text, z) -{ - var table = $("tbody"+z); - +function buildPage(name, text, z) +{ + var table = $("table"+z); table.setAttribute("data-file", ""); - while (table.hasChildNodes()) - table.removeChild(table.lastChild); + var p = table.tBodies.length==3 ? 1 : 0; + + var tbody = $("table"+z).tBodies[p]; + + while (tbody.hasChildNodes()) + tbody.removeChild(tbody.lastChild); var lines = text.split('\n'); @@ -80,7 +81,19 @@ if (lines.length>0) { + /* var newe = document.createElement("span"); newe.innerHTML = lines[0]; - $("title").replaceChild(newe, $("title").lastChild); + var title = $("table"+z).tHead.rows[0].cells[0].childNodes[0].childNodes[1]; + title.replaceChild(newe, title.lastChild); + */ + + //var x = title.lastChild; + //title.removeChild(title.lastChild); + //title.appendChild(newe); + + var newe = document.createElement("span"); + newe.innerHTML = lines[0]; + var title = $("title"+z);//.innerHtml = lines[0]; + title.replaceChild(newe, title.lastChild); } @@ -96,5 +109,5 @@ if (cols.length != 3 && cols.length !=4) { - alert("Size mismatch #"+i+": "+lines[i]); + alert("Size mismatch #"+i+": '"+lines[i]+"' N(cols)="+cols.length); continue; } @@ -114,11 +127,18 @@ var canv = document.createElement("canvas"); - canv.setAttribute("id", "canvas"); + canv.setAttribute("id", "canvas"+z); canv.setAttribute("width", "1"); canv.setAttribute("height", "1"); canv.setAttribute("data-file", cols[1].substring(7)); + canv.setAttribute("style", "display:none;"); td.appendChild(canv); - table.appendChild(tr); + var img = document.createElement("img"); + img.setAttribute("id", "image"+z); + img.setAttribute("width", "1"); + img.setAttribute("height", "1"); + td.appendChild(img); + + tbody.appendChild(tr); continue; } @@ -126,4 +146,8 @@ var tr = document.createElement("tr"); tr.setAttribute("class", "row"); + if (valid(cols[0])) + tr.setAttribute("onclick", "this.style.background='#ccb'; loadPage('"+cols[0]+"',"+z+");"); + if (valid(cols[3])) + tr.setAttribute("onclick", "this.style.background='#ccb'; loadPage('"+cols[3]+"',"+z+");"); //tr.setAttribute("id", cols[0]+"_row"); @@ -137,8 +161,4 @@ td1.setAttribute("class", "tcol1"); td1.setAttribute("width", "100%"); - if (valid(cols[0])) - td1.setAttribute("onclick", "loadPage('"+cols[0]+"');"); - if (valid(cols[3])) - td1.setAttribute("onclick", "loadPage('"+cols[3]+"');"); tr.appendChild(td1); @@ -170,5 +190,5 @@ innertr.appendChild(cell2); - table.appendChild(tr); + tbody.appendChild(tr); counter++; @@ -201,86 +221,97 @@ tr.appendChild(td); - table.appendChild(tr); + tbody.appendChild(tr); table.setAttribute("data-file", name); } -function onresize(load) -{ +function onresize() +{ + var z = $("body").getAttribute("data-visible"); + + var img = $("image"+z); + var canv = $("canvas"+z); + if (img == undefined || canv == undefined) + return; + var W = window.innerWidth; var H = window.innerHeight; - var canv = $("canvas"); - - if (canv != undefined) - { - canv.width = 1; - canv.height = 1; - } - - var tw = $('table').offsetWidth; - var th = $('table').offsetHeight; - - var tx = $('table').offsetLeft; - var ty = $('table').offsetTop; - - //var margin = (W-tw)*2; - - var cw = tw - 2*tx; - var ch = H - th - 2*ty; - - if (canv != undefined) - { - canv.width = cw; - canv.height = ch-ty; - } + img.width = 1; + img.height = 1; + + img.width = W; + img.height += H - $("table"+z).offsetHeight; + + canv.width = img.width; + canv.height = img.height; // ------ debug ----- $('debug').innerHTML = ""; - $('debug').innerHTML += "|x="+tx+"/"+ty; $('debug').innerHTML += "|W="+W +"/"+H; - $('debug').innerHTML += "|T="+tw+"/"+th; - $('debug').innerHTML += "|C="+cw+"/"+ch; -} - -var intervalSlideOut = null; - -function changePage(newpage) -{ - var z = $("body").dataset.visible; - $('table').style.position="fixed"; - intervalSlideOut = setInterval("doSlideOut('"+newpage+"')", 100); -} - -function doSlideOut(newpage) -{ +} + +var intervalSlide = null; + +function changePage(z) +{ + // No page displayed yet + if ($("table0").style.display=="none" && $("table1").style.display=="none") + { + $("table1").style.display=""; + $("body").setAttribute("data-visible", "1"); + + onresize(); + + refresh_text(); + refresh_graphics(); + return; + } + + intervalSlide = setInterval("doSlideOut("+z+")", 25); +} + +function doSlideOut(z) +{ + var table = $("table"+z); + var W = window.innerWidth; - var x = $('table').offsetLeft; + var x = table.offsetLeft; var ix = parseInt(x); if (ix>W) { - clearInterval(intervalSlideOut); - slideIn(); + clearInterval(intervalSlide); + + table.style.display="none"; + + z = (z+1)%2; + table = $("table"+z); + + table.style.display=""; + table.style.left = window.innerWidth+"px"; + + $("body").setAttribute("data-visible", z); + onresize(); + + intervalSlide = setInterval("doSlideIn("+z+")", 25); return; } ix += W/10; - - $('table').style.left=ix+"px"; - -// timeoutSlideOut = setTimeout("slideOut()", 100); -} - -function slideIn() -{ + table.style.left=ix+"px"; +} + +function doSlideIn(z) +{ + var table = $("table"+z); + var W = window.innerWidth; - var x = $('table').offsetLeft; + var x = table.offsetLeft; var ix = parseInt(x); if (ix==0) { - $('table').style.position=""; - // restart refersh! + clearInterval(intervalSlide); return; } @@ -290,19 +321,15 @@ ix = 0; - $('table').style.left=ix+"px"; - - setTimeout("slideIn()", 100); + table.style.left=ix+"px"; } function refresh_text() { - // Is sliding? - if ($('table').style.position=="fixed") - return; - - var z=$("body").dataset.visible; - - var fname = $("tbody"+z).dataset.file; - if (!valid(fname)) + var z=$("body").getAttribute("data-visible"); + var table = $("table"+z); + + // Is sliding or no file defined? + var fname = table.getAttribute("data-file"); + if (table.offsetLeft>0 || !valid(fname)) { setTimeout("refresh_text()", 1000); @@ -330,10 +357,8 @@ alert("ERROR[1] - HTTP request '"+fname+".txt': "+this.statusText+" ["+this.status+"]"); setTimeout("refresh_text()", 10000); - /****** invalidate ******/ return; } - //alert("ok"); - process_status(fname, this.responseText); + update_text(fname, this.responseText); setTimeout("refresh_text()", 3000); } @@ -343,7 +368,6 @@ } -function strike(id, status) -{ - var e = $(id); +function strike(e, status) +{ if (!e) return; @@ -376,8 +400,10 @@ var date0 = null; -function process_status(fname, result) -{ - var z=$("body").dataset.visible; - if ($("tbody"+z).dataset.file != fname) +function update_text(fname, result) +{ + var z=$("body").getAttribute("data-visible"); + var table = $("table"+z); + + if (table.getAttribute("data-file") != fname) return; @@ -385,4 +411,8 @@ // ---------------------------------------------------- + + var time = $("reporttime"+z); + var ltime = $("localtime"+z); + var date1 = new Date(); @@ -390,5 +420,5 @@ { if (date0 != null) - strike("time", date0.getTime()+60000>date1.getTime()); + strike(time, date0.getTime()+60000>date1.getTime()); // FIXME: Reset display to "---" values -- no connection return; @@ -398,17 +428,29 @@ date2.setTime(tokens[0]); - strike("time", date2.getTime()+60000>date1.getTime()); + strike(time, date2.getTime()+60000>date1.getTime()); date0 = date2; + time.innerHTML = + "· "+date0.toUTCString()+" ·";//getUTCFullYear()+"/"+date0.getUTCMonth()+"/"+date0.getUTCDate()+" "+date0.getUTCHours()+":"+date0.getUTCMinutes()+":"+date0.getUTCSeconds()+"."+date0.getUTCMilliseconds(); + ltime.innerHTML = + "· "+date1.toLocaleString()+" ·";//ISOlocalDateStr();//ltoString(); + // ---------------------------------------------------- + var p = table.tBodies.length==3 ? 1 : 0; + var tbody = table.tBodies[p]; + for (var line=1; line0|| !valid(fname)) { setTimeout("refresh_graphics()", 1000); @@ -456,14 +491,6 @@ catch(e) { - try { xmlHttp = new ActiveXObject("Microsoft.XMLHTTP"); } - catch(e) - { - try { xmlHttp = new ActiveXObject("Msxml2.XMLHTTP"); } - catch(e) - { - alert("Your browser doesn't support dynamic reload."); - return; - } - } + alert("Your browser doesn't support dynamic reload."); + return; } @@ -548,5 +575,6 @@ function drawPix(x, y, col) { - var canv = $("canvas"); + var z = $("body").getAttribute("data-visible"); + var canv = $("canvas"+z); var cw = canv.width; @@ -570,5 +598,6 @@ return; - var canv = $("canvas"); + var z = $("body").getAttribute("data-visible"); + var canv = $("canvas"+z); if (canv == undefined) return; @@ -675,6 +704,9 @@ ctx.strokeText("2.0V", cw-5, 5); -} - + var img = $("image"+z); + img.src = canv.toDataURL("image/png"); + +} +/* function save() { @@ -686,2 +718,3 @@ document.location.href = img; } +*/