summaryrefslogtreecommitdiff
path: root/server/xml/macros
diff options
context:
space:
mode:
authorsenator <senator>2009-11-17 11:18:45 +0000
committersenator <senator>2009-11-17 11:18:45 +0000
commitf652ad6d52c9f493125e8818bf198e7e84c63987 (patch)
tree100485c3a6e8efee81594f0954759636be578f38 /server/xml/macros
parentce08ba4689b54f8e27a5418f490d9c87fe71cc78 (diff)
found an error in the search and replace of .osin. and .odxt. Rectified it.
Diffstat (limited to 'server/xml/macros')
-rw-r--r--server/xml/macros/keratometri-1.0.xml24
1 files changed, 12 insertions, 12 deletions
diff --git a/server/xml/macros/keratometri-1.0.xml b/server/xml/macros/keratometri-1.0.xml
index be01e01..1465c5b 100644
--- a/server/xml/macros/keratometri-1.0.xml
+++ b/server/xml/macros/keratometri-1.0.xml
@@ -17,9 +17,9 @@
if ( getValue('keratometri.mangler.odxt') == '' )
then
- rr1 = tonmb(getValue('keratometri.r.odxt1'))
- rr2 = tonmb(getValue('keratometri.r.odxt2'))
- rx1 = tonmb(getValue('keratometri.x.odxt1'))
+ rr1 = tonmb(getValue('keratometri.r1.odxt'))
+ rr2 = tonmb(getValue('keratometri.r2.odxt'))
+ rx1 = tonmb(getValue('keratometri.x1.odxt'))
if ( rx1 &gt;= 0 and rx1 &lt; 90 ) then
rx2 = rx1 + 90
@@ -56,9 +56,9 @@
if ( getValue('keratometri.mangler.osin') == '' )
then
- lr1 = tonmb(getValue('keratometri.r.osin1'))
- lr2 = tonmb(getValue('keratometri.r.osin2'))
- lx1 = tonmb(getValue('keratometri.x.osin1'))
+ lr1 = tonmb(getValue('keratometri.r1.osin'))
+ lr2 = tonmb(getValue('keratometri.r2.osin'))
+ lx1 = tonmb(getValue('keratometri.x1.osin'))
if ( lx1 &gt;= 0 and lx1 &lt; 90 ) then
lx2 = lx1 + 90
@@ -200,15 +200,15 @@
<frame layout="vbox">
<label caption="R1:"/>
- <lineedit name="keratometri.r.odxt1" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r1.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="R2:"/>
- <lineedit name="keratometri.r.odxt2" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r2.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="X1 (fladeste akse):"/>
- <lineedit name="keratometri.x.odxt1" regexp="[\d]+" script="lt180gt0" value=""/>
+ <lineedit name="keratometri.x1.odxt" regexp="[\d]+" script="lt180gt0" value=""/>
</frame>
</frame>
</frame>
@@ -223,15 +223,15 @@
<frame layout="vbox">
<label caption="R1:"/>
- <lineedit name="keratometri.r.osin1" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r1.osin" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="R2:"/>
- <lineedit name="keratometri.r.osin2" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
+ <lineedit name="keratometri.r2.osin" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/>
</frame>
<frame layout="vbox">
<label caption="X1 (fladeste akse):"/>
- <lineedit name="keratometri.x.osin1" regexp="[\d]+" script="lt180gt0" value=""/>
+ <lineedit name="keratometri.x1.osin" regexp="[\d]+" script="lt180gt0" value=""/>
</frame>
</frame>
</frame>