corrected functions related to drawing

diff --git a/therapies/page.sh b/therapies/page.sh
index ece7ad1ee9057934cab0bd9d2f570a432846ccda..ecf113ae8f6c150213609909961a200db38dd1c8 100755 (executable)
--- a/therapies/page.sh
+++ b/therapies/page.sh
@@ -190,19 +190,19 @@ penwidth="$(TPY penwidth |grep -xE -m1 '(4|12|36)' || printf '4')"
 color="$(TPY color |grep -xE -m1 '#(000|00A|0A0|0AA|A00|A0A|AA0|FFF)' || printf '#000')"
 cat <<EOF
   [fieldset .penwidth
-    [radio "penwidth" "4"  #pw1 $(selected $penwidth 4) ][label for="pw2"]
-    [radio "penwidth" "12" #pw2 $(selected $penwidth 12)][label for="pw3"]
-    [radio "penwidth" "36" #pw3 $(selected $penwidth 36)][label for="pw1"]
+    [radio "penwidth" "4"  #pw1 $(checked "$penwidth" 4) ][label for="pw2"]
+    [radio "penwidth" "12" #pw2 $(checked "$penwidth" 12)][label for="pw3"]
+    [radio "penwidth" "36" #pw3 $(checked "$penwidth" 36)][label for="pw1"]
   ]
   [fieldset .color
-    [radio "color" "#000" .color #c000 $(checked $color '#000') ][label for=c000 ]
-    [radio "color" "#00A" .color #c001 $(checked $color '#00A') ][label for=c001 ]
-    [radio "color" "#0A0" .color #c010 $(checked $color '#0A0') ][label for=c010 ]
-    [radio "color" "#0AA" .color #c011 $(checked $color '#0AA') ][label for=c011 ]
-    [radio "color" "#A00" .color #c100 $(checked $color '#A00') ][label for=c100 ]
-    [radio "color" "#A0A" .color #c101 $(checked $color '#A0A') ][label for=c101 ]
-    [radio "color" "#AA0" .color #c110 $(checked $color '#AA0') ][label for=c110 ]
-    [radio "color" "#FFF" .color #c111 $(checked $color '#FFF') ][label for=c111 ]
+    [radio "color" "#000" .color #c000 $(checked "$color" '#000') ][label for=c000 ]
+    [radio "color" "#00A" .color #c001 $(checked "$color" '#00A') ][label for=c001 ]
+    [radio "color" "#0A0" .color #c010 $(checked "$color" '#0A0') ][label for=c010 ]
+    [radio "color" "#0AA" .color #c011 $(checked "$color" '#0AA') ][label for=c011 ]
+    [radio "color" "#A00" .color #c100 $(checked "$color" '#A00') ][label for=c100 ]
+    [radio "color" "#A0A" .color #c101 $(checked "$color" '#A0A') ][label for=c101 ]
+    [radio "color" "#AA0" .color #c110 $(checked "$color" '#AA0') ][label for=c110 ]
+    [radio "color" "#FFF" .color #c111 $(checked "$color" '#FFF') ][label for=c111 ]
   ]
   [img .dotmark .bg src="/therapies/therapy_background.png" alt="WARNING: Missing background image!"]
   [canvas #canvas .dotmark .ov width="${bg_dim%x*}" height="${bg_dim#*x}" ]

diff --git a/therapies/therapy_draw.js b/therapies/therapy_draw.js
index 8a8e936c6873b443a0d7ba0799b491e7f5d50f7e..9710564ce46803335a11855a437e5d3c911b777d 100644 (file)
--- a/therapies/therapy_draw.js
+++ b/therapies/therapy_draw.js
@@ -77,16 +77,16 @@ function drawstart(x, y) {
   setstroke(document.querySelector('input[name="penwidth"]:checked').value);
   setcol(document.querySelector('input[name="color"]:checked').value);
 
-  image.beginPath()
-  draw(x, y)  // why must this not use relative Coords ???
+  image.beginPath();
+  draw(x, y);  // why must this not use relative Coords ???
 
-  image_serialize = " polyline"
+  image_serialize = " polyline " + stx + "," + sty;
 }
 
 function drawstop() {
  
   // if path ends close to beginning ( < 50 px); then close path and fill
-  if ( false && mouse == 1 && Math.sqrt( Math.pow(stx - cux, 2) + Math.pow(sty - cuy, 2)) <= 50 && c !== "#FFF" ){
+  if ( mouse == 1 && Math.sqrt( Math.pow(stx - cux, 2) + Math.pow(sty - cuy, 2)) <= 50 && c !== "#FFF" ){
     image.lineTo( stx, sty )
     image.stroke()