From e51af58093988ea86070e6b6cd8f3c65d835c085 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Tue, 13 Oct 2009 11:00:49 +0000
Subject: all visus macros fixed. all files containing tremaaneder moved to
 efterkontrol. several other smaller fixes applied to various.

---
 .../xml/macros/visus-manifest_refraktion-1.0.xml   | 781 +++++++++++----------
 1 file changed, 418 insertions(+), 363 deletions(-)

(limited to 'server/xml/macros/visus-manifest_refraktion-1.0.xml')

diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 9d79bd3..3747fb5 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -2,34 +2,78 @@
 <macro name="visus-manifest_refraktion" version="1.0">
   <resume language="lua">
     out = ''
-    if ( getValue('visus.optimal_korr.missing.right') == '' )
+    if ( getValue('visus.manifest_refraktion.missing.right') == '' )
     then
-      out = out .. 'Visus, højre øje:\n'
-      out = out .. 'Snellen: ' .. getValue('visus.optimal_korr.snellen.right') .. '\n'
-      out = out .. 'ETDRS: ' .. getValue('visus.optimal_korr.etdrs.right') .. '\n'
-      out = out .. 'Basis: '
-          .. getValue('visus.optimal_korr.basis.sf.right') .. ' sf, '
-          .. getValue('visus.optimal_korr.basis.cyl.right') .. ' sph '
-          .. getValue('visus.optimal_korr.basis.grader.right') .. ' grader.\n'
-      out = out .. 'Korr.: '
-          .. getValue('visus.optimal_korr.korr.sf.right') .. ' sf, '
-          .. getValue('visus.optimal_korr.korr.cyl.right') .. ' sph '
-          .. getValue('visus.optimal_korr.korr.grader.right') .. ' grader.\n'
+      out = out .. 'Visus, manifest refraktion, o.dxt'
+      if ( getValue('visus.manifest_refraktion.kontrast.right') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.kontrast.right') .. ' kontrast'
+      end
+      if ( getValue('visus.manifest_refraktion.st_hul.right') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.right')
+      end
+      out = out .. ':\n'
+      if ( getValue('visus.manifest_refraktion.snellen.right') ~= '' )
+      then
+        out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.snellen.right') .. '\n'
+      end
+      if ( getValue('visus.manifest_refraktion.etdrs.right') ~= '' )
+      then
+        out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.etdrs.right') .. '\n'
+      end
+      out = out .. 'Korr.: ' .. getValue('visus.manifest_refraktion.korr.sf.right') .. ' sf'
+      if ( getValue('visus.manifest_refraktion.korr.cyl.right') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.cyl.right') .. ' cyl'
+      end
+      if ( getValue('visus.manifest_refraktion.korr.grader.right') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.grader.right') .. ' grader'
+      end
+      out = out .. '\n'
+
+      if ( getValue('visus.manifest_refraktion.missing.left') == '' )
+      then
+        out = out .. '\n'
+      end
     end
 
-    if ( getValue('visus.optimal_korr.missing.left') == '' )
+    if ( getValue('visus.manifest_refraktion.missing.left') == '' )
     then
-      out = out .. 'Visus, venstre øje:\n'
-      out = out .. 'Snellen: ' .. getValue('visus.optimal_korr.snellen.left') .. '\n'
-      out = out .. 'ETDRS: ' .. getValue('visus.optimal_korr.etdrs.left') .. '\n'
-      out = out .. 'Basis: '
-          .. getValue('visus.optimal_korr.basis.sf.left') .. ' sf, '
-          .. getValue('visus.optimal_korr.basis.cyl.left') .. ' sph '
-          .. getValue('visus.optimal_korr.basis.grader.left') .. ' grader.\n'
-      out = out .. 'Korr.: '
-          .. getValue('visus.optimal_korr.korr.sf.left') .. ' sf, '
-          .. getValue('visus.optimal_korr.korr.cyl.left') .. ' sph '
-          .. getValue('visus.optimal_korr.korr.grader.left') .. ' grader.\n'
+      out = out .. 'Visus, manifest refraktion, o.sin'
+      if ( getValue('visus.manifest_refraktion.kontrast.left') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.kontrast.left') .. ' kontrast'
+      end
+      if ( getValue('visus.manifest_refraktion.st_hul.left') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.left')
+      end
+      out = out .. ':\n'
+      if ( getValue('visus.manifest_refraktion.snellen.left') ~= '' )
+      then
+        out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.snellen.left') .. '\n'
+      end
+      if ( getValue('visus.manifest_refraktion.etdrs.left') ~= '' )
+      then
+        out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.etdrs.left') .. '\n'
+      end
+      out = out .. 'Korr.: ' .. getValue('visus.manifest_refraktion.korr.sf.left') .. ' sf'
+      if ( getValue('visus.manifest_refraktion.korr.cyl.left') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.cyl.left') .. ' cyl'
+      end
+      if ( getValue('visus.manifest_refraktion.korr.grader.left') ~= '' )
+      then
+        out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.grader.left') .. ' grader'
+      end
+      out = out .. '\n'
+
+      if ( getValue('visus.manifest_refraktion.missing.left') == '' )
+      then
+        out = out .. '\n'
+      end
     end
 
     return out
@@ -98,7 +142,7 @@
     <script language="lua" name="lt10gt-15">
       if(value == '')
       then
-        return false
+        return true
       end
 
       value = string.gsub(value, ',', '.')
@@ -112,7 +156,7 @@
     <script language="lua" name="lt359gt0">
       if(value == '')
       then
-        return false
+        return true
       end
 
       value = string.gsub(value, ',', '.')
@@ -123,10 +167,43 @@
         return false
       end
     </script>
-    <script language="lua" name="not0">
-      if(value == 'Ikke udfyldt')
+    <script language="lua" name="snellen.right">
+      if (value == '')
       then
-        return false
+        if ( getValue('visus.manifest_refraktion.etdrs.right') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="snellen.left">
+      if (value == '')
+      then
+        if ( getValue('visus.manifest_refraktion.etdrs.left') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="etdrs.right">
+      if (value == '')
+      then
+        if ( getValue('visus.manifest_refraktion.snellen.right') == '' )
+        then
+          return false
+        end
+      end
+      return true
+    </script>
+    <script language="lua" name="etdrs.left">
+      if (value == '')
+      then
+        if ( getValue('visus.manifest_refraktion.snellen.left') == '' )
+        then
+          return false
+        end
       end
       return true
     </script>
@@ -157,193 +234,182 @@
       <!-- Højre øje -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på højre øje"
-		  name="visus.optimal_korr.missing.right" script="right_eye"
+		  name="visus.manifest_refraktion.missing.right" script="right_eye"
 		  map="missing_eye_right_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
-	<frame layout="hbox">
-	  
-	  <frame layout="vbox">
-	    <label caption="Snellen:"/>
-	    <altcombobox name="visus.optimal_korr.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
-	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-	      <item caption="2,0" value="2,0"/>
-	      <item caption="1,6" value="1,6"/>
-	      <item caption="1,33" value="1,33"/>
-	      <item caption="1,0" value="1,0"/>
-	      <item caption="0,8" value="0,8"/>
-	      <item caption="0,67" value="0,67"/>
-	      <item caption="0,5" value="0,5"/>
-	      <item caption="0,4" value="0,4"/>
-	      <item caption="0,32" value="0,32"/>
-	      <item caption="0,25" value="0,25"/>
-	      <item caption="0,2" value="0,2"/>
-	      <item caption="0,16" value="0,16"/>
-	      <item caption="0,125" value="0,125"/>
-	      <item caption="0,1" value="0,1"/>
-	      <item caption="0,08" value="0,08"/>
-	      <item caption="0,05" value="0,05"/>
-	      <item caption="6/60" value="6/60"/>
-	      <item caption="3/60" value="3/60"/>
-	      <item caption="1/18" value="1/18"/>
-	      <item caption="1/24" value="1/24"/>
-	      <item caption="1/36" value="1/36"/>
-	      <item caption="1/60" value="1/60"/>
-	      <item caption="FGT" value="FGT"/>
-	      <item caption="HBV" value="HBV"/>
-	      <item caption="+L+P" value="+L+P"/>
-	      <item caption="+L-P" value="+L-P"/>
-	      <item caption="-L" value="-L"/>
-	      <altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
-		<label caption="Andet:"/>
-		<lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
-	      </altitem>
-	    </altcombobox>
-	  </frame>
-	  <frame layout="vbox">
-	    <label caption="ETDRS:"/>
-	    <combobox name="visus.optimal_korr.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
-	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-	      <item caption="0" value="0"/>
-	      <item caption="1" value="1"/>
-	      <item caption="2" value="2"/>
-	      <item caption="3" value="3"/>
-	      <item caption="4" value="4"/>
-	      <item caption="5" value="5"/>
-	      <item caption="6" value="6"/>
-	      <item caption="7" value="7"/>
-	      <item caption="8" value="8"/>
-	      <item caption="9" value="9"/>
-	      <item caption="10" value="10"/>
-	      <item caption="11" value="11"/>
-	      <item caption="12" value="12"/>
-	      <item caption="13" value="13"/>
-	      <item caption="14" value="14"/>
-	      <item caption="15" value="15"/>
-	      <item caption="16" value="16"/>
-	      <item caption="17" value="17"/>
-	      <item caption="18" value="18"/>
-	      <item caption="19" value="19"/>
-	      <item caption="20" value="20"/>
-	      <item caption="21" value="21"/>
-	      <item caption="22" value="22"/>
-	      <item caption="23" value="23"/>
-	      <item caption="24" value="24"/>
-	      <item caption="25" value="25"/>
-	      <item caption="26" value="26"/>
-	      <item caption="27" value="27"/>
-	      <item caption="28" value="28"/>
-	      <item caption="29" value="29"/>
-	      <item caption="30" value="30"/>
-	      <item caption="31" value="31"/>
-	      <item caption="32" value="32"/>
-	      <item caption="33" value="33"/>
-	      <item caption="34" value="34"/>
-	      <item caption="35" value="35"/>
-	      <item caption="36" value="36"/>
-	      <item caption="37" value="37"/>
-	      <item caption="38" value="38"/>
-	      <item caption="39" value="39"/>
-	      <item caption="40" value="40"/>
-	      <item caption="41" value="41"/>
-	      <item caption="42" value="42"/>
-	      <item caption="43" value="43"/>
-	      <item caption="44" value="44"/>
-	      <item caption="45" value="45"/>
-	      <item caption="46" value="46"/>
-	      <item caption="47" value="47"/>
-	      <item caption="48" value="48"/>
-	      <item caption="49" value="49"/>
-	      <item caption="50" value="50"/>
-	      <item caption="51" value="51"/>
-	      <item caption="52" value="52"/>
-	      <item caption="53" value="53"/>
-	      <item caption="54" value="54"/>
-	      <item caption="55" value="55"/>
-	      <item caption="56" value="56"/>
-	      <item caption="57" value="57"/>
-	      <item caption="58" value="58"/>
-	      <item caption="59" value="59"/>
-	      <item caption="60" value="60"/>
-	      <item caption="61" value="61"/>
-	      <item caption="62" value="62"/>
-	      <item caption="63" value="63"/>
-	      <item caption="64" value="64"/>
-	      <item caption="65" value="65"/>
-	      <item caption="66" value="66"/>
-	      <item caption="67" value="67"/>
-	      <item caption="68" value="68"/>
-	      <item caption="69" value="69"/>
-	      <item caption="70" value="70"/>
-	      <item caption="71" value="71"/>
-	      <item caption="72" value="72"/>
-	      <item caption="73" value="73"/>
-	      <item caption="74" value="74"/>
-	      <item caption="75" value="75"/>
-	      <item caption="76" value="76"/>
-	      <item caption="77" value="77"/>
-	      <item caption="78" value="78"/>
-	      <item caption="79" value="79"/>
-	      <item caption="80" value="80"/>
-	      <item caption="81" value="81"/>
-	      <item caption="82" value="82"/>
-	      <item caption="83" value="83"/>
-	      <item caption="84" value="84"/>
-	      <item caption="85" value="85"/>
-	      <item caption="86" value="86"/>
-	      <item caption="87" value="87"/>
-	      <item caption="88" value="88"/>
-	      <item caption="89" value="89"/>
-	      <item caption="90" value="90"/>
-	      <item caption="91" value="91"/>
-	      <item caption="92" value="92"/>
-	      <item caption="93" value="93"/>
-	      <item caption="94" value="94"/>
-	      <item caption="95" value="95"/>
-	      <item caption="96" value="96"/>
-	      <item caption="97" value="97"/>
-	      <item caption="98" value="98"/>
-	      <item caption="99" value="99"/>
-	      <item caption="100" value="100"/>
+	  <frame layout="hbox">
+	    <label caption="Kontrast:"/>
+	    <combobox name="visus.manifest_refraktion.kontrast.right" value="">
+	      <item caption="Ej relevant" value=""/>
+	      <item caption="20%" value="20%"/>
+	      <item caption="50%" value="50%"/>
+	      <item caption="75%" value="75%"/>
 	    </combobox>
 	    <spacer/>
 	  </frame>
+	  <frame layout="hbox">
+	    <checkbox name="visus.manifest_refraktion.st_hul.right" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
+	  </frame>
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Snellen:"/>
+	      <combobox name="visus.manifest_refraktion.snellen.right" layout="vbox" type="search" value="" script="snellen.right">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="2,0" value="2,0"/>
+		<item caption="1,6" value="1,6"/>
+		<item caption="1,33" value="1,33"/>
+		<item caption="1,0" value="1,0"/>
+		<item caption="0,8" value="0,8"/>
+		<item caption="0,67" value="0,67"/>
+		<item caption="0,5" value="0,5"/>
+		<item caption="0,4" value="0,4"/>
+		<item caption="0,32" value="0,32"/>
+		<item caption="0,25" value="0,25"/>
+		<item caption="0,2" value="0,2"/>
+		<item caption="0,16" value="0,16"/>
+		<item caption="0,125" value="0,125"/>
+		<item caption="0,1" value="0,1"/>
+		<item caption="0,08" value="0,08"/>
+		<item caption="0,05" value="0,05"/>
+		<item caption="6/60" value="6/60"/>
+		<item caption="3/60" value="3/60"/>
+		<item caption="1/18" value="1/18"/>
+		<item caption="1/24" value="1/24"/>
+		<item caption="1/36" value="1/36"/>
+		<item caption="1/60" value="1/60"/>
+		<item caption="FGT" value="FGT"/>
+		<item caption="HBV" value="HBV"/>
+		<item caption="+L+P" value="+L+P"/>
+		<item caption="+L-P" value="+L-P"/>
+		<item caption="-L" value="-L"/>
+	      </combobox>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="ETDRS:"/>
+	      <combobox name="visus.manifest_refraktion.etdrs.right" value="" type="search" script="etdrs.right">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="0" value="0"/>
+		<item caption="1" value="1"/>
+		<item caption="2" value="2"/>
+		<item caption="3" value="3"/>
+		<item caption="4" value="4"/>
+		<item caption="5" value="5"/>
+		<item caption="6" value="6"/>
+		<item caption="7" value="7"/>
+		<item caption="8" value="8"/>
+		<item caption="9" value="9"/>
+		<item caption="10" value="10"/>
+		<item caption="11" value="11"/>
+		<item caption="12" value="12"/>
+		<item caption="13" value="13"/>
+		<item caption="14" value="14"/>
+		<item caption="15" value="15"/>
+		<item caption="16" value="16"/>
+		<item caption="17" value="17"/>
+		<item caption="18" value="18"/>
+		<item caption="19" value="19"/>
+		<item caption="20" value="20"/>
+		<item caption="21" value="21"/>
+		<item caption="22" value="22"/>
+		<item caption="23" value="23"/>
+		<item caption="24" value="24"/>
+		<item caption="25" value="25"/>
+		<item caption="26" value="26"/>
+		<item caption="27" value="27"/>
+		<item caption="28" value="28"/>
+		<item caption="29" value="29"/>
+		<item caption="30" value="30"/>
+		<item caption="31" value="31"/>
+		<item caption="32" value="32"/>
+		<item caption="33" value="33"/>
+		<item caption="34" value="34"/>
+		<item caption="35" value="35"/>
+		<item caption="36" value="36"/>
+		<item caption="37" value="37"/>
+		<item caption="38" value="38"/>
+		<item caption="39" value="39"/>
+		<item caption="40" value="40"/>
+		<item caption="41" value="41"/>
+		<item caption="42" value="42"/>
+		<item caption="43" value="43"/>
+		<item caption="44" value="44"/>
+		<item caption="45" value="45"/>
+		<item caption="46" value="46"/>
+		<item caption="47" value="47"/>
+		<item caption="48" value="48"/>
+		<item caption="49" value="49"/>
+		<item caption="50" value="50"/>
+		<item caption="51" value="51"/>
+		<item caption="52" value="52"/>
+		<item caption="53" value="53"/>
+		<item caption="54" value="54"/>
+		<item caption="55" value="55"/>
+		<item caption="56" value="56"/>
+		<item caption="57" value="57"/>
+		<item caption="58" value="58"/>
+		<item caption="59" value="59"/>
+		<item caption="60" value="60"/>
+		<item caption="61" value="61"/>
+		<item caption="62" value="62"/>
+		<item caption="63" value="63"/>
+		<item caption="64" value="64"/>
+		<item caption="65" value="65"/>
+		<item caption="66" value="66"/>
+		<item caption="67" value="67"/>
+		<item caption="68" value="68"/>
+		<item caption="69" value="69"/>
+		<item caption="70" value="70"/>
+		<item caption="71" value="71"/>
+		<item caption="72" value="72"/>
+		<item caption="73" value="73"/>
+		<item caption="74" value="74"/>
+		<item caption="75" value="75"/>
+		<item caption="76" value="76"/>
+		<item caption="77" value="77"/>
+		<item caption="78" value="78"/>
+		<item caption="79" value="79"/>
+		<item caption="80" value="80"/>
+		<item caption="81" value="81"/>
+		<item caption="82" value="82"/>
+		<item caption="83" value="83"/>
+		<item caption="84" value="84"/>
+		<item caption="85" value="85"/>
+		<item caption="86" value="86"/>
+		<item caption="87" value="87"/>
+		<item caption="88" value="88"/>
+		<item caption="89" value="89"/>
+		<item caption="90" value="90"/>
+		<item caption="91" value="91"/>
+		<item caption="92" value="92"/>
+		<item caption="93" value="93"/>
+		<item caption="94" value="94"/>
+		<item caption="95" value="95"/>
+		<item caption="96" value="96"/>
+		<item caption="97" value="97"/>
+		<item caption="98" value="98"/>
+		<item caption="99" value="99"/>
+		<item caption="100" value="100"/>
+	      </combobox>
+	    </frame>
 	  </frame>
 	  <frame layout="vbox">
 	    <frame layout="hbox">
 	      <frame layout="vbox">
 		<label/>
-		<label caption="Basis:"/>
-	      </frame>
-	      <frame layout="vbox">
-		<label caption="Sf:"/>
-		<lineedit name="visus.optimal_korr.basis.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
-	      </frame>
-	      <frame layout="vbox">
-		<label caption="Cyl:"/>
-		<lineedit name="visus.optimal_korr.basis.cyl.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
-	      </frame>
-	      <frame layout="vbox">
-		<label caption="Grader:"/>
-		<lineedit name="visus.optimal_korr.basis.grader.right" regexp="[\d]+" script="lt359gt0" value=""/>
-	      </frame>
-	    </frame>
-	    <frame layout="hbox">
-	      <frame layout="vbox">
-		<label caption=""/>
-		<label caption="Korr.:"/>
+		<label caption="Korr:"/>
 	      </frame>
 	      <frame layout="vbox">
 		<label caption="Sf:"/>
-		<lineedit name="visus.optimal_korr.korr.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+		<lineedit name="visus.manifest_refraktion.korr.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	      </frame>
 	      <frame layout="vbox">
 		<label caption="Cyl:"/>
-		<lineedit name="visus.optimal_korr.korr.cyl.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+		<lineedit name="visus.manifest_refraktion.korr.cyl.right" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
 	      </frame>
 	      <frame layout="vbox">
 		<label caption="Grader:"/>
-		<lineedit name="visus.optimal_korr.korr.grader.right" regexp="[\d]+" script="lt359gt0" value=""/>
+		<lineedit name="visus.manifest_refraktion.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
 	      </frame>
 	    </frame>
 	  </frame>
@@ -353,193 +419,182 @@
       <!-- Venstre øje -->
       <frame layout="vbox">
 	<checkbox caption="Der er ikke målt på venstre øje"
-		  name="visus.optimal_korr.missing.left" script="left_eye"
+		  name="visus.manifest_refraktion.missing.left" script="left_eye"
 		  map="missing_eye_left_map"
 		  truevalue="mangler" falsevalue="" value=""/>
 	<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
-	<frame layout="hbox">
-	  
-	  <frame layout="vbox">
-	    <label caption="Snellen:"/>
-	    <altcombobox name="visus.optimal_korr.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
-	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-	      <item caption="2,0" value="2,0"/>
-	      <item caption="1,6" value="1,6"/>
-	      <item caption="1,33" value="1,33"/>
-	      <item caption="1,0" value="1,0"/>
-	      <item caption="0,8" value="0,8"/>
-	      <item caption="0,67" value="0,67"/>
-	      <item caption="0,5" value="0,5"/>
-	      <item caption="0,4" value="0,4"/>
-	      <item caption="0,32" value="0,32"/>
-	      <item caption="0,25" value="0,25"/>
-	      <item caption="0,2" value="0,2"/>
-	      <item caption="0,16" value="0,16"/>
-	      <item caption="0,125" value="0,125"/>
-	      <item caption="0,1" value="0,1"/>
-	      <item caption="0,08" value="0,08"/>
-	      <item caption="0,05" value="0,05"/>
-	      <item caption="6/60" value="6/60"/>
-	      <item caption="3/60" value="3/60"/>
-	      <item caption="1/18" value="1/18"/>
-	      <item caption="1/24" value="1/24"/>
-	      <item caption="1/36" value="1/36"/>
-	      <item caption="1/60" value="1/60"/>
-	      <item caption="FGT" value="FGT"/>
-	      <item caption="HBV" value="HBV"/>
-	      <item caption="+L+P" value="+L+P"/>
-	      <item caption="+L-P" value="+L-P"/>
-	      <item caption="-L" value="-L"/>
-	      <altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
-		<label caption="Andet:"/>
-		<lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
-	      </altitem>
-	    </altcombobox>
-	  </frame>
-	  <frame layout="vbox">
-	    <label caption="ETDRS:"/>
-	    <combobox name="visus.optimal_korr.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
-	      <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
-	      <item caption="0" value="0"/>
-	      <item caption="1" value="1"/>
-	      <item caption="2" value="2"/>
-	      <item caption="3" value="3"/>
-	      <item caption="4" value="4"/>
-	      <item caption="5" value="5"/>
-	      <item caption="6" value="6"/>
-	      <item caption="7" value="7"/>
-	      <item caption="8" value="8"/>
-	      <item caption="9" value="9"/>
-	      <item caption="10" value="10"/>
-	      <item caption="11" value="11"/>
-	      <item caption="12" value="12"/>
-	      <item caption="13" value="13"/>
-	      <item caption="14" value="14"/>
-	      <item caption="15" value="15"/>
-	      <item caption="16" value="16"/>
-	      <item caption="17" value="17"/>
-	      <item caption="18" value="18"/>
-	      <item caption="19" value="19"/>
-	      <item caption="20" value="20"/>
-	      <item caption="21" value="21"/>
-	      <item caption="22" value="22"/>
-	      <item caption="23" value="23"/>
-	      <item caption="24" value="24"/>
-	      <item caption="25" value="25"/>
-	      <item caption="26" value="26"/>
-	      <item caption="27" value="27"/>
-	      <item caption="28" value="28"/>
-	      <item caption="29" value="29"/>
-	      <item caption="30" value="30"/>
-	      <item caption="31" value="31"/>
-	      <item caption="32" value="32"/>
-	      <item caption="33" value="33"/>
-	      <item caption="34" value="34"/>
-	      <item caption="35" value="35"/>
-	      <item caption="36" value="36"/>
-	      <item caption="37" value="37"/>
-	      <item caption="38" value="38"/>
-	      <item caption="39" value="39"/>
-	      <item caption="40" value="40"/>
-	      <item caption="41" value="41"/>
-	      <item caption="42" value="42"/>
-	      <item caption="43" value="43"/>
-	      <item caption="44" value="44"/>
-	      <item caption="45" value="45"/>
-	      <item caption="46" value="46"/>
-	      <item caption="47" value="47"/>
-	      <item caption="48" value="48"/>
-	      <item caption="49" value="49"/>
-	      <item caption="50" value="50"/>
-	      <item caption="51" value="51"/>
-	      <item caption="52" value="52"/>
-	      <item caption="53" value="53"/>
-	      <item caption="54" value="54"/>
-	      <item caption="55" value="55"/>
-	      <item caption="56" value="56"/>
-	      <item caption="57" value="57"/>
-	      <item caption="58" value="58"/>
-	      <item caption="59" value="59"/>
-	      <item caption="60" value="60"/>
-	      <item caption="61" value="61"/>
-	      <item caption="62" value="62"/>
-	      <item caption="63" value="63"/>
-	      <item caption="64" value="64"/>
-	      <item caption="65" value="65"/>
-	      <item caption="66" value="66"/>
-	      <item caption="67" value="67"/>
-	      <item caption="68" value="68"/>
-	      <item caption="69" value="69"/>
-	      <item caption="70" value="70"/>
-	      <item caption="71" value="71"/>
-	      <item caption="72" value="72"/>
-	      <item caption="73" value="73"/>
-	      <item caption="74" value="74"/>
-	      <item caption="75" value="75"/>
-	      <item caption="76" value="76"/>
-	      <item caption="77" value="77"/>
-	      <item caption="78" value="78"/>
-	      <item caption="79" value="79"/>
-	      <item caption="80" value="80"/>
-	      <item caption="81" value="81"/>
-	      <item caption="82" value="82"/>
-	      <item caption="83" value="83"/>
-	      <item caption="84" value="84"/>
-	      <item caption="85" value="85"/>
-	      <item caption="86" value="86"/>
-	      <item caption="87" value="87"/>
-	      <item caption="88" value="88"/>
-	      <item caption="89" value="89"/>
-	      <item caption="90" value="90"/>
-	      <item caption="91" value="91"/>
-	      <item caption="92" value="92"/>
-	      <item caption="93" value="93"/>
-	      <item caption="94" value="94"/>
-	      <item caption="95" value="95"/>
-	      <item caption="96" value="96"/>
-	      <item caption="97" value="97"/>
-	      <item caption="98" value="98"/>
-	      <item caption="99" value="99"/>
-	      <item caption="100" value="100"/>
+	  <frame layout="hbox">
+	    <label caption="Kontrast:"/>
+	    <combobox name="visus.manifest_refraktion.kontrast.left" value="">
+	      <item caption="Ej relevant" value=""/>
+	      <item caption="20%" value="20%"/>
+	      <item caption="50%" value="50%"/>
+	      <item caption="75%" value="75%"/>
 	    </combobox>
 	    <spacer/>
 	  </frame>
+	  <frame layout="hbox">
+	    <checkbox name="visus.manifest_refraktion.st_hul.left" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
+	  </frame>
+	  <frame layout="hbox">
+	    <frame layout="vbox">
+	      <label caption="Snellen:"/>
+	      <combobox name="visus.manifest_refraktion.snellen.left" layout="vbox" type="search" value="" script="snellen.left">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="2,0" value="2,0"/>
+		<item caption="1,6" value="1,6"/>
+		<item caption="1,33" value="1,33"/>
+		<item caption="1,0" value="1,0"/>
+		<item caption="0,8" value="0,8"/>
+		<item caption="0,67" value="0,67"/>
+		<item caption="0,5" value="0,5"/>
+		<item caption="0,4" value="0,4"/>
+		<item caption="0,32" value="0,32"/>
+		<item caption="0,25" value="0,25"/>
+		<item caption="0,2" value="0,2"/>
+		<item caption="0,16" value="0,16"/>
+		<item caption="0,125" value="0,125"/>
+		<item caption="0,1" value="0,1"/>
+		<item caption="0,08" value="0,08"/>
+		<item caption="0,05" value="0,05"/>
+		<item caption="6/60" value="6/60"/>
+		<item caption="3/60" value="3/60"/>
+		<item caption="1/18" value="1/18"/>
+		<item caption="1/24" value="1/24"/>
+		<item caption="1/36" value="1/36"/>
+		<item caption="1/60" value="1/60"/>
+		<item caption="FGT" value="FGT"/>
+		<item caption="HBV" value="HBV"/>
+		<item caption="+L+P" value="+L+P"/>
+		<item caption="+L-P" value="+L-P"/>
+		<item caption="-L" value="-L"/>
+	      </combobox>
+	    </frame>
+	    <frame layout="vbox">
+	      <label caption="ETDRS:"/>
+	      <combobox name="visus.manifest_refraktion.etdrs.left" value="" type="search" script="etdrs.left">
+		<item caption="Ikke udfyldt" value=""/>
+		<item caption="0" value="0"/>
+		<item caption="1" value="1"/>
+		<item caption="2" value="2"/>
+		<item caption="3" value="3"/>
+		<item caption="4" value="4"/>
+		<item caption="5" value="5"/>
+		<item caption="6" value="6"/>
+		<item caption="7" value="7"/>
+		<item caption="8" value="8"/>
+		<item caption="9" value="9"/>
+		<item caption="10" value="10"/>
+		<item caption="11" value="11"/>
+		<item caption="12" value="12"/>
+		<item caption="13" value="13"/>
+		<item caption="14" value="14"/>
+		<item caption="15" value="15"/>
+		<item caption="16" value="16"/>
+		<item caption="17" value="17"/>
+		<item caption="18" value="18"/>
+		<item caption="19" value="19"/>
+		<item caption="20" value="20"/>
+		<item caption="21" value="21"/>
+		<item caption="22" value="22"/>
+		<item caption="23" value="23"/>
+		<item caption="24" value="24"/>
+		<item caption="25" value="25"/>
+		<item caption="26" value="26"/>
+		<item caption="27" value="27"/>
+		<item caption="28" value="28"/>
+		<item caption="29" value="29"/>
+		<item caption="30" value="30"/>
+		<item caption="31" value="31"/>
+		<item caption="32" value="32"/>
+		<item caption="33" value="33"/>
+		<item caption="34" value="34"/>
+		<item caption="35" value="35"/>
+		<item caption="36" value="36"/>
+		<item caption="37" value="37"/>
+		<item caption="38" value="38"/>
+		<item caption="39" value="39"/>
+		<item caption="40" value="40"/>
+		<item caption="41" value="41"/>
+		<item caption="42" value="42"/>
+		<item caption="43" value="43"/>
+		<item caption="44" value="44"/>
+		<item caption="45" value="45"/>
+		<item caption="46" value="46"/>
+		<item caption="47" value="47"/>
+		<item caption="48" value="48"/>
+		<item caption="49" value="49"/>
+		<item caption="50" value="50"/>
+		<item caption="51" value="51"/>
+		<item caption="52" value="52"/>
+		<item caption="53" value="53"/>
+		<item caption="54" value="54"/>
+		<item caption="55" value="55"/>
+		<item caption="56" value="56"/>
+		<item caption="57" value="57"/>
+		<item caption="58" value="58"/>
+		<item caption="59" value="59"/>
+		<item caption="60" value="60"/>
+		<item caption="61" value="61"/>
+		<item caption="62" value="62"/>
+		<item caption="63" value="63"/>
+		<item caption="64" value="64"/>
+		<item caption="65" value="65"/>
+		<item caption="66" value="66"/>
+		<item caption="67" value="67"/>
+		<item caption="68" value="68"/>
+		<item caption="69" value="69"/>
+		<item caption="70" value="70"/>
+		<item caption="71" value="71"/>
+		<item caption="72" value="72"/>
+		<item caption="73" value="73"/>
+		<item caption="74" value="74"/>
+		<item caption="75" value="75"/>
+		<item caption="76" value="76"/>
+		<item caption="77" value="77"/>
+		<item caption="78" value="78"/>
+		<item caption="79" value="79"/>
+		<item caption="80" value="80"/>
+		<item caption="81" value="81"/>
+		<item caption="82" value="82"/>
+		<item caption="83" value="83"/>
+		<item caption="84" value="84"/>
+		<item caption="85" value="85"/>
+		<item caption="86" value="86"/>
+		<item caption="87" value="87"/>
+		<item caption="88" value="88"/>
+		<item caption="89" value="89"/>
+		<item caption="90" value="90"/>
+		<item caption="91" value="91"/>
+		<item caption="92" value="92"/>
+		<item caption="93" value="93"/>
+		<item caption="94" value="94"/>
+		<item caption="95" value="95"/>
+		<item caption="96" value="96"/>
+		<item caption="97" value="97"/>
+		<item caption="98" value="98"/>
+		<item caption="99" value="99"/>
+		<item caption="100" value="100"/>
+	      </combobox>
+	    </frame>
 	  </frame>
 	  <frame layout="vbox">
 	    <frame layout="hbox">
 	      <frame layout="vbox">
 		<label/>
-		<label caption="Basis:"/>
-	      </frame>
-	      <frame layout="vbox">
-		<label caption="Sf:"/>
-		<lineedit name="visus.optimal_korr.basis.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
-	      </frame>
-	      <frame layout="vbox">
-		<label caption="Cyl:"/>
-		<lineedit name="visus.optimal_korr.basis.cyl.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
-	      </frame>
-	      <frame layout="vbox">
-		<label caption="Grader:"/>
-		<lineedit name="visus.optimal_korr.basis.grader.left" regexp="[\d]+" script="lt359gt0" value=""/>
-	      </frame>
-	    </frame>
-	    <frame layout="hbox">
-	      <frame layout="vbox">
-		<label caption=""/>
-		<label caption="Korr.:"/>
+		<label caption="Korr:"/>
 	      </frame>
 	      <frame layout="vbox">
 		<label caption="Sf:"/>
-		<lineedit name="visus.optimal_korr.korr.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+		<lineedit name="visus.manifest_refraktion.korr.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	      </frame>
 	      <frame layout="vbox">
 		<label caption="Cyl:"/>
-		<lineedit name="visus.optimal_korr.korr.cyl.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+		<lineedit name="visus.manifest_refraktion.korr.cyl.left" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
 	      </frame>
 	      <frame layout="vbox">
 		<label caption="Grader:"/>
-		<lineedit name="visus.optimal_korr.korr.grader.left" regexp="[\d]+" script="lt359gt0" value=""/>
+		<lineedit name="visus.manifest_refraktion.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
 	      </frame>
 	    </frame>
 	  </frame>
-- 
cgit v1.2.3