From: paul Date: Sun, 10 Apr 2016 16:32:15 +0000 (+0000) Subject: enable drawing via android-4, quicker drawing via lines X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=33a8e0e8967077bb2aa63b4bea706dc61d3e42d8;p=confetti enable drawing via android-4, quicker drawing via lines svn path=/trunk/; revision=97 --- diff --git a/actions/update_therapy.sh b/actions/update_therapy.sh index 52daa11..e7dcae2 100755 --- a/actions/update_therapy.sh +++ b/actions/update_therapy.sh @@ -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 diff --git a/templates/text_frame.sh b/templates/text_frame.sh index 03eddcd..e5f2dcb 100755 --- a/templates/text_frame.sh +++ b/templates/text_frame.sh @@ -20,6 +20,7 @@ item_name[p_email]="Email" item_name[p_error]="Fehler" item_name[p_categories]="Kategorien" item_name[p_prescriptions]="Verschreibungen" +item_name[p_therapy]="Therapie" case $PROFILE in medical) diff --git a/templates/therapy.css.sh b/templates/therapy.css.sh index face0b8..e3184a5 100755 --- a/templates/therapy.css.sh +++ b/templates/therapy.css.sh @@ -3,6 +3,7 @@ cat <
- + $(n=1; while [ -n "${tpy[${sid}_note${n}]+x}" ]; do t_session_note $session_n $n n=$(($n+1)) @@ -191,13 +191,14 @@ cat <= 800 ){ sx=Math.floor(cscaleW * (x - canvas.offsetLeft)) @@ -206,12 +207,10 @@ cat <