X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=c%2Fgoertzel%2Fsleepplot.sh;h=a47f7e2f92be1efe07f7d135bf38656b29933782;hb=165bbc9688dd5a2ca2b6f76bca2df9213c80073f;hp=0e8ed5eef79f0beb99379187a905f1e2100ecb91;hpb=afc6fd9f94616bc50b6cd4f1d034f420403a8f0f;p=mirrors%2FPrograms.git

diff --git a/c/goertzel/sleepplot.sh b/c/goertzel/sleepplot.sh
index 0e8ed5e..a47f7e2 100755
--- a/c/goertzel/sleepplot.sh
+++ b/c/goertzel/sleepplot.sh
@@ -10,11 +10,11 @@ graphout="${in%%.*}.png"
 test -n "$2" && graphout="$2";
 
 #Last state
-last="$(tail -n 1 "$in" | cut -d ' ' -f 4)"
+last="$(tail -n 1 "$in" | cut -d ' ' -f 5)"
 test "$last" -gt 0 && last="motion" || last="peace";
 
 #Approximate size of graph
-size="$(tail -n 1 "$in" | cut -d . -f 1)"
+size="$(tail -n 1 "$in" | cut -d . -f 1 | sed -e 's/^0*//' | tee /tmp/lol)"
 test $size -gt 3600 && size="$(( $size/10 ))" #For prolonged periods
 size="$(( 600 + $size ))"
 
@@ -38,11 +38,15 @@ set grid
 #set pointsize 0.5
 plot\
 "$in" using 2:5 title "Sensor state" with steps,\
-"" using 2:(\$6*2) title "Avg. 10s" with lines,\
-"" using 2:(\$7*3) title "Avg. 30s" with lines,\
-"" using 2:(\$8*3) title "Avg. 60s" with lines,\
-"" using 2:(\$9*3) title "Avg. 90s" with lines,\
-"" using 2:(\$10*4) title "Avg. 120s" smooth bezier\
+"$in.stats" using 1:((\$3*3+\$4*6+\$5*6+\$6+\$7)/5) title "Avg." smooth bezier\
+#"" using 2:((\$6*3+\$7*6+\$8*6+\$9+\$10)/5) title "Avg." with lines,\
+#"$in.stats" using 1:((\$3*3+\$4*6+\$5*6+\$6+\$7)/5) title "Avg." with lines,\
+#"" using 2:(\$6*2) title "Avg. 10s" with lines,\
+#"" using 2:(\$7*3) title "Avg. 30s" with lines,\
+#"" using 2:(\$8*3) title "Avg. 60s" with lines,\
+#"" using 2:(\$9*3) title "Avg. 90s" with lines,\
+#"" using 2:(\$10*4) title "Avg. 120s" smooth bezier\
+
 
 EOF