This commit is contained in:
Nicky Case 2020-05-01 11:28:50 -04:00
parent 82f0680eb0
commit 4f83ea53f8
12 changed files with 6 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 227 KiB

BIN
banners/pix/5_old.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

BIN
banners/pix/_old/0.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 KiB

BIN
banners/pix/_old/1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

BIN
banners/pix/_old/2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

BIN
banners/pix/_old/3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 KiB

BIN
banners/pix/_old/4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 KiB

BIN
banners/pix/_old/5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 KiB

BIN
banners/pix/_old/error.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 637 KiB

After

Width:  |  Height:  |  Size: 654 KiB

View File

@ -158,9 +158,9 @@
Reset
</div>
</div>
<div id="sb_stop">
<!--div id="sb_stop">
Stop
</div>
</div-->
<div id="sb_reset">
Reset Sliders
</div>

View File

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