From 35f94f0be71f0e40de244a4a209a8df4ec136f75 Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Fri, 6 Nov 2009 10:30:03 +0000
Subject: added ou to visus-template and other stuff

---
 server/xml/macros/visus-template-1.0.xml | 42 +++++++++++++++-----------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'server')

diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index b7dcb19..10a45a1 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -153,15 +153,6 @@
       then
         out = out .. 'ETDRS: ' .. getValue('visus.template.etdrs.ou') .. '\n'
       end
-      out = out .. 'Korr.: ' .. getValue('visus.template.korr.sf.ou') .. ' sf'
-      if ( getValue('visus.template.korr.cyl.ou') ~= '' )
-      then
-        out = out .. ', ' .. getValue('visus.template.korr.cyl.ou') .. ' cyl'
-      end
-      if ( getValue('visus.template.korr.grader.ou') ~= '' )
-      then
-        out = out .. ', ' .. getValue('visus.template.korr.grader.ou') .. ' grader'
-      end
     end
 
     return out
@@ -1107,7 +1098,9 @@
 
     </frame>
 
-      <!-- Begge øjne -->
+    <!-- Begge øjne -->
+    <frame layout="hbox">
+      <spacer/>
       <frame layout="vbox">
 	<checkbox caption="Aktiver o.u. måling"
 		  name="visus.template.ou" script="ou"
@@ -1265,28 +1258,33 @@
 	      </combobox>
 	    </frame>
 	  </frame>
-	  <frame layout="vbox">
-	    <frame layout="hbox">
+
+	  <!--
 	      <frame layout="vbox">
-		<label/>
-		<label caption="Korr:"/>
+	      <frame layout="hbox">
+	      <frame layout="vbox">
+	      <label/>
+	      <label caption="Korr:"/>
 	      </frame>
 	      <frame layout="vbox">
-		<label caption="Sf:"/>
-		<lineedit name="visus.template.korr.sf.ou" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+	      <label caption="Sf:"/>
+	      <lineedit name="visus.template.korr.sf.ou" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
 	      </frame>
 	      <frame layout="vbox">
-		<label caption="Cyl:"/>
-		<lineedit name="visus.template.korr.cyl.ou" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
+	      <label caption="Cyl:"/>
+	      <lineedit name="visus.template.korr.cyl.ou" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
 	      </frame>
 	      <frame layout="vbox">
-		<label caption="Grader:"/>
-		<lineedit name="visus.template.korr.grader.ou" regexp="|[\d]+" script="lt359gt0" value=""/>
+	      <label caption="Grader:"/>
+	      <lineedit name="visus.template.korr.grader.ou" regexp="|[\d]+" script="lt359gt0" value=""/>
 	      </frame>
-	    </frame>
-	  </frame>
+	      </frame>
+	      </frame>
+	  -->
 	</frame>
       </frame>
+      <spacer/>
+    </frame>
 
     <!-- Knapper -->
     <frame layout="hbox">
-- 
cgit v1.2.3