diff --git a/data/plot.gp b/data/plot.gp index 0566ed1..242e986 100644 --- a/data/plot.gp +++ b/data/plot.gp @@ -13,12 +13,17 @@ set margins 0,0,0,0 set border 0 set size ratio 0.2 +# Find minimum value +stats datafile using 2 nooutput +min_y = STATS_min + set xdata time set timefmt "%Y%m%d%H%M" -#set xrange reverse + +set samples 500 set style fill transparent solid 0.5 border -1 set output outfile -plot datafile using 1:2 smooth csplines with filledcurves y1=0 linecolor rgb "#248BCC" notitle +plot datafile using 1:2 smooth bezier with filledcurves y1=min_y linecolor rgb "#248BCC" notitle diff --git a/html/style.css b/html/style.css index e8ad3fb..d609b1b 100644 --- a/html/style.css +++ b/html/style.css @@ -38,10 +38,14 @@ body { position: relative; padding-left: 7px; padding-right: 7px; + box-shadow: 0 0 4px rgba(36,139,204,0.4), 0 0 8px rgba(36,139,204,0.3), 0 0 16px rgba(36,139,204,0.2); + text-shadow: 0 0 2px #888, 0 0 4px #888, 0 0 8px #888; } .popup h5:hover { background-color: #248bcc; + box-shadow: 0 0 4px rgba(36,139,204,0.7), 0 0 8px rgba(36,139,204,0.6), 0 0 16px rgba(36,139,204,0.5); + text-shadow: 0 0 2px #fff, 0 0 4px #fff, 0 0 8px #fff; } .popup { @@ -114,6 +118,7 @@ body { border-radius: 25px 0 0 25px; float: left; width: 100%; + box-shadow: 0 0 4px rgba(36,139,204,0.4), 0 0 8px rgba(36,139,204,0.3), 0 0 16px rgba(36,139,204,0.2); } .header { @@ -146,6 +151,7 @@ body { border-radius: 15px; background-color: #101010; background: linear-gradient(to top, rgba(10,10,10,0), rgba(36,139,204,1)); + box-shadow: 0 0 4px rgba(36,139,204,0.4), 0 0 8px rgba(36,139,204,0.3), 0 0 16px rgba(36,139,204,0.2); } .current .update { @@ -154,13 +160,15 @@ body { font-weight: normal; color: white; font-size: 15px; + text-shadow: 0 0 2px #000, 0 0 4px #000, 0 0 8px #000; } .current .wttr { margin: 0; - color: #101010; + color: #fff; font-size: 25px; font-weight: bold; + text-shadow: 0 0 2px #000, 0 0 4px #000, 0 0 8px #000; } .current .danger { @@ -168,6 +176,7 @@ body { text-align: center; color: white; font-size: 15px; + text-shadow: 0 0 2px #000, 0 0 4px #000, 0 0 8px #000; } .current .level { @@ -202,6 +211,23 @@ body { border-radius: 25px 0px 25px 25px; } +.data.plot { + text-shadow: 0 0 2px #248bcc, 0 0 4px #248bcc, 0 0 8px #248bcc; +} + +.data::before { + content: ""; + position: absolute; + top: 0; left: 0; right: 0; bottom: 0; + border-bottom: 1px solid #248bcc; + border-radius: 25px 0 25px 25px; + filter: drop-shadow(0 0 2px #248bcc) + drop-shadow(0 0 4px #248bcc) + drop-shadow(0 0 8px #248bcc); + pointer-events: none; + z-index: -1; +} + .plot { background-repeat: no-repeat; background-size: 102% 100%; @@ -222,6 +248,7 @@ body { padding-left: 10px; margin-top: 30px; margin-bottom: 0; + text-shadow: 0 0 2px #000, 0 0 4px #000, 0 0 8px #888; } @@ -392,7 +419,20 @@ body { padding-top: 0; padding-bottom: 0px; font-size: 13px; + position: relative; } + .data::before { + content: ""; + position: absolute; + top: 0; left: 0; right: 0; bottom: 0; + border-bottom: 1px solid #248bcc; + border-radius: 25px 0 25px 25px; + filter: drop-shadow(0 0 2px #248bcc) + drop-shadow(0 0 4px #248bcc) + drop-shadow(0 0 8px #248bcc); + pointer-events: none; + z-index: -1; + } .datapoint { margin: 0; padding-bottom: 0px; diff --git a/index.sh b/index.sh index 6b68618..8ba4a08 100755 --- a/index.sh +++ b/index.sh @@ -65,7 +65,7 @@ wtemp_new="$(cat $data/wtemp.data)" # Write plot data echo "$(date +%Y%m%d%H%M) $atemp_new" >> "$data"/atemp.plot echo "$(date +%Y%m%d%H%M) $depth_new" >> "$data"/depth.plot -echo "$(date +%Y%m%d%H%M) ${disch_new}" >> "$data"/disch.plot +echo "$(date +%Y%m%d%H%M) $disch_new" >> "$data"/disch.plot echo "$(date +%Y%m%d%H%M) $wtemp_new" >> "$data"/wtemp.plot # Clean plot data and create plot images @@ -131,21 +131,22 @@ disch_dng="$(cat $data/disch.data)" if [ $disch_dng -le 350000 ] then - dangr="color:#00FF00\">1" + dangr="color:#00FF00; text-shadow: 0 0 1px #000, 0 0 2px #00FF00, 0 0 4px #00FF00;\">1" + elif [ $disch_dng -gt 350000 ] && [ $disch_dng -le 450000 ] then - dangr="color:#FFFF00\">2" + dangr="color:#FFFF00; text-shadow: 0 0 1px #000, 0 0 2px #FFFF00, 0 0 4px #FFFF00;\">2" elif [ $disch_dng -gt 450000 ] && [ $disch_dng -le 530000 ] then - dangr="color:#FFA500\">3" + dangr="color:#FFA500; text-shadow: 0 0 1px #000, 0 0 2px #FFA500, 0 0 4px #FFA500;\">3" elif [ $disch_dng -gt 530000 ] && [ $disch_dng -le 600000 ] then - dangr="color:#FF0000\">4" + dangr="color:#FF0000; text-shadow: 0 0 1px #000, 0 0 2px #FF0000, 0 0 4px #FF0000;\">4" else - dangr="color:#9A0000\">5" + dangr="color:#9A0000; text-shadow: 0 0 1px #000, 0 0 2px #9A0000, 0 0 4px #9A0000;\">5" fi # Read current data