summaryrefslogtreecommitdiff
path: root/server/xml/macros/visus-1.0.xml
diff options
context:
space:
mode:
authorsenator <senator>2009-11-17 10:43:45 +0000
committersenator <senator>2009-11-17 10:43:45 +0000
commitce08ba4689b54f8e27a5418f490d9c87fe71cc78 (patch)
tree36e1933cd6d58f5f98b6dc37328e7258b1f0544f /server/xml/macros/visus-1.0.xml
parent1a6bd6fdbfffa6fb120b1464854a95b43221719d (diff)
moved all .osin. instances from any instance containing it to the end of the instance. I have checked to find errors but NOT very thoroughly. The XML files might contain errors, but i will correct these, if any, when i encounter them later on
Diffstat (limited to 'server/xml/macros/visus-1.0.xml')
-rw-r--r--server/xml/macros/visus-1.0.xml82
1 files changed, 41 insertions, 41 deletions
diff --git a/server/xml/macros/visus-1.0.xml b/server/xml/macros/visus-1.0.xml
index 4aad946..9319005 100644
--- a/server/xml/macros/visus-1.0.xml
+++ b/server/xml/macros/visus-1.0.xml
@@ -18,83 +18,83 @@
<macro name="visus" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('snellen.odxt.missing') == '' or getValue('snellen.osin.missing') == '' )
+ if ( getValue('snellen.mangler.odxt') == '' or getValue('snellen.mangler.osin') == '' )
then
out = out .. 'Objektivt:\n'
- if ( getValue('snellen.odxt.missing') == '' )
+ if ( getValue('snellen.mangler.odxt') == '' )
then
out = out .. 'Visus o.dxt. ' .. getValue('snellen.odxt') .. '\n'
out = out .. 'ETDRS o.dxt. ' .. getValue('etdrs.odxt') .. '\n'
- if ( getValue('snellen.odxt.korr.basis') ~= 'Ingen' )
+ if ( getValue('snellen.korr.basis.odxt') ~= 'Ingen' )
then
- out = out .. 'Korr.: ' .. getValue('snellen.odxt.korr.basis') .. ' add '
+ out = out .. 'Korr.: ' .. getValue('snellen.korr.basis.odxt') .. ' add '
else
out = out .. 'Korr.: add '
end
- out = out .. getValue('snellen.odxt.korr.sf') .. ' sf, '
- .. getValue('snellen.odxt.korr.cyl') .. '.sf '
- .. getValue('snellen.odxt.korr.grader') .. ' grader.\n'
+ out = out .. getValue('snellen.korr.sf.odxt') .. ' sf, '
+ .. getValue('snellen.korr.cyl.odxt') .. '.sf '
+ .. getValue('snellen.korr.grader.odxt') .. ' grader.\n'
end
- if ( getValue('snellen.osin.missing') == '' )
+ if ( getValue('snellen.mangler.osin') == '' )
then
out = out .. 'Visus o.sin. ' .. getValue('snellen.osin') .. '\n'
out = out .. 'ETDRS o.sin. ' .. getValue('etdrs.osin') .. '\n'
- if ( getValue('snellen.osin.korr.basis') ~= 'Ingen' )
+ if ( getValue('snellen.korr.basis.osin') ~= 'Ingen' )
then
- out = out .. 'Korr.: ' .. getValue('snellen.osin.korr.basis') .. ' add '
+ out = out .. 'Korr.: ' .. getValue('snellen.korr.basis.osin') .. ' add '
else
out = out .. 'Korr.: add '
end
- out = out .. getValue('snellen.osin.korr.sf') .. ' sf, '
- .. getValue('snellen.osin.korr.cyl') .. '.sf '
- .. getValue('snellen.osin.korr.grader') .. ' grader.\n'
+ out = out .. getValue('snellen.korr.sf.osin') .. ' sf, '
+ .. getValue('snellen.korr.cyl.osin') .. '.sf '
+ .. getValue('snellen.korr.grader.osin') .. ' grader.\n'
end
end
return out
</resume>
<queries>
- <query service="pracro" class="missing_eye_right" ttl="1000000"/>
- <query service="pracro" class="missing_eye_left" ttl="1000000"/>
+ <query service="pracro" class="missing_eye_odxt" ttl="1000000"/>
+ <query service="pracro" class="missing_eye_osin" ttl="1000000"/>
</queries>
<maps>
- <map name="missing_eye_right_map">
+ <map name="missing_eye_odxt_map">
value = 0
timestamp = 0
source = ''
- if( missing_eye_right )
+ if( missing_eye_odxt )
then
- if( missing_eye_right.value and missing_eye_right.value == '' )
+ if( missing_eye_odxt.value and missing_eye_odxt.value == '' )
then
value = ''
- timestamp = missing_eye_right.timestamp
- source = missing_eye_right.source
+ timestamp = missing_eye_odxt.timestamp
+ source = missing_eye_odxt.source
else
value = 'mangler'
- timestamp = missing_eye_right.timestamp
- source = missing_eye_right.source
+ timestamp = missing_eye_odxt.timestamp
+ source = missing_eye_odxt.source
end
end
return value, timestamp, source
</map>
- <map name="missing_eye_left_map">
+ <map name="missing_eye_osin_map">
value = 0
timestamp = 0
source = ''
- if( missing_eye_left )
+ if( missing_eye_osin )
then
- if( missing_eye_left.value and missing_eye_left.value == '' )
+ if( missing_eye_osin.value and missing_eye_osin.value == '' )
then
value = ''
- timestamp = missing_eye_left.timestamp
- source = missing_eye_left.source
+ timestamp = missing_eye_osin.timestamp
+ source = missing_eye_osin.source
else
value = 'mangler'
- timestamp = missing_eye_left.timestamp
- source = missing_eye_left.source
+ timestamp = missing_eye_osin.timestamp
+ source = missing_eye_osin.source
end
end
return value, timestamp, source
@@ -177,8 +177,8 @@
<!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.dxt"
- name="snellen.odxt.missing" script="right_eye"
- map="missing_eye_right_map"
+ name="snellen.mangler.odxt" script="right_eye"
+ map="missing_eye_odxt_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="o.dxt" layout="vbox">
<frame layout="hbox">
@@ -337,7 +337,7 @@
</frame>
<frame layout="vbox">
<label caption="Basis:"/>
- <combobox name="snellen.odxt.korr.basis" value="">
+ <combobox name="snellen.korr.basis.odxt" 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.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="snellen.korr.sf.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="snellen.odxt.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="snellen.korr.cyl.odxt" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="snellen.odxt.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="snellen.korr.grader.odxt" regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
@@ -366,8 +366,8 @@
<!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på o.sin"
- name="snellen.osin.missing" script="left_eye"
- map="missing_eye_left_map"
+ name="snellen.mangler.osin" script="left_eye"
+ map="missing_eye_osin_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="o.sin" layout="vbox">
<frame layout="hbox">
@@ -526,7 +526,7 @@
</frame>
<frame layout="vbox">
<label caption="Basis:"/>
- <combobox name="snellen.osin.korr.basis" value="">
+ <combobox name="snellen.korr.basis.osin" 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.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="snellen.korr.sf.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="snellen.osin.korr.cyl" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="snellen.korr.cyl.osin" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="snellen.osin.korr.grader" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="snellen.korr.grader.osin" regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>