diff --git a/banners/pix/5.png b/banners/pix/5.png index 09ebdbd..687663a 100644 Binary files a/banners/pix/5.png and b/banners/pix/5.png differ diff --git a/banners/pix/5_old.png b/banners/pix/5_old.png new file mode 100644 index 0000000..09ebdbd Binary files /dev/null and b/banners/pix/5_old.png differ diff --git a/banners/pix/_old/0.png b/banners/pix/_old/0.png new file mode 100644 index 0000000..445bdf6 Binary files /dev/null and b/banners/pix/_old/0.png differ diff --git a/banners/pix/_old/1.png b/banners/pix/_old/1.png new file mode 100644 index 0000000..c197fd7 Binary files /dev/null and b/banners/pix/_old/1.png differ diff --git a/banners/pix/_old/2.png b/banners/pix/_old/2.png new file mode 100644 index 0000000..d7c4646 Binary files /dev/null and b/banners/pix/_old/2.png differ diff --git a/banners/pix/_old/3.png b/banners/pix/_old/3.png new file mode 100644 index 0000000..dca3069 Binary files /dev/null and b/banners/pix/_old/3.png differ diff --git a/banners/pix/_old/4.png b/banners/pix/_old/4.png new file mode 100644 index 0000000..a8b1a68 Binary files /dev/null and b/banners/pix/_old/4.png differ diff --git a/banners/pix/_old/5.png b/banners/pix/_old/5.png new file mode 100644 index 0000000..3549087 Binary files /dev/null and b/banners/pix/_old/5.png differ diff --git a/banners/pix/_old/error.png b/banners/pix/_old/error.png new file mode 100644 index 0000000..0d78ed0 Binary files /dev/null and b/banners/pix/_old/error.png differ diff --git a/banners/tile.png b/banners/tile.png index 8cda335..f36ddb2 100644 Binary files a/banners/tile.png and b/banners/tile.png differ diff --git a/sim/index.html b/sim/index.html index b573d6b..56a4d4b 100644 --- a/sim/index.html +++ b/sim/index.html @@ -158,9 +158,9 @@ Reset -
+
Reset Sliders
diff --git a/sim/js/Model.js b/sim/js/Model.js index b68184c..51e0bd5 100644 --- a/sim/js/Model.js +++ b/sim/js/Model.js @@ -26,7 +26,7 @@ let interventionStrengths = [ ['isolate', 0.4], ['quarantine', 0.5], ['masks', 0.35*0.5], // 3.4 fold reduction (70%) (what CI?), subtract points for... improper usage? https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3591312/ // cloth masks... - ['summer', 0.333] // 15°C diff * 0.0225 (Wang et al) + ['summer', 0.4] // 15°C diff * 0.0225 (Wang et al) ]; let updateModel = (days, fake)=>{ @@ -219,7 +219,7 @@ sliderColors.forEach((icPair, i)=>{ cursor: ew-resize; background: ${color}; color: ${color}; - border:1px solid rgba(0,0,0,0.5); + border:1px solid rgba(128,128,128,0.5); position:relative; top:1px; cursor:grab; @@ -554,7 +554,8 @@ let draw = ()=>{ interventionColors.forEach((ic)=>{ if(ic[0]=="non_s") return; // EXCEPT Non-Susceptibles ctx.fillStyle = ic[1]; - ctx.globalAlpha = int[ic[0]] * 0.2;//ic[2]; + ctx.globalAlpha = int[ic[0]] * ic[2]; + // ctx.globalAlpha = int[ic[0]] * 0.2; ctx.fillRect(0,y,w,h); ctx.globalAlpha = 1; });