added less than 0,05 to snelle list. a seemingly unrelated problem exist in the form of ou not being able to be enabled while both st_hul is enabled in odxt and osin of template. i have no idea why

1 files changed, 19 insertions, 10 deletions

diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index 1e6cb13..7199903 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -6,10 +6,15 @@
     skift macro navnet under macro tagget helt i toppen
     skift overskrift i resumeet (navn1->navn2)
     skift GUI overskrift for macroen under widgets afsnittet
-    fjern resume felter der ikke skal bruges
+    fjern resume felter der ikke skal bruges og juster kommaer saa de passer
     fjern tilsvarende GUI felter der ikke skal bruges
   -->
   <resume language="lua">
+    function lttoxml(value)
+      value = string.gsub(value, '&lt;', '&amp;lt;')
+      return value
+    end
+
     out = ''
     if ( getValue('visus.template.mangler.odxt') == '' or getValue('visus.template.mangler.osin') == '' or getValue('visus.template.ou') ~= '' )
     then
@@ -21,7 +26,7 @@
       out = out .. 'o.dxt: '
       if ( getValue('visus.template.snellen.odxt') ~= '' )
       then
-        out = out .. getValue('visus.template.snellen.odxt')
+        out = out .. lttoxml(getValue('visus.template.snellen.odxt'))
         if ( getValue('visus.template.etdrs.odxt') == '' )
         then
 	  out = out .. ', '
@@ -64,7 +69,7 @@
       then
         if ( getValue('visus.template.st_hul.snellen.odxt') ~= '' )
         then
-          out = out .. ', ' .. getValue('visus.template.st_hul.snellen.odxt')
+          out = out .. ', ' .. lttoxml(getValue('visus.template.st_hul.snellen.odxt'))
         end
         if ( getValue('visus.template.st_hul.etdrs.odxt') ~= '' )
         then
@@ -84,7 +89,7 @@
       out = out .. 'o.sin: '
       if ( getValue('visus.template.snellen.osin') ~= '' )
       then
-        out = out .. getValue('visus.template.snellen.osin')
+        out = out .. lttoxml(getValue('visus.template.snellen.osin'))
         if ( getValue('visus.template.etdrs.osin') == '' )
         then
 	  out = out .. ', '
@@ -127,7 +132,7 @@
       then
         if ( getValue('visus.template.st_hul.snellen.osin') ~= '' )
         then
-          out = out .. ', ' .. getValue('visus.template.st_hul.snellen.osin')
+          out = out .. ', ' .. lttoxml(getValue('visus.template.st_hul.snellen.osin'))
         end
         if ( getValue('visus.template.st_hul.etdrs.osin') ~= '' )
         then
@@ -148,7 +153,7 @@
       out = out .. 'o.u: '
       if ( getValue('visus.template.snellen.ou') ~= '' )
       then
-        out = out .. getValue('visus.template.snellen.ou')
+        out = out .. lttoxml(getValue('visus.template.snellen.ou'))
       end
       if ( getValue('visus.template.etdrs.ou') ~= '' )
       then
@@ -410,8 +415,7 @@
       return true
     </script>
   </scripts>
-  <widgets caption="Visus - template"
-          layout="vbox">
+  <widgets caption="Visus - template" layout="vbox">
 
     <frame layout="hbox">
       
@@ -453,6 +457,7 @@
 		<item caption="0,1" value="0,1"/>
 		<item caption="0,08" value="0,08"/>
 		<item caption="0,05" value="0,05"/>
+		<item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		<item caption="6/60" value="6/60"/>
 		<item caption="3/60" value="3/60"/>
 		<item caption="1/18" value="1/18"/>
@@ -639,6 +644,7 @@
 		  <item caption="0,1" value="0,1"/>
 		  <item caption="0,08" value="0,08"/>
 		  <item caption="0,05" value="0,05"/>
+		  <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		  <item caption="6/60" value="6/60"/>
 		  <item caption="3/60" value="3/60"/>
 		  <item caption="1/18" value="1/18"/>
@@ -802,6 +808,7 @@
 		<item caption="0,1" value="0,1"/>
 		<item caption="0,08" value="0,08"/>
 		<item caption="0,05" value="0,05"/>
+		<item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		<item caption="6/60" value="6/60"/>
 		<item caption="3/60" value="3/60"/>
 		<item caption="1/18" value="1/18"/>
@@ -988,6 +995,7 @@
 		  <item caption="0,1" value="0,1"/>
 		  <item caption="0,08" value="0,08"/>
 		  <item caption="0,05" value="0,05"/>
+		  <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		  <item caption="6/60" value="6/60"/>
 		  <item caption="3/60" value="3/60"/>
 		  <item caption="1/18" value="1/18"/>
@@ -1115,13 +1123,13 @@
 
     </frame>
 
-    <!-- Begge øjne -->
+    <!-- Begge oejne -->
     <frame layout="hbox">
       <spacer/>
       <frame layout="vbox">
 	<checkbox caption="Aktiver o.u. måling"
 		  name="visus.template.ou" script="ou"
-		  truevalue="ou" falsevalue="" value=""/>
+		  truevalue="true" falsevalue="" value=""/>
 	<frame name="ou_frame" caption="o.u." layout="vbox">
 	  <frame layout="hbox">
 	    <label caption="Kontrast:"/>
@@ -1154,6 +1162,7 @@
 		<item caption="0,1" value="0,1"/>
 		<item caption="0,08" value="0,08"/>
 		<item caption="0,05" value="0,05"/>
+		<item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
 		<item caption="6/60" value="6/60"/>
 		<item caption="3/60" value="3/60"/>
 		<item caption="1/18" value="1/18"/>