summaryrefslogtreecommitdiff
path: root/server/xml/macros/autorefraktion-1.0.xml
diff options
context:
space:
mode:
authorsenator <senator>2009-11-16 10:50:00 +0000
committersenator <senator>2009-11-16 10:50:00 +0000
commit36492da266df3f7e66ad5a330c76af285d765fa7 (patch)
tree38e39e1635eea60bb7aa5e2c8af22f38e8d960ae /server/xml/macros/autorefraktion-1.0.xml
parent7864f9d561657a5b7d557268c50837ef3ee585f9 (diff)
auto-replaced all instances of Højre øje and Venstre øje with o.dxt and o.sin. This was done using sed. These changes are not verified 100%, but i assume it went well. A quick check showed no errors.
Diffstat (limited to 'server/xml/macros/autorefraktion-1.0.xml')
-rw-r--r--server/xml/macros/autorefraktion-1.0.xml48
1 files changed, 24 insertions, 24 deletions
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml
index 706300e..4bca24e 100644
--- a/server/xml/macros/autorefraktion-1.0.xml
+++ b/server/xml/macros/autorefraktion-1.0.xml
@@ -2,31 +2,31 @@
<macro name="autorefraktion" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('autorefractor.right.missing') == '' )
+ if ( getValue('autorefractor.odxt.missing') == '' )
then
- out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.right.sphere') .. ' sf'
- if ( getValue('autorefractor.right.cyl') ~= '' )
+ out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.odxt.sphere') .. ' sf'
+ if ( getValue('autorefractor.odxt.cyl') ~= '' )
then
- out = out .. ', ' .. getValue('autorefractor.right.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('autorefractor.odxt.cyl') .. ' cyl'
end
- if ( getValue('autorefractor.right.axis') ~= '' )
+ if ( getValue('autorefractor.odxt.axis') ~= '' )
then
- out = out .. ', ' .. getValue('autorefractor.right.axis') .. ' grader\n'
+ out = out .. ', ' .. getValue('autorefractor.odxt.axis') .. ' grader\n'
else
out = out .. '\n'
end
end
- if ( getValue('autorefractor.left.missing') == '' )
+ if ( getValue('autorefractor.osin.missing') == '' )
then
- out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.left.sphere') .. ' sf'
- if ( getValue('autorefractor.left.cyl') ~= '' )
+ out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.osin.sphere') .. ' sf'
+ if ( getValue('autorefractor.osin.cyl') ~= '' )
then
- out = out .. ', ' .. getValue('autorefractor.left.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('autorefractor.osin.cyl') .. ' cyl'
end
- if ( getValue('autorefractor.left.axis') ~= '' )
+ if ( getValue('autorefractor.osin.axis') ~= '' )
then
- out = out .. ', ' .. getValue('autorefractor.left.axis') .. ' grader\n'
+ out = out .. ', ' .. getValue('autorefractor.osin.axis') .. ' grader\n'
else
out = out .. '\n'
end
@@ -147,54 +147,54 @@
<frame layout="hbox">
- <!-- Højre øje -->
+ <!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på højre øje"
- name="autorefractor.right.missing" script="right_eye"
+ name="autorefractor.odxt.missing" script="right_eye"
map="missing_eye_right_map"
truevalue="mangler" falsevalue="" value=""/>
- <frame name="right_eye_frame" caption="Højre øje" layout="hbox">
+ <frame name="right_eye_frame" caption="o.dxt" layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="autorefractor.right.sphere"
+ <lineedit name="autorefractor.odxt.sphere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="autorefractor.right.cyl"
+ <lineedit name="autorefractor.odxt.cyl"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="autorefractor.right.axis"
+ <lineedit name="autorefractor.odxt.axis"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
- <!-- Venstre øje -->
+ <!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på venstre øje"
- name="autorefractor.left.missing" script="left_eye"
+ name="autorefractor.osin.missing" script="left_eye"
map="missing_eye_left_map"
truevalue="mangler" falsevalue="" value=""/>
- <frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
+ <frame name="left_eye_frame" caption="o.sin" layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="autorefractor.left.sphere"
+ <lineedit name="autorefractor.osin.sphere"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="autorefractor.left.cyl"
+ <lineedit name="autorefractor.osin.cyl"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="autorefractor.left.axis"
+ <lineedit name="autorefractor.osin.axis"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>