X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=actions%2Fupdate_therapy.sh;h=6ba06cbd41214d84efe623d7c640020cd049d191;hp=52daa11ba0e042f921a66738edee62c7c21e16d7;hb=61666ee9e4ce45e915ead39c575493c075c68845;hpb=a9d6bfdfa84de24b8800b6d34b24c28cbdb2feb4

diff --git a/actions/update_therapy.sh b/actions/update_therapy.sh
index 52daa11..6ba06cb 100755
--- a/actions/update_therapy.sh
+++ b/actions/update_therapy.sh
@@ -43,7 +43,7 @@ if [ -n "$_POST[delete_session]" ]; then
 elif [ -n "$_POST[new_session]" ]; then
   sid="$_POST[new_session]"
 
-  identify "$_EXEC/templates/therapy_background.png" \
+  identify "$_EXEC/static/therapy_background.png" \
   | sed -r 's;^.* ([0-9]+x[0-9]+) .*$;\1;' \
   | read dim
 
@@ -52,24 +52,16 @@ elif [ -n "$_POST[new_session]" ]; then
   printf '%s:exists\n' "$sid" >>"$tempfile"
   printf '%s_open:checked\n' "$sid" >>"$tempfile"
 
-elif [ -n "$_POST[dotmark.x]" -a -n "$_POST[dotmark.y]" ]; then
-  sed -rn 's;^(session[0-9]+)_open:checked$;\1;p' "$tempfile" \
-  | sort -n \
-  | tail -n1 \
-  | read sid
-
-  x="$_POST[dotmark.x]"
-  y="$_POST[dotmark.y]"
-
-  convert "${tpyfile%.tpy}_${sid}.png" -draw "fill $_POST[color] circle $x,$y $(($x+5)),$y" "${tpyfile%.tpy}_${sid}.png"
-
 elif [ -n "$_POST[imagedata]" ]; then
   sed -rn 's;^(session[0-9]+)_open:checked$;\1;p' "$tempfile" \
   | sort -n \
   | tail -n1 \
   | read sid
 
-  convert "${tpyfile%.tpy}_${sid}.png" -draw "${_POST[imagedata]}" -transparent white "${tpyfile%.tpy}_${sid}.png"
+  convert "${tpyfile%.tpy}_${sid}.png" \
+          -strokewidth 2 -fill '#00000000' \
+          -draw "${_POST[imagedata]}" -transparent white \
+          "${tpyfile%.tpy}_${sid}.png"
   sync
 fi