From 1a6bd6fdbfffa6fb120b1464854a95b43221719d Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Mon, 16 Nov 2009 11:36:08 +0000
Subject: Several more changes to field names. These are done with sed, so it
 is possible that something is broken. I do check things after changes are
 made so it should be ok

---
 server/xml/macros/visus-1.0.xml | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

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

diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 68a2453..4aad946 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -26,30 +26,30 @@
       then
         out = out .. 'Visus o.dxt. ' .. getValue('snellen.odxt') .. '\n'
         out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.odxt') .. '\n'
-        if ( getValue('snellen.odxt.corr.basis') ~= 'Ingen' )
+        if ( getValue('snellen.odxt.korr.basis') ~= 'Ingen' )
         then
-          out = out .. 'Korr.: ' .. getValue('snellen.odxt.corr.basis') .. ' add '
+          out = out .. 'Korr.: ' .. getValue('snellen.odxt.korr.basis') .. ' add '
         else
           out = out .. 'Korr.: add '
         end
-        out = out .. getValue('snellen.odxt.corr.sph') .. ' sf, '
-                  .. getValue('snellen.odxt.corr.cyl') .. ' sph '
-                  .. getValue('snellen.odxt.corr.axis') .. ' grader.\n'
+        out = out .. getValue('snellen.odxt.korr.sf') .. ' sf, '
+                  .. getValue('snellen.odxt.korr.cyl') .. '.sf '
+                  .. getValue('snellen.odxt.korr.grader') .. ' grader.\n'
       end
   
       if ( getValue('snellen.osin.missing') == '' )
       then
         out = out .. 'Visus o.sin. ' .. getValue('snellen.osin') .. '\n'
         out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.osin') .. '\n'
-        if ( getValue('snellen.osin.corr.basis') ~= 'Ingen' )
+        if ( getValue('snellen.osin.korr.basis') ~= 'Ingen' )
         then
-          out = out .. 'Korr.: ' .. getValue('snellen.osin.corr.basis') .. ' add '
+          out = out .. 'Korr.: ' .. getValue('snellen.osin.korr.basis') .. ' add '
         else
           out = out .. 'Korr.: add '
         end
-        out = out .. getValue('snellen.osin.corr.sph') .. ' sf, '
-                  .. getValue('snellen.osin.corr.cyl') .. ' sph '
-                  .. getValue('snellen.osin.corr.axis') .. ' grader.\n'
+        out = out .. getValue('snellen.osin.korr.sf') .. ' sf, '
+                  .. getValue('snellen.osin.korr.cyl') .. '.sf '
+                  .. getValue('snellen.osin.korr.grader') .. ' grader.\n'
       end
     end
     return out
@@ -337,7 +337,7 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Basis:"/>
-	      <combobox name="snellen.odxt.corr.basis" value="">
+	      <combobox name="snellen.odxt.korr.basis" value="">
 		<item caption="Autoref." value="Autoref"/>
 		<item caption="Egen brille" value="Brille"/>
 		<item caption="Ingen" value="Ingen"/>
@@ -349,15 +349,15 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="snellen.odxt.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	      <lineedit name="snellen.odxt.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Cyl:"/>
-	      <lineedit name="snellen.odxt.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	      <lineedit name="snellen.odxt.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Grader:"/>
-	      <lineedit name="snellen.odxt.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
+	      <lineedit name="snellen.odxt.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
 	    </frame>
 	  </frame>
 	</frame>
@@ -526,7 +526,7 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Basis:"/>
-	      <combobox name="snellen.osin.corr.basis" value="">
+	      <combobox name="snellen.osin.korr.basis" value="">
 		<item caption="Autoref." value="autoref"/>
 		<item caption="Egen brille" value="brille"/>
 		<item caption="Ingen" value="ingen"/>
@@ -538,15 +538,15 @@
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Sf:"/>
-	      <lineedit name="snellen.osin.corr.sph" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	      <lineedit name="snellen.osin.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Cyl:"/>
-	      <lineedit name="snellen.osin.corr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+	      <lineedit name="snellen.osin.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
 	    </frame>
 	    <frame layout="vbox">
 	      <label caption="Grader:"/>
-	      <lineedit name="snellen.osin.corr.axis" regexp="[\d]+" script="lt359gt0" value=""/>
+	      <lineedit name="snellen.osin.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
 	    </frame>
 	  </frame>
 	</frame>
-- 
cgit v1.2.3