summaryrefslogtreecommitdiff
path: root/server/xml/macros/visus-uden_korr-1.0.xml
diff options
context:
space:
mode:
authorsenator <senator>2009-10-13 11:00:49 +0000
committersenator <senator>2009-10-13 11:00:49 +0000
commite51af58093988ea86070e6b6cd8f3c65d835c085 (patch)
treea90da1aaca4be04f55afd78b91f0218efbb30974 /server/xml/macros/visus-uden_korr-1.0.xml
parentbdb136f7c2b0c5cfebac943d668cff53e7a136a9 (diff)
all visus macros fixed. all files containing tremaaneder moved to efterkontrol. several other smaller fixes applied to various.
Diffstat (limited to 'server/xml/macros/visus-uden_korr-1.0.xml')
-rw-r--r--server/xml/macros/visus-uden_korr-1.0.xml151
1 files changed, 118 insertions, 33 deletions
diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml
index 1821068..56380f3 100644
--- a/server/xml/macros/visus-uden_korr-1.0.xml
+++ b/server/xml/macros/visus-uden_korr-1.0.xml
@@ -4,16 +4,54 @@
out = ''
if ( getValue('visus.uden_korr.missing.right') == '' )
then
- out = out .. 'Visus, højre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.right') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.right') .. '\n'
+ out = out .. 'Visus, uden korr., o.dxt'
+ if ( getValue('visus.uden_korr.kontrast.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.uden_korr.kontrast.right') .. ' kontrast'
+ end
+ if ( getValue('visus.uden_korr.st_hul.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.uden_korr.st_hul.right')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.uden_korr.snellen.right') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.right') .. ' s.c.\n'
+ end
+ if ( getValue('visus.uden_korr.etdrs.right') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.right') .. ' s.c.\n'
+ end
+ if ( getValue('visus.uden_korr.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
if ( getValue('visus.uden_korr.missing.left') == '' )
then
- out = out .. 'Visus, venstre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.left') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.left') .. '\n'
+ out = out .. 'Visus, uden korr., o.sin'
+ if ( getValue('visus.uden_korr.kontrast.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.uden_korr.kontrast.left') .. ' kontrast'
+ end
+ if ( getValue('visus.uden_korr.st_hul.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.uden_korr.st_hul.left')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.uden_korr.snellen.left') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.left') .. ' s.c.\n'
+ end
+ if ( getValue('visus.uden_korr.etdrs.left') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.left') .. ' s.c.\n'
+ end
+ if ( getValue('visus.uden_korr.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
return out
@@ -82,7 +120,7 @@
<script language="lua" name="lt10gt-15">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -96,7 +134,7 @@
<script language="lua" name="lt359gt0">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -107,10 +145,43 @@
return false
end
</script>
- <script language="lua" name="not0">
- if(value == 'Ikke udfyldt')
+ <script language="lua" name="snellen.right">
+ if (value == '')
then
- return false
+ if ( getValue('visus.uden_korr.etdrs.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="snellen.left">
+ if (value == '')
+ then
+ if ( getValue('visus.uden_korr.etdrs.left') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.right">
+ if (value == '')
+ then
+ if ( getValue('visus.uden_korr.snellen.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.left">
+ if (value == '')
+ then
+ if ( getValue('visus.uden_korr.snellen.left') == '' )
+ then
+ return false
+ end
end
return true
</script>
@@ -146,11 +217,23 @@
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
<frame layout="hbox">
-
+ <label caption="Kontrast:"/>
+ <combobox name="visus.uden_korr.kontrast.right" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="20%" value="20%"/>
+ <item caption="50%" value="50%"/>
+ <item caption="75%" value="75%"/>
+ </combobox>
+ <spacer/>
+ </frame>
+ <frame layout="hbox">
+ <checkbox name="visus.uden_korr.st_hul.right" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
+ </frame>
+ <frame layout="hbox">
<frame layout="vbox">
<label caption="Snellen:"/>
- <altcombobox name="visus.uden_korr.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+ <combobox name="visus.uden_korr.snellen.right" layout="vbox" type="search" value="" script="snellen.right">
+ <item caption="Ikke udfyldt" value=""/>
<item caption="2,0" value="2,0"/>
<item caption="1,6" value="1,6"/>
<item caption="1,33" value="1,33"/>
@@ -178,16 +261,12 @@
<item caption="+L+P" value="+L+P"/>
<item caption="+L-P" value="+L-P"/>
<item caption="-L" value="-L"/>
- <altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
- <label caption="Andet:"/>
- <lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
- </altitem>
- </altcombobox>
+ </combobox>
</frame>
<frame layout="vbox">
<label caption="ETDRS:"/>
- <combobox name="visus.uden_korr.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+ <combobox name="visus.uden_korr.etdrs.right" value="" type="search" script="etdrs.right">
+ <item caption="Ikke udfyldt" value=""/>
<item caption="0" value="0"/>
<item caption="1" value="1"/>
<item caption="2" value="2"/>
@@ -290,7 +369,6 @@
<item caption="99" value="99"/>
<item caption="100" value="100"/>
</combobox>
- <spacer/>
</frame>
</frame>
</frame>
@@ -304,11 +382,23 @@
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
<frame layout="hbox">
-
+ <label caption="Kontrast:"/>
+ <combobox name="visus.uden_korr.kontrast.left" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="20%" value="20%"/>
+ <item caption="50%" value="50%"/>
+ <item caption="75%" value="75%"/>
+ </combobox>
+ <spacer/>
+ </frame>
+ <frame layout="hbox">
+ <checkbox name="visus.uden_korr.st_hul.left" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
+ </frame>
+ <frame layout="hbox">
<frame layout="vbox">
<label caption="Snellen:"/>
- <altcombobox name="visus.uden_korr.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+ <combobox name="visus.uden_korr.snellen.left" layout="vbox" type="search" value="" script="snellen.left">
+ <item caption="Ikke udfyldt" value=""/>
<item caption="2,0" value="2,0"/>
<item caption="1,6" value="1,6"/>
<item caption="1,33" value="1,33"/>
@@ -336,16 +426,12 @@
<item caption="+L+P" value="+L+P"/>
<item caption="+L-P" value="+L-P"/>
<item caption="-L" value="-L"/>
- <altitem caption="Andet" value="andet" innerwidget="hoejre_snellen_andet" layout="hbox">
- <label caption="Andet:"/>
- <lineedit name="hoejre_snellen_andet" regexp="[0-9]+(,\d+|\d*)"/>
- </altitem>
- </altcombobox>
+ </combobox>
</frame>
<frame layout="vbox">
<label caption="ETDRS:"/>
- <combobox name="visus.uden_korr.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
+ <combobox name="visus.uden_korr.etdrs.left" value="" type="search" script="etdrs.left">
+ <item caption="Ikke udfyldt" value=""/>
<item caption="0" value="0"/>
<item caption="1" value="1"/>
<item caption="2" value="2"/>
@@ -448,7 +534,6 @@
<item caption="99" value="99"/>
<item caption="100" value="100"/>
</combobox>
- <spacer/>
</frame>
</frame>
</frame>