X-Git-Url: http://average.org/gitweb/?a=blobdiff_plain;f=web%2Findex.html;h=9181b7963ac0e6f56b1458549282b035278d760e;hb=2a268273df281b5a4fa5fcd29c29042877deace0;hp=a1745afe9684bb469b686fb7c6dad6832a852c42;hpb=518d7ac2a0b474e133a2803cd8e05a858d12a647;p=pulsecounter.git
diff --git a/web/index.html b/web/index.html
index a1745af..9181b79 100644
--- a/web/index.html
+++ b/web/index.html
@@ -9,7 +9,7 @@
var ww, wh;
var hmax, hfact;
var tmin, tmax, tfact;
- var xzero = 40, yzero = 48;
+ var xzero = 60, yzero = 48;
var cold_d = [], hot_d = [];
function showdate(utime) {
@@ -28,10 +28,10 @@
const mn = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
- function getcombx(lo, hi) {
+ function getcombx(tmin, tmax) {
var comb = [], lb = [];
var trange = tmax - tmin;
- var inc, inc2, base, t, dt;
+ var inc, inc2, base, base2, t, dt, zoff;
var label = function(t) { return "<<" + t.toFixed(1) + ">>"; }
function tohour(t) { var dt = new Date(t*1000); return dt.getHours(); }
function todow(t) { var dt = new Date(t*1000); return dow[dt.getDay()]; }
@@ -56,25 +56,28 @@
else { /* ~ one month */
/* TODO: make this a separate case with loop over months rather than
fixed number of seconds. */
- inc = 2592000;
+ inc = 86400;
inc2 = 2592000;
label = tomonth;
}
dt = new Date(tmin*1000);
- base = (Math.floor(tmin / inc) + 1) * inc + 60 * dt.getTimezoneOffset();
+ zoff = 60 * dt.getTimezoneOffset();
+ base = (Math.floor((tmin - zoff - 1) / inc) + 1) * inc + zoff;
for (t = base; t < tmax; t += inc)
comb.push(t);
- base = (Math.floor(tmin / inc2) + 1) * inc2 + 60 * dt.getTimezoneOffset();
- for (t = base; t < tmax; t += inc2)
+ base2 = (Math.floor((tmin - zoff - 1) / inc2) + 1) * inc2 + zoff;
+ for (t = base2; t < tmax; t += inc2)
lb.push([t, label(t)]);
- //dbg.innerHTML = "ord=" + ord + "
inc=" + inc + "
"
+ //dbg.innerHTML = "inc=" + inc + "
inc2=" + inc2 + "
"
+ // + "tmin=" + tmin + " tmax=" + tmax + "
"
+ // + "base=" + base + " base2=" + base2 + "
"
// + comb + "
" + lb;
return [comb, lb];
}
function xaxis() {
- var comb = getcombx(0, hmax);
+ var comb = getcombx(tmin, tmax);
var i;
ctx.beginPath();