summaryrefslogtreecommitdiff
path: root/server
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
parentbdb136f7c2b0c5cfebac943d668cff53e7a136a9 (diff)
all visus macros fixed. all files containing tremaaneder moved to efterkontrol. several other smaller fixes applied to various.
Diffstat (limited to 'server')
-rw-r--r--server/xml/macros/egen_brille-1.0.xml16
-rw-r--r--server/xml/macros/field_names.txt10
-rw-r--r--server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml90
-rw-r--r--server/xml/macros/ref_efterkontrol-konklusion-1.0.xml112
-rw-r--r--server/xml/macros/ref_efterkontrol-overskrift-1.0.xml26
-rw-r--r--server/xml/macros/ref_efterkontrol-spaltelampe-1.0.xml583
-rw-r--r--server/xml/macros/ref_kontrol-1.0.xml1
-rw-r--r--server/xml/macros/topografi-1.0.xml8
-rw-r--r--server/xml/macros/visus-autoref-1.0.xml739
-rw-r--r--server/xml/macros/visus-egen_korr-1.0.xml729
-rw-r--r--server/xml/macros/visus-manifest_refraktion-1.0.xml781
-rw-r--r--server/xml/macros/visus-ou-1.0.xml287
-rw-r--r--server/xml/macros/visus-template-1.0.xml676
-rw-r--r--server/xml/macros/visus-uden_korr-1.0.xml151
14 files changed, 3163 insertions, 1046 deletions
diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml
index fef3a1e..a917dff 100644
--- a/server/xml/macros/egen_brille-1.0.xml
+++ b/server/xml/macros/egen_brille-1.0.xml
@@ -1,16 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!--
- 20081203: Bent Bisballe Nyeng
- Feltnavnene ændret så de giver mening.
- -->
-<!--
- 20090108: Bent Bisballe Nyeng
- Højre/venstre byttet om.
- -->
-<!--
- 20090202: Bent Bisballe Nyeng
- 'missing eye' tilføjet.
- -->
<macro name="egen_brille" version="1.0">
<resume language="lua">
out = ''
@@ -19,6 +7,10 @@
out = out .. 'Egen brille højre øje: ' .. getValue('lensmeter.right.sf')
.. ' sf, ' .. getValue('lensmeter.right.cyl') .. ' cyl '
.. getValue('lensmeter.right.grader') .. ' grader.'
+ if ( getValue('lensmeter.left.missing') == '' )
+ then
+ out = out .. '\n'
+ end
end
if ( getValue('lensmeter.left.missing') == '' )
diff --git a/server/xml/macros/field_names.txt b/server/xml/macros/field_names.txt
index e7c19a1..25da15f 100644
--- a/server/xml/macros/field_names.txt
+++ b/server/xml/macros/field_names.txt
@@ -18,11 +18,11 @@ spaltelampe.left.interface
spaltelampe.left.missing
ref.komplikationer
ref.kontrol
-ref_aktuelle_tremaaneder.afstandssyn
-ref_aktuelle_tremaaneder.nattesyn
-ref_aktuelle_tremaaneder.oejengener
-ref_aktuelle_tremaaneder.tilfredshed
-ref_aktuelle_tremaaneder.other_comments
+ref_aktuelle_efterkontrol.afstandssyn
+ref_aktuelle_efterkontrol.nattesyn
+ref_aktuelle_efterkontrol.oejengener
+ref_aktuelle_efterkontrol.tilfredshed
+ref_aktuelle_efterkontrol.other_comments
spaltelampe.right.konjuktiva
spaltelampe.right.epithel
spaltelampe.right.stroma
diff --git a/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml b/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml
new file mode 100644
index 0000000..58f773e
--- /dev/null
+++ b/server/xml/macros/ref_efterkontrol-aktuelle-1.0.xml
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_efterkontrol-aktuelle" version="1.0">
+ <resume language="lua">
+ out = ''
+ out = out .. 'Aktuelle:\n'
+ if ( getValue('ref_efterkontrol-aktuelle.afstandssyn') ~= '' )
+ then
+ out = out .. 'Afstandssyn: ' .. getValue('ref_efterkontrol-aktuelle.afstandssyn') .. '\n'
+ end
+ if ( getValue('ref_efterkontrol-aktuelle.nattesyn') ~= '' )
+ then
+ out = out .. 'Nattesyn: ' .. getValue('ref_efterkontrol-aktuelle.nattesyn') .. '\n'
+ end
+ if ( getValue('ref_efterkontrol-aktuelle.oejengener') ~= '' )
+ then
+ out = out .. 'Øjengener: ' .. getValue('ref_efterkontrol-aktuelle.oejengener') .. '\n'
+ end
+ if ( getValue('ref_efterkontrol-aktuelle.tilfredshed') ~= '' )
+ then
+ out = out .. 'Tilfredshed: ' .. getValue('ref_efterkontrol-aktuelle.tilfredshed') .. '\n'
+ end
+ if ( getValue('ref_efterkontrol-aktuelle.other_comments') ~= '' )
+ then
+ out = out .. getValue('ref_efterkontrol-aktuelle.other_comments')
+ end
+ return out
+ </resume>
+ <queries>
+ </queries>
+ <maps>
+ </maps>
+ <scripts>
+ </scripts>
+ <widgets caption="Aktuelle" layout="vbox">
+ <frame layout="vbox">
+ <label caption="Afstandssyn:"/>
+ <combobox name="ref_efterkontrol-aktuelle.afstandssyn" value="">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Anvender briller" value="Anvender briller"/>
+ <item caption="Intermitterende brillebrug" value="Intermitterende brillebrug"/>
+ <item caption="Anvender ikke briller" value="Anvender ikke briller"/>
+ </combobox>
+ <label caption="Nattesyn:"/>
+ <altcombobox name="ref_efterkontrol-aktuelle.nattesyn" value="" layout="vbox">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Ingen gener" value="Ingen gener"/>
+ <item caption="Lette gener" value="Lette gener"/>
+ <item caption="Nogen gener" value="Nogen gener"/>
+ <item caption="Mange gener" value="Mange gener"/>
+ <altitem caption="Andet" value="andet" innerwidget="ref_efterkontrol-aktuelle.nattesyn.andet">
+ <frame layout="hbox">
+ <label caption="Andet:"/>
+ <lineedit name="ref_efterkontrol-aktuelle.nattesyn.andet"/>
+ </frame>
+ </altitem>
+ </altcombobox>
+ <label caption="Øjengener:"/>
+ <altcombobox name="ref_efterkontrol-aktuelle.oejengener" value="" layout="vbox">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Ingen gener" value="Ingen gener"/>
+ <item caption="Lette tørhedsgener" value="Lette tørhedsgener"/>
+ <item caption="Nogen tørhedsgener" value="Nogen tørhedsgener"/>
+ <item caption="Mange tørhedsgener" value="Mange tørhedsgener"/>
+ <altitem caption="Andet" value="andet" innerwidget="ref_efterkontrol-aktuelle.oejengener.andet">
+ <frame layout="hbox">
+ <label caption="Andet:"/>
+ <lineedit name="ref_efterkontrol-aktuelle.oejengener.andet"/>
+ </frame>
+ </altitem>
+ </altcombobox>
+ <label caption="Tilfredshed:"/>
+ <combobox name="ref_efterkontrol-aktuelle.tilfredshed" value="">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Ikke tilfreds" value="Ikke tilfreds"/>
+ <item caption="Nogenlunde tilfreds" value="Nogenlunde tilfreds"/>
+ <item caption="Godt tilfreds" value="Godt tilfreds"/>
+ <item caption="Meget tilfreds" value="Meget tilfreds"/>
+ </combobox>
+ <label caption="Øvrige kommentarer:"/>
+ <textedit name="ref_efterkontrol-aktuelle.other_comments"/>
+ </frame>
+
+ <!-- Knapper -->
+ <frame layout="hbox">
+ <spacer/>
+ <button caption="Gem" action="commit"/>
+ </frame>
+ </widgets>
+</macro>
+
diff --git a/server/xml/macros/ref_efterkontrol-konklusion-1.0.xml b/server/xml/macros/ref_efterkontrol-konklusion-1.0.xml
new file mode 100644
index 0000000..475cb64
--- /dev/null
+++ b/server/xml/macros/ref_efterkontrol-konklusion-1.0.xml
@@ -0,0 +1,112 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_efterkontrol.konklusion" version="1.0">
+ <resume language="lua">
+ out = ''
+ out = out .. 'Konklusion:\n'
+ out = out .. getValue('ref_efterkontrol.konklusion.konklusion')
+ if ( getValue('ref_efterkontrol.konklusion.konklusion') == 'Behandlingsmålet er ikke nået. Der er indikation for og ønske om rebehandling.' )
+ then
+ out = out .. ' Der aftales ' .. getValue('ref_efterkontrol.konklusion.rebehandling') .. ' på ' .. getValue('ref_efterkontrol.konklusion.oeje') .. '.\n'
+ out = out .. '\n'
+ out = out .. getValue('ref_efterkontrol.konklusion.informeret_samtykke')
+ end
+ if (getValue('ref_efterkontrol.konklusion.yderligere_kommentarer') ~= '' )
+ then
+ out = out .. '\n\n'
+ out = out .. getValue('ref_efterkontrol.konklusion.yderligere_kommentarer')
+ end
+ return out
+ </resume>
+ <queries>
+ </queries>
+ <maps>
+ </maps>
+ <scripts>
+ <script language="lua" name="konklusion">
+ if ( getValue('ref_efterkontrol.konklusion.konklusion') == 'Behandlingsmålet er ikke nået. Der er indikation for og ønske om rebehandling.' )
+ then
+ enable('ref_efterkontrol.konklusion.rebehandling_frame')
+ else
+ disable('ref_efterkontrol.konklusion.rebehandling_frame')
+ end
+ if ( getValue('ref_efterkontrol.konklusion.konklusion') == 'na' )
+ then
+ return false
+ end
+ return true
+ </script>
+ <script language="lua" name="rebehandling">
+ if ( getValue('ref_efterkontrol.konklusion.rebehandling') == 'na' )
+ then
+ return false
+ end
+ return true
+ </script>
+ <script language="lua" name="samtykke">
+ if ( getValue('ref_efterkontrol.konklusion.informeret_samtykke') == 'Patienten er informeret detaljeret om indgrebet, det forventede resultat samt risici og komplikationer i overensstemmelse med afdelingens retningslinier og giver samtykke til behandling.' )
+ then
+ return true
+ end
+ return false
+ </script>
+ </scripts>
+ <widgets caption="Konklusion" layout="vbox">
+ <frame layout="vbox">
+ <label caption="Konklusion:"/>
+ <altcombobox name="ref_efterkontrol.konklusion.konklusion" layout="vbox" value='na' script="konklusion">
+ <item caption="Ikke udfyldt" value="na"/>
+ <item caption="Tilfredsstillende resultat. Patienten afsluttes" value="Tilfredsstillende resultat. Patienten afsluttes"/>
+ <item caption="Ikke indikation eller mulighed for yderligere behandling. Patienten afsluttes." value="Ikke indikation eller mulighed for yderligere behandling. Patienten afsluttes."/>
+ <item caption="Behandlingsmålet er ikke nået. Der er indikation for og ønske om rebehandling. Der aftales: (udfyld herunder)" value="Behandlingsmålet er ikke nået. Der er indikation for og ønske om rebehandling."/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref_efterkontrol.konklusion.andet">
+ <label caption="Andet:"/>
+ <lineedit name="ref_efterkontrol.konklusion.andet"/>
+ </altitem>
+ </altcombobox>
+ <frame caption="Aftale" name="ref_efterkontrol.konklusion.rebehandling_frame" layout="vbox">
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Der aftales"/>
+ <label/>
+ </frame>
+ <altcombobox name="ref_efterkontrol.konklusion.rebehandling" value="na" layout="vbox" script="rebehandling">
+ <item caption="Ikke udfyldt" value="na"/>
+ <item caption="reLASIK" value="reLASIK"/>
+ <item caption="rePRK" value="rePRK"/>
+ <item caption="Topografistyret reLASIK" value="Topografistyret reLASIK"/>
+ <item caption="Topografistyret rePRK" value="Topografistyret rePRK"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref_efterkontrol.konklusion.rebehandling.andet">
+ <label caption="Andet:"/>
+ <lineedit name="ref_efterkontrol.konklusion.rebehandling.andet"/>
+ </altitem>
+ </altcombobox>
+ <frame layout="vbox">
+ <label caption="Øje:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <combobox name="ref_efterkontrol.konklusion.oeje" value="">
+ <item caption="Højre øje" value="højre øje"/>
+ <item caption="Venstre øje" value="venstre øje"/>
+ <item caption="Begge øjne" value="begge øjne"/>
+ </combobox>
+ <label/>
+ </frame>
+ <spacer/>
+ </frame>
+ <checkbox name="ref_efterkontrol.konklusion.informeret_samtykke" caption="Patienten er informeret detaljeret om indgrebet, det forventede resultat samt risici og komplikationer i" truevalue="Patienten er informeret detaljeret om indgrebet, det forventede resultat samt risici og komplikationer i overensstemmelse med afdelingens retningslinier og giver samtykke til behandling." falsevalue="" script="samtykke"/>
+ <label caption="overensstemmelse med afdelingens retningslinier og giver samtykke til behandling"/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Yderligere kommentarer:"/>
+ <lineedit name="ref_efterkontrol.konklusion.yderligere_kommentarer"/>
+ </frame>
+ </frame>
+
+ <!-- knapper -->
+ <frame layout="hbox">
+ <spacer/>
+ <button caption="Gem" action="commit"/>
+ </frame>
+ </widgets>
+</macro>
diff --git a/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
new file mode 100644
index 0000000..c1b4325
--- /dev/null
+++ b/server/xml/macros/ref_efterkontrol-overskrift-1.0.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_efterkontrol_overskrift" version="1.0">
+ <resume>Tremånederskontrol i refraktiv kirurgi</resume>
+ <queries>
+ </queries>
+ <maps>
+ </maps>
+ <scripts>
+ </scripts>
+ <widgets caption="Påbegyndelse af kontrolforløb"
+ layout="vbox">
+
+ <checkbox name="begynd"
+ caption="Kontrol påbegyndes"
+ truevalue="begynd"
+ falsevalue=""
+ regexp="begynd"/>
+
+ <!-- Knapper -->
+ <frame layout="hbox">
+ <spacer />
+ <button caption="Gem" action="commit"/>
+ </frame>
+
+ </widgets>
+</macro>
diff --git a/server/xml/macros/ref_efterkontrol-spaltelampe-1.0.xml b/server/xml/macros/ref_efterkontrol-spaltelampe-1.0.xml
new file mode 100644
index 0000000..2ba563b
--- /dev/null
+++ b/server/xml/macros/ref_efterkontrol-spaltelampe-1.0.xml
@@ -0,0 +1,583 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="ref_efterkontrol.spaltelampe" version="1.0">
+ <resume language="lua">
+ out = ''
+ if ( getValue('spaltelampe.right.missing') == '' )
+ then
+ out = out .. 'Spaltelampe, højre øje:\n'
+
+ if ( getValue('spaltelampe.right.konjuktiva') ~= '' )
+ then
+ out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.right.konjuktiva') .. '\n'
+ end
+
+ out = out .. 'Cornea:\n'
+ if ( getValue('spaltelampe.right.epithel') ~= '' )
+ then
+ out = out .. ' Epithel: ' .. getValue('spaltelampe.right.epithel') .. '\n'
+ end
+ if ( getValue('spaltelampe.right.stroma') ~= '' )
+ then
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.right.stroma') .. '\n'
+ end
+ if ( getValue('spaltelampe.right.flap') ~= '' )
+ then
+ out = out .. ' Flap: ' .. getValue('spaltelampe.right.flap') .. '\n'
+ end
+ if ( getValue('spaltelampe.right.folder') ~= '' )
+ then
+ out = out .. ' Folder: ' .. getValue('spaltelampe.right.folder') .. '\n'
+ end
+ if ( getValue('spaltelampe.right.interface.partikler') ~= '' or getValue('spaltelampe.right.interface.epithelindvaekst') ~= '' )
+ then
+ out = out .. ' Interface: '
+ if ( getValue('spaltelampe.right.interface.partikler') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.right.interface.partikler')
+ if ( getValue('spaltelampe.right.interface.epithelindvaekst') ~= '' )
+ then
+ out = out .. ', '
+ end
+ end
+ if ( getValue('spaltelampe.right.interface.epithelindvaekst') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.right.interface.epithelindvaekst') .. '\n'
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.right.endothel') ~= '' )
+ then
+ out = out .. ' Endothel: ' .. getValue('spaltelampe.right.endothel') .. '\n'
+ end
+ if ( getValue('spaltelampe.right.lens') ~= '' )
+ then
+ out = out .. 'Lens: ' .. getValue('spaltelampe.right.lens') .. '\n'
+ end
+ if ( getValue('spaltelampe.right.supplerende') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.right.supplerende') .. '\n'
+ end
+ end
+
+ if ( getValue('spaltelampe.left.missing') == '' )
+ then
+ if ( getValue('spaltelampe.right.missing') == '' )
+ then
+ out = out .. '\n'
+ end
+ out = out .. 'Spaltelampe, venstre øje:\n'
+
+ if ( getValue('spaltelampe.left.konjuktiva') ~= '' )
+ then
+ out = out .. 'Konjuktiva: ' .. getValue('spaltelampe.left.konjuktiva') .. '\n'
+ end
+
+ out = out .. 'Cornea:\n'
+ if ( getValue('spaltelampe.left.epithel') ~= '' )
+ then
+ out = out .. ' Epithel: ' .. getValue('spaltelampe.left.epithel') .. '\n'
+ end
+ if ( getValue('spaltelampe.left.stroma') ~= '' )
+ then
+ out = out .. ' Stroma: ' .. getValue('spaltelampe.left.stroma') .. '\n'
+ end
+ if ( getValue('spaltelampe.left.flap') ~= '' )
+ then
+ out = out .. ' Flap: ' .. getValue('spaltelampe.left.flap') .. '\n'
+ end
+ if ( getValue('spaltelampe.left.folder') ~= '' )
+ then
+ out = out .. ' Folder: ' .. getValue('spaltelampe.left.folder') .. '\n'
+ end
+ if ( getValue('spaltelampe.left.interface.partikler') ~= '' or getValue('spaltelampe.left.interface.epithelindvaekst') ~= '' )
+ then
+ out = out .. ' Interface: '
+ if ( getValue('spaltelampe.left.interface.partikler') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.left.interface.partikler')
+ if ( getValue('spaltelampe.left.interface.epithelindvaekst') ~= '' )
+ then
+ out = out .. ', '
+ end
+ end
+ if ( getValue('spaltelampe.left.interface.epithelindvaekst') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.left.interface.epithelindvaekst') .. '\n'
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.left.endothel') ~= '' )
+ then
+ out = out .. ' Endothel: ' .. getValue('spaltelampe.left.endothel') .. '\n'
+ end
+ if ( getValue('spaltelampe.left.lens') ~= '' )
+ then
+ out = out .. 'Lens: ' .. getValue('spaltelampe.left.lens') .. '\n'
+ end
+ if ( getValue('spaltelampe.left.supplerende') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.left.supplerende') .. '\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"/>
+ </queries>
+ <maps>
+ <map name="missing_eye_right_map">
+ value = 0
+ timestamp = 0
+ source = ''
+
+ if( missing_eye_right )
+ then
+ if( missing_eye_right.value and missing_eye_right.value == '' )
+ then
+ value = ''
+ timestamp = missing_eye_right.timestamp
+ source = missing_eye_right.source
+ else
+ value = 'mangler'
+ timestamp = missing_eye_right.timestamp
+ source = missing_eye_right.source
+ end
+ end
+ return value, timestamp, source
+ </map>
+ <map name="missing_eye_left_map">
+ value = 0
+ timestamp = 0
+ source = ''
+
+ if( missing_eye_left )
+ then
+ if( missing_eye_left.value and missing_eye_left.value == '' )
+ then
+ value = ''
+ timestamp = missing_eye_left.timestamp
+ source = missing_eye_left.source
+ else
+ value = 'mangler'
+ timestamp = missing_eye_left.timestamp
+ source = missing_eye_left.source
+ end
+ end
+ return value, timestamp, source
+ </map>
+ </maps>
+ <scripts>
+ <script language="lua" name="right_eye">
+ if ( value == 'mangler' )
+ then
+ disable('right_eye_frame')
+ else
+ enable('right_eye_frame')
+ end
+ return true
+ </script>
+ <script language="lua" name="left_eye">
+ if ( value == 'mangler' )
+ then
+ disable('left_eye_frame')
+ else
+ enable('left_eye_frame')
+ end
+ return true
+ </script>
+ </scripts>
+ <widgets caption="Spaltelampe"
+ layout="vbox">
+
+ <frame layout="hbox">
+
+ <!-- Højre øje -->
+ <frame layout="vbox">
+ <checkbox caption="Der er ikke målt på højre øje"
+ name="spaltelampe.right.missing" script="right_eye"
+ map="missing_eye_right_map"
+ truevalue="mangler" falsevalue="" value=""/>
+ <frame name="right_eye_frame" caption="Højre øje" layout="vbox">
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Konjuktiva:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.konjuktiva" layout="vbox" value="Bleg">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Bleg" value="Bleg"/>
+ <item caption="Injiceret" value="Injiceret"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.konjuktiva.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.konjuktiva.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="vbox" caption="Cornea:">
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Epithel:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.epithel" layout="vbox" value="Upåfaldende">
+ <item caption="Upåfaldende" value="Upåfaldende"/>
+ <item caption="Tørhedsforandringer" value="Tørhedsforandringer"/>
+ <item caption="Mikrocyster" value="Mikrocyster"/>
+ <item caption="Refraktile linier" value="Refraktile linier"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.epithel.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.epithel.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Stroma:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.stroma" layout="vbox" value="">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Ingen" value="Ingen"/>
+ <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
+ <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
+ <item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
+ <item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
+ <item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.stroma.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.stroma.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Flap:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.flap" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Velplaceret" value="Velplaceret"/>
+ <item caption="Dislokeret" value="Dislokeret"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.flap.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.flap.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Folder:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.folder" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Ingen" value="Ingen"/>
+ <item caption="Mikrofolder" value="Mikrofolder"/>
+ <item caption="Lette folder" value="Lette folder"/>
+ <item caption="Udtalte folder" value="Udtalte folder"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.folder.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.folder.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox" caption="Interface:">
+ <frame layout="vbox">
+ <label caption="Partikler:"/>
+ <label/>
+ <label caption="Epithelindvækst:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.interface.partikler" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
+ <item caption="Enkelte partikler" value="Enkelte partikler"/>
+ <item caption="Nogen partikler" value="Nogen partikler"/>
+ <item caption="Udtalte partikler" value="Udtalte partikler"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.interface.partikler.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.interface.partikler.andet"/>
+ </altitem>
+ </altcombobox>
+ <altcombobox name="spaltelampe.right.interface.epithelindvaekst" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Ingen epithelindvækst" value="Ingen epithelindvækst"/>
+ <item caption="Diskret epithelindvækst" value="Diskret epithelindvækst"/>
+ <item caption="Let epithelindvækst" value="Let epithelindvækst"/>
+ <item caption="Betydende epithelindvækst" value="Betydende epithelindvækst"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.interface.epithelindvaekst.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.interface.epithelindvaekst.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Endothel:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.endothel" layout="vbox" value="Upåfaldende">
+ <item caption="Upåfaldende" value="Upåfaldende"/>
+ <item caption="Guttatae" value="Guttatae"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.endothel.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.endothel.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Lens:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.right.lens" layout="vbox" value="Klar">
+ <item caption="Klar" value="Klar"/>
+ <item caption="Katarakt-1" value="Katarakt-1"/>
+ <item caption="Katarakt-2" value="Katarakt-2"/>
+ <item caption="Katarakt-3" value="Katarakt-3"/>
+ <item caption="Katarakt-4" value="Katarakt-4"/>
+ <item caption="Pseudofak" value="Pseudofak"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.right.lens.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.right.lens.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="vbox">
+ <label caption="Supplerende:"/>
+ <lineedit name="spaltelampe.right.supplerende"/>
+ </frame>
+
+ </frame>
+ </frame>
+
+ <!-- Venstre øje -->
+ <frame layout="vbox">
+ <checkbox caption="Der er ikke målt på venstre øje"
+ name="spaltelampe.left.missing" script="left_eye"
+ map="missing_eye_left_map"
+ truevalue="mangler" falsevalue="" value=""/>
+ <frame name="left_eye_frame" caption="Højre øje" layout="vbox">
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Konjuktiva:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.konjuktiva" layout="vbox" value="Bleg">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Bleg" value="Bleg"/>
+ <item caption="Injiceret" value="Injiceret"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.konjuktiva.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.konjuktiva.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="vbox" caption="Cornea:">
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Epithel:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.epithel" layout="vbox" value="Upåfaldende">
+ <item caption="Upåfaldende" value="Upåfaldende"/>
+ <item caption="Tørhedsforandringer" value="Tørhedsforandringer"/>
+ <item caption="Mikrocyster" value="Mikrocyster"/>
+ <item caption="Refraktile linier" value="Refraktile linier"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.epithel.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.epithel.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Stroma:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.stroma" layout="vbox" value="">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="Ingen" value="Ingen"/>
+ <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
+ <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
+ <item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
+ <item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
+ <item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.stroma.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.stroma.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Flap:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.flap" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Velplaceret" value="Velplaceret"/>
+ <item caption="Dislokeret" value="Dislokeret"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.flap.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.flap.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Folder:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.folder" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Ingen" value="Ingen"/>
+ <item caption="Mikrofolder" value="Mikrofolder"/>
+ <item caption="Lette folder" value="Lette folder"/>
+ <item caption="Udtalte folder" value="Udtalte folder"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.folder.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.folder.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox" caption="Interface:">
+ <frame layout="vbox">
+ <label caption="Partikler:"/>
+ <label/>
+ <label caption="Epithelindvækst:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.partikler" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Ingen partikler eller debris" value="Ingen partikler eller debris"/>
+ <item caption="Enkelte partikler" value="Enkelte partikler"/>
+ <item caption="Nogen partikler" value="Nogen partikler"/>
+ <item caption="Udtalte partikler" value="Udtalte partikler"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.partikler.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.partikler.andet"/>
+ </altitem>
+ </altcombobox>
+ <altcombobox name="spaltelampe.left.epithelindvaekst" layout="vbox" value="">
+ <item caption="Ej relevant" value=""/>
+ <item caption="Ingen epithelindvækst" value="Ingen epithelindvækst"/>
+ <item caption="Diskret epithelindvækst" value="Diskret epithelindvækst"/>
+ <item caption="Let epithelindvækst" value="Let epithelindvækst"/>
+ <item caption="Betydende epithelindvækst" value="Betydende epithelindvækst"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.epithelindvaekst.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.epithelindvaekst.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Endothel:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.endothel" layout="vbox" value="Upåfaldende">
+ <item caption="Upåfaldende" value="Upåfaldende"/>
+ <item caption="Guttatae" value="Guttatae"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.endothel.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.endothel.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ </frame>
+
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Lens:"/>
+ <label/>
+ </frame>
+ <frame layout="vbox">
+ <altcombobox name="spaltelampe.left.lens" layout="vbox" value="Klar">
+ <item caption="Klar" value="Klar"/>
+ <item caption="Katarakt-1" value="Katarakt-1"/>
+ <item caption="Katarakt-2" value="Katarakt-2"/>
+ <item caption="Katarakt-3" value="Katarakt-3"/>
+ <item caption="Katarakt-4" value="Katarakt-4"/>
+ <item caption="Pseudofak" value="Pseudofak"/>
+ <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.left.lens.andet">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.left.lens.andet"/>
+ </altitem>
+ </altcombobox>
+ </frame>
+ </frame>
+
+ <frame layout="vbox">
+ <label caption="Supplerende:"/>
+ <lineedit name="spaltelampe.left.supplerende"/>
+ </frame>
+
+ </frame>
+ </frame>
+
+ </frame>
+
+
+ <!-- Knapper -->
+ <frame layout="hbox">
+ <spacer/>
+ <button caption="Gem" action="commit"/>
+ </frame>
+ </widgets>
+</macro>
diff --git a/server/xml/macros/ref_kontrol-1.0.xml b/server/xml/macros/ref_kontrol-1.0.xml
index c7e96be..96352d9 100644
--- a/server/xml/macros/ref_kontrol-1.0.xml
+++ b/server/xml/macros/ref_kontrol-1.0.xml
@@ -16,6 +16,7 @@
</frame>
<altcombobox name="ref.kontrol" layout="vbox" value="Kontrol egen øjenlæge om 1 uge">
<item caption="Egen øjenlæge om 1 uge" value="Kontrol egen øjenlæge om 1 uge"/>
+ <item caption="Egen øjenlæge om 1 uge og kontrol her om 3 måneder" value="Kontrol egen øjenlæge om 1 uge og kontrol her om 3 måneder"/>
<item caption="I ambulatoriet om 1 uge" value="Kontrol i ambulatoriet om 1 uge"/>
<altitem caption="Andet" value="andet" layout="hbox" innerwidget="ref.kontrol.andet">
<label caption="Andet:"/>
diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml
index 8221ad6..07292cc 100644
--- a/server/xml/macros/topografi-1.0.xml
+++ b/server/xml/macros/topografi-1.0.xml
@@ -84,9 +84,9 @@
layout="vbox">
<label caption="Metode:"/>
- <altcombobox name="topografi.method" value="Atlas" layout="vbox">
- <item caption="Atlas" value="Atlas"/>
+ <altcombobox name="topografi.method" value="Pentacam" layout="vbox">
<item caption="Pentacam" value="Pentacam"/>
+ <item caption="Atlas" value="Atlas"/>
<item caption="Atlas og Pentacam" value="Atlas og Pentacam"/>
<altitem caption="Andet" value="andet" innerwidget="topografi_andet">
<frame layout="hbox">
@@ -112,6 +112,8 @@
<item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
<item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
<item caption="Keratoconus" value="Keratoconus"/>
+ <item caption="Centreret ablationer" value="Centreret ablationer"/>
+ <item caption="Decentreret ablationer" value="Decentreret ablationer"/>
<altitem caption="Andet" value="andet" innerwidget="topografi.right.andet">
<frame layout="hbox">
<label caption="Andet:"/>
@@ -138,6 +140,8 @@
<item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/>
<item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/>
<item caption="Keratoconus" value="Keratoconus"/>
+ <item caption="Centreret ablationer" value="Centreret ablationer"/>
+ <item caption="Decentreret ablationer" value="Decentreret ablationer"/>
<altitem caption="Andet" value="andet" innerwidget="topografi.left.andet">
<frame layout="hbox">
<label caption="Andet:"/>
diff --git a/server/xml/macros/visus-autoref-1.0.xml b/server/xml/macros/visus-autoref-1.0.xml
index 7949497..603fbcc 100644
--- a/server/xml/macros/visus-autoref-1.0.xml
+++ b/server/xml/macros/visus-autoref-1.0.xml
@@ -1,27 +1,87 @@
<?xml version='1.0' encoding='UTF-8'?>
<macro name="visus-autoref" version="1.0">
+<!--
+ Info ved oprettelse af ny visus macro hvor denne kopieres.
+ query-replace på .navn1. til .navn2.
+ skift overskrift for begge øjne i resumeet (navn1->navn2)
+ skift GUI overskrift for macroen under widgets afsnittet
+ fjern resume felter der ikke skal bruges
+ fjern tilsvarende GUI felter der ikke skal bruges
+ -->
<resume language="lua">
out = ''
if ( getValue('visus.autoref.missing.right') == '' )
then
- out = out .. 'Visus, højre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.autoref.snellen.right') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.autoref.etdrs.right') .. '\n'
- out = out .. 'Korr.: '
- .. getValue('visus.autoref.korr.sf.right') .. ' sf, '
- .. getValue('visus.autoref.korr.cyl.right') .. ' sph '
- .. getValue('visus.autoref.korr.grader.right') .. ' grader.\n'
+ out = out .. 'Visus, autoref, o.dxt'
+ if ( getValue('visus.autoref.kontrast.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.kontrast.right') .. ' kontrast'
+ end
+ if ( getValue('visus.autoref.st_hul.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.st_hul.right')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.autoref.snellen.right') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.autoref.snellen.right') .. '\n'
+ end
+ if ( getValue('visus.autoref.etdrs.right') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.autoref.etdrs.right') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.autoref.korr.sf.right') .. ' sf'
+ if ( getValue('visus.autoref.korr.cyl.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.korr.cyl.right') .. ' cyl'
+ end
+ if ( getValue('visus.autoref.korr.grader.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.korr.grader.right') .. ' grader'
+ end
+ out = out .. '\n'
+
+ if ( getValue('visus.autoref.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
if ( getValue('visus.autoref.missing.left') == '' )
then
- out = out .. 'Visus, venstre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.autoref.snellen.left') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.autoref.etdrs.left') .. '\n'
- out = out .. 'Korr.: '
- .. getValue('visus.autoref.korr.sf.left') .. ' sf, '
- .. getValue('visus.autoref.korr.cyl.left') .. ' sph '
- .. getValue('visus.autoref.korr.grader.left') .. ' grader.\n'
+ out = out .. 'Visus, autoref, o.sin'
+ if ( getValue('visus.autoref.kontrast.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.kontrast.left') .. ' kontrast'
+ end
+ if ( getValue('visus.autoref.st_hul.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.st_hul.left')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.autoref.snellen.left') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.autoref.snellen.left') .. '\n'
+ end
+ if ( getValue('visus.autoref.etdrs.left') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.autoref.etdrs.left') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.autoref.korr.sf.left') .. ' sf'
+ if ( getValue('visus.autoref.korr.cyl.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.korr.cyl.left') .. ' cyl'
+ end
+ if ( getValue('visus.autoref.korr.grader.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.autoref.korr.grader.left') .. ' grader'
+ end
+ out = out .. '\n'
+
+ if ( getValue('visus.autoref.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
return out
@@ -90,7 +150,7 @@
<script language="lua" name="lt10gt-15">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -104,7 +164,7 @@
<script language="lua" name="lt359gt0">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -115,10 +175,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.autoref.etdrs.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="snellen.left">
+ if (value == '')
+ then
+ if ( getValue('visus.autoref.etdrs.left') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.right">
+ if (value == '')
+ then
+ if ( getValue('visus.autoref.snellen.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.left">
+ if (value == '')
+ then
+ if ( getValue('visus.autoref.snellen.left') == '' )
+ then
+ return false
+ end
end
return true
</script>
@@ -141,7 +234,7 @@
return true
</script>
</scripts>
- <widgets caption="Visus - autoref korrektion"
+ <widgets caption="Visus - autorefraktion"
layout="vbox">
<frame layout="hbox">
@@ -153,159 +246,166 @@
map="missing_eye_right_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
- <frame layout="hbox">
-
- <frame layout="vbox">
- <label caption="Snellen:"/>
- <altcombobox name="visus.autoref.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="2,0" value="2,0"/>
- <item caption="1,6" value="1,6"/>
- <item caption="1,33" value="1,33"/>
- <item caption="1,0" value="1,0"/>
- <item caption="0,8" value="0,8"/>
- <item caption="0,67" value="0,67"/>
- <item caption="0,5" value="0,5"/>
- <item caption="0,4" value="0,4"/>
- <item caption="0,32" value="0,32"/>
- <item caption="0,25" value="0,25"/>
- <item caption="0,2" value="0,2"/>
- <item caption="0,16" value="0,16"/>
- <item caption="0,125" value="0,125"/>
- <item caption="0,1" value="0,1"/>
- <item caption="0,08" value="0,08"/>
- <item caption="0,05" value="0,05"/>
- <item caption="6/60" value="6/60"/>
- <item caption="3/60" value="3/60"/>
- <item caption="1/18" value="1/18"/>
- <item caption="1/24" value="1/24"/>
- <item caption="1/36" value="1/36"/>
- <item caption="1/60" value="1/60"/>
- <item caption="FGT" value="FGT"/>
- <item caption="HBV" value="HBV"/>
- <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>
- </frame>
- <frame layout="vbox">
- <label caption="ETDRS:"/>
- <combobox name="visus.autoref.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="0" value="0"/>
- <item caption="1" value="1"/>
- <item caption="2" value="2"/>
- <item caption="3" value="3"/>
- <item caption="4" value="4"/>
- <item caption="5" value="5"/>
- <item caption="6" value="6"/>
- <item caption="7" value="7"/>
- <item caption="8" value="8"/>
- <item caption="9" value="9"/>
- <item caption="10" value="10"/>
- <item caption="11" value="11"/>
- <item caption="12" value="12"/>
- <item caption="13" value="13"/>
- <item caption="14" value="14"/>
- <item caption="15" value="15"/>
- <item caption="16" value="16"/>
- <item caption="17" value="17"/>
- <item caption="18" value="18"/>
- <item caption="19" value="19"/>
- <item caption="20" value="20"/>
- <item caption="21" value="21"/>
- <item caption="22" value="22"/>
- <item caption="23" value="23"/>
- <item caption="24" value="24"/>
- <item caption="25" value="25"/>
- <item caption="26" value="26"/>
- <item caption="27" value="27"/>
- <item caption="28" value="28"/>
- <item caption="29" value="29"/>
- <item caption="30" value="30"/>
- <item caption="31" value="31"/>
- <item caption="32" value="32"/>
- <item caption="33" value="33"/>
- <item caption="34" value="34"/>
- <item caption="35" value="35"/>
- <item caption="36" value="36"/>
- <item caption="37" value="37"/>
- <item caption="38" value="38"/>
- <item caption="39" value="39"/>
- <item caption="40" value="40"/>
- <item caption="41" value="41"/>
- <item caption="42" value="42"/>
- <item caption="43" value="43"/>
- <item caption="44" value="44"/>
- <item caption="45" value="45"/>
- <item caption="46" value="46"/>
- <item caption="47" value="47"/>
- <item caption="48" value="48"/>
- <item caption="49" value="49"/>
- <item caption="50" value="50"/>
- <item caption="51" value="51"/>
- <item caption="52" value="52"/>
- <item caption="53" value="53"/>
- <item caption="54" value="54"/>
- <item caption="55" value="55"/>
- <item caption="56" value="56"/>
- <item caption="57" value="57"/>
- <item caption="58" value="58"/>
- <item caption="59" value="59"/>
- <item caption="60" value="60"/>
- <item caption="61" value="61"/>
- <item caption="62" value="62"/>
- <item caption="63" value="63"/>
- <item caption="64" value="64"/>
- <item caption="65" value="65"/>
- <item caption="66" value="66"/>
- <item caption="67" value="67"/>
- <item caption="68" value="68"/>
- <item caption="69" value="69"/>
- <item caption="70" value="70"/>
- <item caption="71" value="71"/>
- <item caption="72" value="72"/>
- <item caption="73" value="73"/>
- <item caption="74" value="74"/>
- <item caption="75" value="75"/>
- <item caption="76" value="76"/>
- <item caption="77" value="77"/>
- <item caption="78" value="78"/>
- <item caption="79" value="79"/>
- <item caption="80" value="80"/>
- <item caption="81" value="81"/>
- <item caption="82" value="82"/>
- <item caption="83" value="83"/>
- <item caption="84" value="84"/>
- <item caption="85" value="85"/>
- <item caption="86" value="86"/>
- <item caption="87" value="87"/>
- <item caption="88" value="88"/>
- <item caption="89" value="89"/>
- <item caption="90" value="90"/>
- <item caption="91" value="91"/>
- <item caption="92" value="92"/>
- <item caption="93" value="93"/>
- <item caption="94" value="94"/>
- <item caption="95" value="95"/>
- <item caption="96" value="96"/>
- <item caption="97" value="97"/>
- <item caption="98" value="98"/>
- <item caption="99" value="99"/>
- <item caption="100" value="100"/>
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.autoref.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.autoref.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:"/>
+ <combobox name="visus.autoref.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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.autoref.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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
</frame>
<frame layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
- <label caption=""/>
- <label caption="Korr.:"/>
+ <label/>
+ <label caption="Korr:"/>
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
@@ -313,11 +413,11 @@
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="visus.autoref.korr.cyl.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="visus.autoref.korr.cyl.right" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="visus.autoref.korr.grader.right" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="visus.autoref.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
@@ -331,159 +431,166 @@
map="missing_eye_left_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
- <frame layout="hbox">
-
- <frame layout="vbox">
- <label caption="Snellen:"/>
- <altcombobox name="visus.autoref.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="2,0" value="2,0"/>
- <item caption="1,6" value="1,6"/>
- <item caption="1,33" value="1,33"/>
- <item caption="1,0" value="1,0"/>
- <item caption="0,8" value="0,8"/>
- <item caption="0,67" value="0,67"/>
- <item caption="0,5" value="0,5"/>
- <item caption="0,4" value="0,4"/>
- <item caption="0,32" value="0,32"/>
- <item caption="0,25" value="0,25"/>
- <item caption="0,2" value="0,2"/>
- <item caption="0,16" value="0,16"/>
- <item caption="0,125" value="0,125"/>
- <item caption="0,1" value="0,1"/>
- <item caption="0,08" value="0,08"/>
- <item caption="0,05" value="0,05"/>
- <item caption="6/60" value="6/60"/>
- <item caption="3/60" value="3/60"/>
- <item caption="1/18" value="1/18"/>
- <item caption="1/24" value="1/24"/>
- <item caption="1/36" value="1/36"/>
- <item caption="1/60" value="1/60"/>
- <item caption="FGT" value="FGT"/>
- <item caption="HBV" value="HBV"/>
- <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>
- </frame>
- <frame layout="vbox">
- <label caption="ETDRS:"/>
- <combobox name="visus.autoref.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="0" value="0"/>
- <item caption="1" value="1"/>
- <item caption="2" value="2"/>
- <item caption="3" value="3"/>
- <item caption="4" value="4"/>
- <item caption="5" value="5"/>
- <item caption="6" value="6"/>
- <item caption="7" value="7"/>
- <item caption="8" value="8"/>
- <item caption="9" value="9"/>
- <item caption="10" value="10"/>
- <item caption="11" value="11"/>
- <item caption="12" value="12"/>
- <item caption="13" value="13"/>
- <item caption="14" value="14"/>
- <item caption="15" value="15"/>
- <item caption="16" value="16"/>
- <item caption="17" value="17"/>
- <item caption="18" value="18"/>
- <item caption="19" value="19"/>
- <item caption="20" value="20"/>
- <item caption="21" value="21"/>
- <item caption="22" value="22"/>
- <item caption="23" value="23"/>
- <item caption="24" value="24"/>
- <item caption="25" value="25"/>
- <item caption="26" value="26"/>
- <item caption="27" value="27"/>
- <item caption="28" value="28"/>
- <item caption="29" value="29"/>
- <item caption="30" value="30"/>
- <item caption="31" value="31"/>
- <item caption="32" value="32"/>
- <item caption="33" value="33"/>
- <item caption="34" value="34"/>
- <item caption="35" value="35"/>
- <item caption="36" value="36"/>
- <item caption="37" value="37"/>
- <item caption="38" value="38"/>
- <item caption="39" value="39"/>
- <item caption="40" value="40"/>
- <item caption="41" value="41"/>
- <item caption="42" value="42"/>
- <item caption="43" value="43"/>
- <item caption="44" value="44"/>
- <item caption="45" value="45"/>
- <item caption="46" value="46"/>
- <item caption="47" value="47"/>
- <item caption="48" value="48"/>
- <item caption="49" value="49"/>
- <item caption="50" value="50"/>
- <item caption="51" value="51"/>
- <item caption="52" value="52"/>
- <item caption="53" value="53"/>
- <item caption="54" value="54"/>
- <item caption="55" value="55"/>
- <item caption="56" value="56"/>
- <item caption="57" value="57"/>
- <item caption="58" value="58"/>
- <item caption="59" value="59"/>
- <item caption="60" value="60"/>
- <item caption="61" value="61"/>
- <item caption="62" value="62"/>
- <item caption="63" value="63"/>
- <item caption="64" value="64"/>
- <item caption="65" value="65"/>
- <item caption="66" value="66"/>
- <item caption="67" value="67"/>
- <item caption="68" value="68"/>
- <item caption="69" value="69"/>
- <item caption="70" value="70"/>
- <item caption="71" value="71"/>
- <item caption="72" value="72"/>
- <item caption="73" value="73"/>
- <item caption="74" value="74"/>
- <item caption="75" value="75"/>
- <item caption="76" value="76"/>
- <item caption="77" value="77"/>
- <item caption="78" value="78"/>
- <item caption="79" value="79"/>
- <item caption="80" value="80"/>
- <item caption="81" value="81"/>
- <item caption="82" value="82"/>
- <item caption="83" value="83"/>
- <item caption="84" value="84"/>
- <item caption="85" value="85"/>
- <item caption="86" value="86"/>
- <item caption="87" value="87"/>
- <item caption="88" value="88"/>
- <item caption="89" value="89"/>
- <item caption="90" value="90"/>
- <item caption="91" value="91"/>
- <item caption="92" value="92"/>
- <item caption="93" value="93"/>
- <item caption="94" value="94"/>
- <item caption="95" value="95"/>
- <item caption="96" value="96"/>
- <item caption="97" value="97"/>
- <item caption="98" value="98"/>
- <item caption="99" value="99"/>
- <item caption="100" value="100"/>
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.autoref.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.autoref.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:"/>
+ <combobox name="visus.autoref.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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.autoref.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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
</frame>
<frame layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
- <label caption=""/>
- <label caption="Korr.:"/>
+ <label/>
+ <label caption="Korr:"/>
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
@@ -491,11 +598,11 @@
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="visus.autoref.korr.cyl.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="visus.autoref.korr.cyl.left" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="visus.autoref.korr.grader.left" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="visus.autoref.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
diff --git a/server/xml/macros/visus-egen_korr-1.0.xml b/server/xml/macros/visus-egen_korr-1.0.xml
index ad346f5..bbdd5ca 100644
--- a/server/xml/macros/visus-egen_korr-1.0.xml
+++ b/server/xml/macros/visus-egen_korr-1.0.xml
@@ -4,24 +4,76 @@
out = ''
if ( getValue('visus.egen_korr.missing.right') == '' )
then
- out = out .. 'Visus, højre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.egen_korr.snellen.right') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.etdrs.right') .. '\n'
- out = out .. 'Basis: '
- .. getValue('visus.egen_korr.basis.sf.right') .. ' sf, '
- .. getValue('visus.egen_korr.basis.cyl.right') .. ' sph '
- .. getValue('visus.egen_korr.basis.grader.right') .. ' grader.\n'
+ out = out .. 'Visus, egen korr., o.dxt'
+ if ( getValue('visus.egen_korr.kontrast.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.kontrast.right') .. ' kontrast'
+ end
+ if ( getValue('visus.egen_korr.st_hul.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.st_hul.right')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.egen_korr.snellen.right') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.egen_korr.snellen.right') .. '\n'
+ end
+ if ( getValue('visus.egen_korr.etdrs.right') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.etdrs.right') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.egen_korr.korr.sf.right') .. ' sf'
+ if ( getValue('visus.egen_korr.korr.cyl.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.korr.cyl.right') .. ' cyl'
+ end
+ if ( getValue('visus.egen_korr.korr.grader.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.korr.grader.right') .. ' grader'
+ end
+ out = out .. '\n'
+
+ if ( getValue('visus.egen_korr.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
if ( getValue('visus.egen_korr.missing.left') == '' )
then
- out = out .. 'Visus, venstre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.egen_korr.snellen.left') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.etdrs.left') .. '\n'
- out = out .. 'Basis: '
- .. getValue('visus.egen_korr.basis.sf.left') .. ' sf, '
- .. getValue('visus.egen_korr.basis.cyl.left') .. ' sph '
- .. getValue('visus.egen_korr.basis.grader.left') .. ' grader.\n'
+ out = out .. 'Visus, egen korr., o.sin'
+ if ( getValue('visus.egen_korr.kontrast.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.kontrast.left') .. ' kontrast'
+ end
+ if ( getValue('visus.egen_korr.st_hul.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.st_hul.left')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.egen_korr.snellen.left') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.egen_korr.snellen.left') .. '\n'
+ end
+ if ( getValue('visus.egen_korr.etdrs.left') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.etdrs.left') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.egen_korr.korr.sf.left') .. ' sf'
+ if ( getValue('visus.egen_korr.korr.cyl.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.korr.cyl.left') .. ' cyl'
+ end
+ if ( getValue('visus.egen_korr.korr.grader.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.egen_korr.korr.grader.left') .. ' grader'
+ end
+ out = out .. '\n'
+
+ if ( getValue('visus.egen_korr.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
return out
@@ -90,7 +142,7 @@
<script language="lua" name="lt10gt-15">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -104,7 +156,7 @@
<script language="lua" name="lt359gt0">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -115,10 +167,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.egen_korr.etdrs.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="snellen.left">
+ if (value == '')
+ then
+ if ( getValue('visus.egen_korr.etdrs.left') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.right">
+ if (value == '')
+ then
+ if ( getValue('visus.egen_korr.snellen.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.left">
+ if (value == '')
+ then
+ if ( getValue('visus.egen_korr.snellen.left') == '' )
+ then
+ return false
+ end
end
return true
</script>
@@ -153,171 +238,178 @@
map="missing_eye_right_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
- <frame layout="hbox">
-
- <frame layout="vbox">
- <label caption="Snellen:"/>
- <altcombobox name="visus.egen_korr.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="2,0" value="2,0"/>
- <item caption="1,6" value="1,6"/>
- <item caption="1,33" value="1,33"/>
- <item caption="1,0" value="1,0"/>
- <item caption="0,8" value="0,8"/>
- <item caption="0,67" value="0,67"/>
- <item caption="0,5" value="0,5"/>
- <item caption="0,4" value="0,4"/>
- <item caption="0,32" value="0,32"/>
- <item caption="0,25" value="0,25"/>
- <item caption="0,2" value="0,2"/>
- <item caption="0,16" value="0,16"/>
- <item caption="0,125" value="0,125"/>
- <item caption="0,1" value="0,1"/>
- <item caption="0,08" value="0,08"/>
- <item caption="0,05" value="0,05"/>
- <item caption="6/60" value="6/60"/>
- <item caption="3/60" value="3/60"/>
- <item caption="1/18" value="1/18"/>
- <item caption="1/24" value="1/24"/>
- <item caption="1/36" value="1/36"/>
- <item caption="1/60" value="1/60"/>
- <item caption="FGT" value="FGT"/>
- <item caption="HBV" value="HBV"/>
- <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>
- </frame>
- <frame layout="vbox">
- <label caption="ETDRS:"/>
- <combobox name="visus.egen_korr.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="0" value="0"/>
- <item caption="1" value="1"/>
- <item caption="2" value="2"/>
- <item caption="3" value="3"/>
- <item caption="4" value="4"/>
- <item caption="5" value="5"/>
- <item caption="6" value="6"/>
- <item caption="7" value="7"/>
- <item caption="8" value="8"/>
- <item caption="9" value="9"/>
- <item caption="10" value="10"/>
- <item caption="11" value="11"/>
- <item caption="12" value="12"/>
- <item caption="13" value="13"/>
- <item caption="14" value="14"/>
- <item caption="15" value="15"/>
- <item caption="16" value="16"/>
- <item caption="17" value="17"/>
- <item caption="18" value="18"/>
- <item caption="19" value="19"/>
- <item caption="20" value="20"/>
- <item caption="21" value="21"/>
- <item caption="22" value="22"/>
- <item caption="23" value="23"/>
- <item caption="24" value="24"/>
- <item caption="25" value="25"/>
- <item caption="26" value="26"/>
- <item caption="27" value="27"/>
- <item caption="28" value="28"/>
- <item caption="29" value="29"/>
- <item caption="30" value="30"/>
- <item caption="31" value="31"/>
- <item caption="32" value="32"/>
- <item caption="33" value="33"/>
- <item caption="34" value="34"/>
- <item caption="35" value="35"/>
- <item caption="36" value="36"/>
- <item caption="37" value="37"/>
- <item caption="38" value="38"/>
- <item caption="39" value="39"/>
- <item caption="40" value="40"/>
- <item caption="41" value="41"/>
- <item caption="42" value="42"/>
- <item caption="43" value="43"/>
- <item caption="44" value="44"/>
- <item caption="45" value="45"/>
- <item caption="46" value="46"/>
- <item caption="47" value="47"/>
- <item caption="48" value="48"/>
- <item caption="49" value="49"/>
- <item caption="50" value="50"/>
- <item caption="51" value="51"/>
- <item caption="52" value="52"/>
- <item caption="53" value="53"/>
- <item caption="54" value="54"/>
- <item caption="55" value="55"/>
- <item caption="56" value="56"/>
- <item caption="57" value="57"/>
- <item caption="58" value="58"/>
- <item caption="59" value="59"/>
- <item caption="60" value="60"/>
- <item caption="61" value="61"/>
- <item caption="62" value="62"/>
- <item caption="63" value="63"/>
- <item caption="64" value="64"/>
- <item caption="65" value="65"/>
- <item caption="66" value="66"/>
- <item caption="67" value="67"/>
- <item caption="68" value="68"/>
- <item caption="69" value="69"/>
- <item caption="70" value="70"/>
- <item caption="71" value="71"/>
- <item caption="72" value="72"/>
- <item caption="73" value="73"/>
- <item caption="74" value="74"/>
- <item caption="75" value="75"/>
- <item caption="76" value="76"/>
- <item caption="77" value="77"/>
- <item caption="78" value="78"/>
- <item caption="79" value="79"/>
- <item caption="80" value="80"/>
- <item caption="81" value="81"/>
- <item caption="82" value="82"/>
- <item caption="83" value="83"/>
- <item caption="84" value="84"/>
- <item caption="85" value="85"/>
- <item caption="86" value="86"/>
- <item caption="87" value="87"/>
- <item caption="88" value="88"/>
- <item caption="89" value="89"/>
- <item caption="90" value="90"/>
- <item caption="91" value="91"/>
- <item caption="92" value="92"/>
- <item caption="93" value="93"/>
- <item caption="94" value="94"/>
- <item caption="95" value="95"/>
- <item caption="96" value="96"/>
- <item caption="97" value="97"/>
- <item caption="98" value="98"/>
- <item caption="99" value="99"/>
- <item caption="100" value="100"/>
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.egen_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.egen_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:"/>
+ <combobox name="visus.egen_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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.egen_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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
</frame>
<frame layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
<label/>
- <label caption="Basis:"/>
+ <label caption="Korr:"/>
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="visus.egen_korr.basis.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="visus.egen_korr.korr.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="visus.egen_korr.basis.cyl.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="visus.egen_korr.korr.cyl.right" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="visus.egen_korr.basis.grader.right" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="visus.egen_korr.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
@@ -331,171 +423,178 @@
map="missing_eye_left_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
- <frame layout="hbox">
-
- <frame layout="vbox">
- <label caption="Snellen:"/>
- <altcombobox name="visus.egen_korr.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="2,0" value="2,0"/>
- <item caption="1,6" value="1,6"/>
- <item caption="1,33" value="1,33"/>
- <item caption="1,0" value="1,0"/>
- <item caption="0,8" value="0,8"/>
- <item caption="0,67" value="0,67"/>
- <item caption="0,5" value="0,5"/>
- <item caption="0,4" value="0,4"/>
- <item caption="0,32" value="0,32"/>
- <item caption="0,25" value="0,25"/>
- <item caption="0,2" value="0,2"/>
- <item caption="0,16" value="0,16"/>
- <item caption="0,125" value="0,125"/>
- <item caption="0,1" value="0,1"/>
- <item caption="0,08" value="0,08"/>
- <item caption="0,05" value="0,05"/>
- <item caption="6/60" value="6/60"/>
- <item caption="3/60" value="3/60"/>
- <item caption="1/18" value="1/18"/>
- <item caption="1/24" value="1/24"/>
- <item caption="1/36" value="1/36"/>
- <item caption="1/60" value="1/60"/>
- <item caption="FGT" value="FGT"/>
- <item caption="HBV" value="HBV"/>
- <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>
- </frame>
- <frame layout="vbox">
- <label caption="ETDRS:"/>
- <combobox name="visus.egen_korr.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="0" value="0"/>
- <item caption="1" value="1"/>
- <item caption="2" value="2"/>
- <item caption="3" value="3"/>
- <item caption="4" value="4"/>
- <item caption="5" value="5"/>
- <item caption="6" value="6"/>
- <item caption="7" value="7"/>
- <item caption="8" value="8"/>
- <item caption="9" value="9"/>
- <item caption="10" value="10"/>
- <item caption="11" value="11"/>
- <item caption="12" value="12"/>
- <item caption="13" value="13"/>
- <item caption="14" value="14"/>
- <item caption="15" value="15"/>
- <item caption="16" value="16"/>
- <item caption="17" value="17"/>
- <item caption="18" value="18"/>
- <item caption="19" value="19"/>
- <item caption="20" value="20"/>
- <item caption="21" value="21"/>
- <item caption="22" value="22"/>
- <item caption="23" value="23"/>
- <item caption="24" value="24"/>
- <item caption="25" value="25"/>
- <item caption="26" value="26"/>
- <item caption="27" value="27"/>
- <item caption="28" value="28"/>
- <item caption="29" value="29"/>
- <item caption="30" value="30"/>
- <item caption="31" value="31"/>
- <item caption="32" value="32"/>
- <item caption="33" value="33"/>
- <item caption="34" value="34"/>
- <item caption="35" value="35"/>
- <item caption="36" value="36"/>
- <item caption="37" value="37"/>
- <item caption="38" value="38"/>
- <item caption="39" value="39"/>
- <item caption="40" value="40"/>
- <item caption="41" value="41"/>
- <item caption="42" value="42"/>
- <item caption="43" value="43"/>
- <item caption="44" value="44"/>
- <item caption="45" value="45"/>
- <item caption="46" value="46"/>
- <item caption="47" value="47"/>
- <item caption="48" value="48"/>
- <item caption="49" value="49"/>
- <item caption="50" value="50"/>
- <item caption="51" value="51"/>
- <item caption="52" value="52"/>
- <item caption="53" value="53"/>
- <item caption="54" value="54"/>
- <item caption="55" value="55"/>
- <item caption="56" value="56"/>
- <item caption="57" value="57"/>
- <item caption="58" value="58"/>
- <item caption="59" value="59"/>
- <item caption="60" value="60"/>
- <item caption="61" value="61"/>
- <item caption="62" value="62"/>
- <item caption="63" value="63"/>
- <item caption="64" value="64"/>
- <item caption="65" value="65"/>
- <item caption="66" value="66"/>
- <item caption="67" value="67"/>
- <item caption="68" value="68"/>
- <item caption="69" value="69"/>
- <item caption="70" value="70"/>
- <item caption="71" value="71"/>
- <item caption="72" value="72"/>
- <item caption="73" value="73"/>
- <item caption="74" value="74"/>
- <item caption="75" value="75"/>
- <item caption="76" value="76"/>
- <item caption="77" value="77"/>
- <item caption="78" value="78"/>
- <item caption="79" value="79"/>
- <item caption="80" value="80"/>
- <item caption="81" value="81"/>
- <item caption="82" value="82"/>
- <item caption="83" value="83"/>
- <item caption="84" value="84"/>
- <item caption="85" value="85"/>
- <item caption="86" value="86"/>
- <item caption="87" value="87"/>
- <item caption="88" value="88"/>
- <item caption="89" value="89"/>
- <item caption="90" value="90"/>
- <item caption="91" value="91"/>
- <item caption="92" value="92"/>
- <item caption="93" value="93"/>
- <item caption="94" value="94"/>
- <item caption="95" value="95"/>
- <item caption="96" value="96"/>
- <item caption="97" value="97"/>
- <item caption="98" value="98"/>
- <item caption="99" value="99"/>
- <item caption="100" value="100"/>
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.egen_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.egen_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:"/>
+ <combobox name="visus.egen_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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.egen_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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
</frame>
<frame layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
<label/>
- <label caption="Basis:"/>
+ <label caption="Korr:"/>
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="visus.egen_korr.basis.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="visus.egen_korr.korr.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="visus.egen_korr.basis.cyl.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="visus.egen_korr.korr.cyl.left" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="visus.egen_korr.basis.grader.left" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="visus.egen_korr.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 9d79bd3..3747fb5 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -2,34 +2,78 @@
<macro name="visus-manifest_refraktion" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('visus.optimal_korr.missing.right') == '' )
+ if ( getValue('visus.manifest_refraktion.missing.right') == '' )
then
- out = out .. 'Visus, højre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.optimal_korr.snellen.right') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.optimal_korr.etdrs.right') .. '\n'
- out = out .. 'Basis: '
- .. getValue('visus.optimal_korr.basis.sf.right') .. ' sf, '
- .. getValue('visus.optimal_korr.basis.cyl.right') .. ' sph '
- .. getValue('visus.optimal_korr.basis.grader.right') .. ' grader.\n'
- out = out .. 'Korr.: '
- .. getValue('visus.optimal_korr.korr.sf.right') .. ' sf, '
- .. getValue('visus.optimal_korr.korr.cyl.right') .. ' sph '
- .. getValue('visus.optimal_korr.korr.grader.right') .. ' grader.\n'
+ out = out .. 'Visus, manifest refraktion, o.dxt'
+ if ( getValue('visus.manifest_refraktion.kontrast.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.kontrast.right') .. ' kontrast'
+ end
+ if ( getValue('visus.manifest_refraktion.st_hul.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.right')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.manifest_refraktion.snellen.right') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.snellen.right') .. '\n'
+ end
+ if ( getValue('visus.manifest_refraktion.etdrs.right') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.etdrs.right') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.manifest_refraktion.korr.sf.right') .. ' sf'
+ if ( getValue('visus.manifest_refraktion.korr.cyl.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.cyl.right') .. ' cyl'
+ end
+ if ( getValue('visus.manifest_refraktion.korr.grader.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.grader.right') .. ' grader'
+ end
+ out = out .. '\n'
+
+ if ( getValue('visus.manifest_refraktion.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
- if ( getValue('visus.optimal_korr.missing.left') == '' )
+ if ( getValue('visus.manifest_refraktion.missing.left') == '' )
then
- out = out .. 'Visus, venstre øje:\n'
- out = out .. 'Snellen: ' .. getValue('visus.optimal_korr.snellen.left') .. '\n'
- out = out .. 'ETDRS: ' .. getValue('visus.optimal_korr.etdrs.left') .. '\n'
- out = out .. 'Basis: '
- .. getValue('visus.optimal_korr.basis.sf.left') .. ' sf, '
- .. getValue('visus.optimal_korr.basis.cyl.left') .. ' sph '
- .. getValue('visus.optimal_korr.basis.grader.left') .. ' grader.\n'
- out = out .. 'Korr.: '
- .. getValue('visus.optimal_korr.korr.sf.left') .. ' sf, '
- .. getValue('visus.optimal_korr.korr.cyl.left') .. ' sph '
- .. getValue('visus.optimal_korr.korr.grader.left') .. ' grader.\n'
+ out = out .. 'Visus, manifest refraktion, o.sin'
+ if ( getValue('visus.manifest_refraktion.kontrast.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.kontrast.left') .. ' kontrast'
+ end
+ if ( getValue('visus.manifest_refraktion.st_hul.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.left')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.manifest_refraktion.snellen.left') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.snellen.left') .. '\n'
+ end
+ if ( getValue('visus.manifest_refraktion.etdrs.left') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.etdrs.left') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.manifest_refraktion.korr.sf.left') .. ' sf'
+ if ( getValue('visus.manifest_refraktion.korr.cyl.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.cyl.left') .. ' cyl'
+ end
+ if ( getValue('visus.manifest_refraktion.korr.grader.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.grader.left') .. ' grader'
+ end
+ out = out .. '\n'
+
+ if ( getValue('visus.manifest_refraktion.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
end
return out
@@ -98,7 +142,7 @@
<script language="lua" name="lt10gt-15">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -112,7 +156,7 @@
<script language="lua" name="lt359gt0">
if(value == '')
then
- return false
+ return true
end
value = string.gsub(value, ',', '.')
@@ -123,10 +167,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.manifest_refraktion.etdrs.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="snellen.left">
+ if (value == '')
+ then
+ if ( getValue('visus.manifest_refraktion.etdrs.left') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.right">
+ if (value == '')
+ then
+ if ( getValue('visus.manifest_refraktion.snellen.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.left">
+ if (value == '')
+ then
+ if ( getValue('visus.manifest_refraktion.snellen.left') == '' )
+ then
+ return false
+ end
end
return true
</script>
@@ -157,193 +234,182 @@
<!-- Højre øje -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på højre øje"
- name="visus.optimal_korr.missing.right" script="right_eye"
+ name="visus.manifest_refraktion.missing.right" script="right_eye"
map="missing_eye_right_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="right_eye_frame" caption="Højre øje" layout="vbox">
- <frame layout="hbox">
-
- <frame layout="vbox">
- <label caption="Snellen:"/>
- <altcombobox name="visus.optimal_korr.snellen.right" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="2,0" value="2,0"/>
- <item caption="1,6" value="1,6"/>
- <item caption="1,33" value="1,33"/>
- <item caption="1,0" value="1,0"/>
- <item caption="0,8" value="0,8"/>
- <item caption="0,67" value="0,67"/>
- <item caption="0,5" value="0,5"/>
- <item caption="0,4" value="0,4"/>
- <item caption="0,32" value="0,32"/>
- <item caption="0,25" value="0,25"/>
- <item caption="0,2" value="0,2"/>
- <item caption="0,16" value="0,16"/>
- <item caption="0,125" value="0,125"/>
- <item caption="0,1" value="0,1"/>
- <item caption="0,08" value="0,08"/>
- <item caption="0,05" value="0,05"/>
- <item caption="6/60" value="6/60"/>
- <item caption="3/60" value="3/60"/>
- <item caption="1/18" value="1/18"/>
- <item caption="1/24" value="1/24"/>
- <item caption="1/36" value="1/36"/>
- <item caption="1/60" value="1/60"/>
- <item caption="FGT" value="FGT"/>
- <item caption="HBV" value="HBV"/>
- <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>
- </frame>
- <frame layout="vbox">
- <label caption="ETDRS:"/>
- <combobox name="visus.optimal_korr.etdrs.right" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="0" value="0"/>
- <item caption="1" value="1"/>
- <item caption="2" value="2"/>
- <item caption="3" value="3"/>
- <item caption="4" value="4"/>
- <item caption="5" value="5"/>
- <item caption="6" value="6"/>
- <item caption="7" value="7"/>
- <item caption="8" value="8"/>
- <item caption="9" value="9"/>
- <item caption="10" value="10"/>
- <item caption="11" value="11"/>
- <item caption="12" value="12"/>
- <item caption="13" value="13"/>
- <item caption="14" value="14"/>
- <item caption="15" value="15"/>
- <item caption="16" value="16"/>
- <item caption="17" value="17"/>
- <item caption="18" value="18"/>
- <item caption="19" value="19"/>
- <item caption="20" value="20"/>
- <item caption="21" value="21"/>
- <item caption="22" value="22"/>
- <item caption="23" value="23"/>
- <item caption="24" value="24"/>
- <item caption="25" value="25"/>
- <item caption="26" value="26"/>
- <item caption="27" value="27"/>
- <item caption="28" value="28"/>
- <item caption="29" value="29"/>
- <item caption="30" value="30"/>
- <item caption="31" value="31"/>
- <item caption="32" value="32"/>
- <item caption="33" value="33"/>
- <item caption="34" value="34"/>
- <item caption="35" value="35"/>
- <item caption="36" value="36"/>
- <item caption="37" value="37"/>
- <item caption="38" value="38"/>
- <item caption="39" value="39"/>
- <item caption="40" value="40"/>
- <item caption="41" value="41"/>
- <item caption="42" value="42"/>
- <item caption="43" value="43"/>
- <item caption="44" value="44"/>
- <item caption="45" value="45"/>
- <item caption="46" value="46"/>
- <item caption="47" value="47"/>
- <item caption="48" value="48"/>
- <item caption="49" value="49"/>
- <item caption="50" value="50"/>
- <item caption="51" value="51"/>
- <item caption="52" value="52"/>
- <item caption="53" value="53"/>
- <item caption="54" value="54"/>
- <item caption="55" value="55"/>
- <item caption="56" value="56"/>
- <item caption="57" value="57"/>
- <item caption="58" value="58"/>
- <item caption="59" value="59"/>
- <item caption="60" value="60"/>
- <item caption="61" value="61"/>
- <item caption="62" value="62"/>
- <item caption="63" value="63"/>
- <item caption="64" value="64"/>
- <item caption="65" value="65"/>
- <item caption="66" value="66"/>
- <item caption="67" value="67"/>
- <item caption="68" value="68"/>
- <item caption="69" value="69"/>
- <item caption="70" value="70"/>
- <item caption="71" value="71"/>
- <item caption="72" value="72"/>
- <item caption="73" value="73"/>
- <item caption="74" value="74"/>
- <item caption="75" value="75"/>
- <item caption="76" value="76"/>
- <item caption="77" value="77"/>
- <item caption="78" value="78"/>
- <item caption="79" value="79"/>
- <item caption="80" value="80"/>
- <item caption="81" value="81"/>
- <item caption="82" value="82"/>
- <item caption="83" value="83"/>
- <item caption="84" value="84"/>
- <item caption="85" value="85"/>
- <item caption="86" value="86"/>
- <item caption="87" value="87"/>
- <item caption="88" value="88"/>
- <item caption="89" value="89"/>
- <item caption="90" value="90"/>
- <item caption="91" value="91"/>
- <item caption="92" value="92"/>
- <item caption="93" value="93"/>
- <item caption="94" value="94"/>
- <item caption="95" value="95"/>
- <item caption="96" value="96"/>
- <item caption="97" value="97"/>
- <item caption="98" value="98"/>
- <item caption="99" value="99"/>
- <item caption="100" value="100"/>
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.manifest_refraktion.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.manifest_refraktion.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:"/>
+ <combobox name="visus.manifest_refraktion.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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.manifest_refraktion.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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
</frame>
<frame layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
<label/>
- <label caption="Basis:"/>
- </frame>
- <frame layout="vbox">
- <label caption="Sf:"/>
- <lineedit name="visus.optimal_korr.basis.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
- </frame>
- <frame layout="vbox">
- <label caption="Cyl:"/>
- <lineedit name="visus.optimal_korr.basis.cyl.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
- </frame>
- <frame layout="vbox">
- <label caption="Grader:"/>
- <lineedit name="visus.optimal_korr.basis.grader.right" regexp="[\d]+" script="lt359gt0" value=""/>
- </frame>
- </frame>
- <frame layout="hbox">
- <frame layout="vbox">
- <label caption=""/>
- <label caption="Korr.:"/>
+ <label caption="Korr:"/>
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="visus.optimal_korr.korr.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="visus.manifest_refraktion.korr.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="visus.optimal_korr.korr.cyl.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="visus.manifest_refraktion.korr.cyl.right" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="visus.optimal_korr.korr.grader.right" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="visus.manifest_refraktion.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
@@ -353,193 +419,182 @@
<!-- Venstre øje -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på venstre øje"
- name="visus.optimal_korr.missing.left" script="left_eye"
+ name="visus.manifest_refraktion.missing.left" script="left_eye"
map="missing_eye_left_map"
truevalue="mangler" falsevalue="" value=""/>
<frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
- <frame layout="hbox">
-
- <frame layout="vbox">
- <label caption="Snellen:"/>
- <altcombobox name="visus.optimal_korr.snellen.left" layout="vbox" type="search" value="Ikke udfyldt" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="2,0" value="2,0"/>
- <item caption="1,6" value="1,6"/>
- <item caption="1,33" value="1,33"/>
- <item caption="1,0" value="1,0"/>
- <item caption="0,8" value="0,8"/>
- <item caption="0,67" value="0,67"/>
- <item caption="0,5" value="0,5"/>
- <item caption="0,4" value="0,4"/>
- <item caption="0,32" value="0,32"/>
- <item caption="0,25" value="0,25"/>
- <item caption="0,2" value="0,2"/>
- <item caption="0,16" value="0,16"/>
- <item caption="0,125" value="0,125"/>
- <item caption="0,1" value="0,1"/>
- <item caption="0,08" value="0,08"/>
- <item caption="0,05" value="0,05"/>
- <item caption="6/60" value="6/60"/>
- <item caption="3/60" value="3/60"/>
- <item caption="1/18" value="1/18"/>
- <item caption="1/24" value="1/24"/>
- <item caption="1/36" value="1/36"/>
- <item caption="1/60" value="1/60"/>
- <item caption="FGT" value="FGT"/>
- <item caption="HBV" value="HBV"/>
- <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>
- </frame>
- <frame layout="vbox">
- <label caption="ETDRS:"/>
- <combobox name="visus.optimal_korr.etdrs.left" value="Ikke udfyldt" type="search" script="not0">
- <item caption="Ikke udfyldt" value="Ikke udfyldt"/>
- <item caption="0" value="0"/>
- <item caption="1" value="1"/>
- <item caption="2" value="2"/>
- <item caption="3" value="3"/>
- <item caption="4" value="4"/>
- <item caption="5" value="5"/>
- <item caption="6" value="6"/>
- <item caption="7" value="7"/>
- <item caption="8" value="8"/>
- <item caption="9" value="9"/>
- <item caption="10" value="10"/>
- <item caption="11" value="11"/>
- <item caption="12" value="12"/>
- <item caption="13" value="13"/>
- <item caption="14" value="14"/>
- <item caption="15" value="15"/>
- <item caption="16" value="16"/>
- <item caption="17" value="17"/>
- <item caption="18" value="18"/>
- <item caption="19" value="19"/>
- <item caption="20" value="20"/>
- <item caption="21" value="21"/>
- <item caption="22" value="22"/>
- <item caption="23" value="23"/>
- <item caption="24" value="24"/>
- <item caption="25" value="25"/>
- <item caption="26" value="26"/>
- <item caption="27" value="27"/>
- <item caption="28" value="28"/>
- <item caption="29" value="29"/>
- <item caption="30" value="30"/>
- <item caption="31" value="31"/>
- <item caption="32" value="32"/>
- <item caption="33" value="33"/>
- <item caption="34" value="34"/>
- <item caption="35" value="35"/>
- <item caption="36" value="36"/>
- <item caption="37" value="37"/>
- <item caption="38" value="38"/>
- <item caption="39" value="39"/>
- <item caption="40" value="40"/>
- <item caption="41" value="41"/>
- <item caption="42" value="42"/>
- <item caption="43" value="43"/>
- <item caption="44" value="44"/>
- <item caption="45" value="45"/>
- <item caption="46" value="46"/>
- <item caption="47" value="47"/>
- <item caption="48" value="48"/>
- <item caption="49" value="49"/>
- <item caption="50" value="50"/>
- <item caption="51" value="51"/>
- <item caption="52" value="52"/>
- <item caption="53" value="53"/>
- <item caption="54" value="54"/>
- <item caption="55" value="55"/>
- <item caption="56" value="56"/>
- <item caption="57" value="57"/>
- <item caption="58" value="58"/>
- <item caption="59" value="59"/>
- <item caption="60" value="60"/>
- <item caption="61" value="61"/>
- <item caption="62" value="62"/>
- <item caption="63" value="63"/>
- <item caption="64" value="64"/>
- <item caption="65" value="65"/>
- <item caption="66" value="66"/>
- <item caption="67" value="67"/>
- <item caption="68" value="68"/>
- <item caption="69" value="69"/>
- <item caption="70" value="70"/>
- <item caption="71" value="71"/>
- <item caption="72" value="72"/>
- <item caption="73" value="73"/>
- <item caption="74" value="74"/>
- <item caption="75" value="75"/>
- <item caption="76" value="76"/>
- <item caption="77" value="77"/>
- <item caption="78" value="78"/>
- <item caption="79" value="79"/>
- <item caption="80" value="80"/>
- <item caption="81" value="81"/>
- <item caption="82" value="82"/>
- <item caption="83" value="83"/>
- <item caption="84" value="84"/>
- <item caption="85" value="85"/>
- <item caption="86" value="86"/>
- <item caption="87" value="87"/>
- <item caption="88" value="88"/>
- <item caption="89" value="89"/>
- <item caption="90" value="90"/>
- <item caption="91" value="91"/>
- <item caption="92" value="92"/>
- <item caption="93" value="93"/>
- <item caption="94" value="94"/>
- <item caption="95" value="95"/>
- <item caption="96" value="96"/>
- <item caption="97" value="97"/>
- <item caption="98" value="98"/>
- <item caption="99" value="99"/>
- <item caption="100" value="100"/>
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.manifest_refraktion.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.manifest_refraktion.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:"/>
+ <combobox name="visus.manifest_refraktion.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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.manifest_refraktion.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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
</frame>
<frame layout="vbox">
<frame layout="hbox">
<frame layout="vbox">
<label/>
- <label caption="Basis:"/>
- </frame>
- <frame layout="vbox">
- <label caption="Sf:"/>
- <lineedit name="visus.optimal_korr.basis.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
- </frame>
- <frame layout="vbox">
- <label caption="Cyl:"/>
- <lineedit name="visus.optimal_korr.basis.cyl.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
- </frame>
- <frame layout="vbox">
- <label caption="Grader:"/>
- <lineedit name="visus.optimal_korr.basis.grader.left" regexp="[\d]+" script="lt359gt0" value=""/>
- </frame>
- </frame>
- <frame layout="hbox">
- <frame layout="vbox">
- <label caption=""/>
- <label caption="Korr.:"/>
+ <label caption="Korr:"/>
</frame>
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="visus.optimal_korr.korr.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ <lineedit name="visus.manifest_refraktion.korr.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="visus.optimal_korr.korr.cyl.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ <lineedit name="visus.manifest_refraktion.korr.cyl.left" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="visus.optimal_korr.korr.grader.left" regexp="[\d]+" script="lt359gt0" value=""/>
+ <lineedit name="visus.manifest_refraktion.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
diff --git a/server/xml/macros/visus-ou-1.0.xml b/server/xml/macros/visus-ou-1.0.xml
new file mode 100644
index 0000000..d03607f
--- /dev/null
+++ b/server/xml/macros/visus-ou-1.0.xml
@@ -0,0 +1,287 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="visus-ou" version="1.0">
+ <resume language="lua">
+ out = ''
+ out = out .. 'Visus, o.u.'
+ if ( getValue('visus.ou.kontrast') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.ou.kontrast') .. ' kontrast'
+ end
+ if ( getValue('visus.ou.st_hul') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.ou.st_hul')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.ou.snellen') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.ou.snellen') .. '\n'
+ end
+ if ( getValue('visus.ou.etdrs') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.ou.etdrs') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.ou.korr.sf') .. ' sf'
+ if ( getValue('visus.ou.korr.cyl') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.ou.korr.cyl') .. ' cyl'
+ end
+ if ( getValue('visus.ou.korr.grader') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.ou.korr.grader') .. ' grader'
+ end
+
+ return out
+ </resume>
+ <queries>
+ </queries>
+ <maps>
+ </maps>
+ <scripts>
+ <script language="lua" name="lt20gt-25">
+ if(value == '')
+ then
+ return false
+ end
+
+ value = string.gsub(value, ',', '.')
+ if(tonumber(value) &gt;= -25 and tonumber(value) &lt;= 20)
+ then
+ return true
+ else
+ return false
+ end
+ </script>
+ <script language="lua" name="lt10gt-15">
+ if(value == '')
+ then
+ return true
+ end
+
+ value = string.gsub(value, ',', '.')
+ if(tonumber(value) &gt;= -15 and tonumber(value) &lt;= 10)
+ then
+ return true
+ else
+ return false
+ end
+ </script>
+ <script language="lua" name="lt359gt0">
+ if(value == '')
+ then
+ return true
+ end
+
+ value = string.gsub(value, ',', '.')
+ if(tonumber(value) &gt;= 0 and tonumber(value) &lt;= 359)
+ then
+ return true
+ else
+ return false
+ end
+ </script>
+ <script language="lua" name="snellen">
+ if (value == '')
+ then
+ if ( getValue('visus.ou.etdrs') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs">
+ if (value == '')
+ then
+ if ( getValue('visus.ou.snellen') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ </scripts>
+ <widgets caption="Visus - o.u."
+ layout="vbox">
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.ou.kontrast" 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.ou.st_hul" caption="Der er anvendt st. hul" truevalue="st. hul er anvendt" falsevalue=""/>
+ </frame>
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption="Snellen:"/>
+ <combobox name="visus.ou.snellen" layout="vbox" type="search" value="" script="snellen">
+ <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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.ou.etdrs" value="" type="search" script="etdrs">
+ <item caption="Ikke udfyldt" value=""/>
+ <item caption="0" value="0"/>
+ <item caption="1" value="1"/>
+ <item caption="2" value="2"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
+ </frame>
+ <frame layout="vbox">
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label/>
+ <label caption="Korr:"/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Sf:"/>
+ <lineedit name="visus.ou.korr.sf" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Cyl:"/>
+ <lineedit name="visus.ou.korr.cyl" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Grader:"/>
+ <lineedit name="visus.ou.korr.grader" regexp="|[\d]+" script="lt359gt0" value=""/>
+ </frame>
+ </frame>
+ </frame>
+
+ <!-- Knapper -->
+ <frame layout="hbox">
+ <spacer />
+ <button caption="Gem" action="commit"/>
+ </frame>
+ </widgets>
+</macro>
diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
new file mode 100644
index 0000000..5bf0853
--- /dev/null
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -0,0 +1,676 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<macro name="visus-template" version="1.0">
+<!--
+ Info ved oprettelse af ny visus macro hvor denne kopieres.
+ query-replace på .navn1. til .navn2.
+ skift overskrift for begge øjne i resumeet (navn1->navn2)
+ skift GUI overskrift for macroen under widgets afsnittet
+ fjern resume felter der ikke skal bruges
+ fjern tilsvarende GUI felter der ikke skal bruges
+ -->
+ <resume language="lua">
+ out = ''
+ if ( getValue('visus.template.missing.right') == '' )
+ then
+ out = out .. 'Visus, template, o.dxt'
+ if ( getValue('visus.template.kontrast.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.kontrast.right') .. ' kontrast'
+ end
+ if ( getValue('visus.template.st_hul.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.st_hul.right')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.template.snellen.right') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.template.snellen.right') .. '\n'
+ end
+ if ( getValue('visus.template.etdrs.right') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.template.etdrs.right') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.template.korr.sf.right') .. ' sf'
+ if ( getValue('visus.template.korr.cyl.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.korr.cyl.right') .. ' cyl'
+ end
+ if ( getValue('visus.template.korr.grader.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.korr.grader.right') .. ' grader'
+ end
+ out = out .. '\n'
+
+ out = out .. 'Add korr.: ' .. getValue('visus.template.add.sf.right') .. ' sf'
+ if ( getValue('visus.template.add.cyl.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.add.cyl.right') .. ' cyl'
+ end
+ if ( getValue('visus.template.add.grader.right') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.add.grader.right') .. ' grader'
+ end
+ out = out .. '\n'
+ if ( getValue('visus.template.missing.left') == '' )
+ then
+ out = out .. '\n'
+ end
+ end
+
+ if ( getValue('visus.template.missing.left') == '' )
+ then
+ out = out .. 'Visus, template, o.sin'
+ if ( getValue('visus.template.kontrast.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.kontrast.left') .. ' kontrast'
+ end
+ if ( getValue('visus.template.st_hul.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.st_hul.left')
+ end
+ out = out .. ':\n'
+ if ( getValue('visus.template.snellen.left') ~= '' )
+ then
+ out = out .. 'Snellen: ' .. getValue('visus.template.snellen.left') .. '\n'
+ end
+ if ( getValue('visus.template.etdrs.left') ~= '' )
+ then
+ out = out .. 'ETDRS: ' .. getValue('visus.template.etdrs.left') .. '\n'
+ end
+ out = out .. 'Korr.: ' .. getValue('visus.template.korr.sf.left') .. ' sf'
+ if ( getValue('visus.template.korr.cyl.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.korr.cyl.left') .. ' cyl'
+ end
+ if ( getValue('visus.template.korr.grader.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.korr.grader.left') .. ' grader'
+ end
+ out = out .. '\n'
+
+ out = out .. 'Add korr.: ' .. getValue('visus.template.add.sf.left') .. ' sf'
+ if ( getValue('visus.template.add.cyl.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.add.cyl.left') .. ' cyl'
+ end
+ if ( getValue('visus.template.add.grader.left') ~= '' )
+ then
+ out = out .. ', ' .. getValue('visus.template.add.grader.left') .. ' grader'
+ end
+ out = out .. '\n'
+ if ( getValue('visus.template.missing.left') == '' )
+ then
+ out = out .. '\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"/>
+ </queries>
+ <maps>
+ <map name="missing_eye_right_map">
+ value = 0
+ timestamp = 0
+ source = ''
+
+ if( missing_eye_right )
+ then
+ if( missing_eye_right.value and missing_eye_right.value == '' )
+ then
+ value = ''
+ timestamp = missing_eye_right.timestamp
+ source = missing_eye_right.source
+ else
+ value = 'mangler'
+ timestamp = missing_eye_right.timestamp
+ source = missing_eye_right.source
+ end
+ end
+ return value, timestamp, source
+ </map>
+ <map name="missing_eye_left_map">
+ value = 0
+ timestamp = 0
+ source = ''
+
+ if( missing_eye_left )
+ then
+ if( missing_eye_left.value and missing_eye_left.value == '' )
+ then
+ value = ''
+ timestamp = missing_eye_left.timestamp
+ source = missing_eye_left.source
+ else
+ value = 'mangler'
+ timestamp = missing_eye_left.timestamp
+ source = missing_eye_left.source
+ end
+ end
+ return value, timestamp, source
+ </map>
+ </maps>
+ <scripts>
+ <script language="lua" name="lt20gt-25">
+ if(value == '')
+ then
+ return false
+ end
+
+ value = string.gsub(value, ',', '.')
+ if(tonumber(value) &gt;= -25 and tonumber(value) &lt;= 20)
+ then
+ return true
+ else
+ return false
+ end
+ </script>
+ <script language="lua" name="lt10gt-15">
+ if(value == '')
+ then
+ return true
+ end
+
+ value = string.gsub(value, ',', '.')
+ if(tonumber(value) &gt;= -15 and tonumber(value) &lt;= 10)
+ then
+ return true
+ else
+ return false
+ end
+ </script>
+ <script language="lua" name="lt359gt0">
+ if(value == '')
+ then
+ return true
+ end
+
+ value = string.gsub(value, ',', '.')
+ if(tonumber(value) &gt;= 0 and tonumber(value) &lt;= 359)
+ then
+ return true
+ else
+ return false
+ end
+ </script>
+ <script language="lua" name="snellen.right">
+ if (value == '')
+ then
+ if ( getValue('visus.template.etdrs.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="snellen.left">
+ if (value == '')
+ then
+ if ( getValue('visus.template.etdrs.left') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.right">
+ if (value == '')
+ then
+ if ( getValue('visus.template.snellen.right') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="etdrs.left">
+ if (value == '')
+ then
+ if ( getValue('visus.template.snellen.left') == '' )
+ then
+ return false
+ end
+ end
+ return true
+ </script>
+ <script language="lua" name="right_eye">
+ if ( value == 'mangler' )
+ then
+ disable('right_eye_frame')
+ else
+ enable('right_eye_frame')
+ end
+ return true
+ </script>
+ <script language="lua" name="left_eye">
+ if ( value == 'mangler' )
+ then
+ disable('left_eye_frame')
+ else
+ enable('left_eye_frame')
+ end
+ return true
+ </script>
+ </scripts>
+ <widgets caption="Visus - manifest refraktion"
+ layout="vbox">
+
+ <frame layout="hbox">
+
+ <!-- Højre øje -->
+ <frame layout="vbox">
+ <checkbox caption="Der er ikke målt på højre øje"
+ name="visus.template.missing.right" script="right_eye"
+ map="missing_eye_right_map"
+ truevalue="mangler" falsevalue="" value=""/>
+ <frame name="right_eye_frame" caption="Højre øje" layout="vbox">
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.template.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.template.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:"/>
+ <combobox name="visus.template.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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.template.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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
+ </frame>
+ <frame layout="vbox">
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label/>
+ <label caption="Korr:"/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Sf:"/>
+ <lineedit name="visus.template.korr.sf.right" 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.right" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Grader:"/>
+ <lineedit name="visus.template.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
+ </frame>
+ </frame>
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption=""/>
+ <label caption="Add:"/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Sf:"/>
+ <lineedit name="visus.template.add.sf.right" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Cyl:"/>
+ <lineedit name="visus.template.add.cyl.right" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Grader:"/>
+ <lineedit name="visus.template.add.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/>
+ </frame>
+ </frame>
+ </frame>
+ </frame>
+ </frame>
+
+ <!-- Venstre øje -->
+ <frame layout="vbox">
+ <checkbox caption="Der er ikke målt på venstre øje"
+ name="visus.template.missing.left" script="left_eye"
+ map="missing_eye_left_map"
+ truevalue="mangler" falsevalue="" value=""/>
+ <frame name="left_eye_frame" caption="Venstre øje" layout="vbox">
+ <frame layout="hbox">
+ <label caption="Kontrast:"/>
+ <combobox name="visus.template.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.template.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:"/>
+ <combobox name="visus.template.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"/>
+ <item caption="1,0" value="1,0"/>
+ <item caption="0,8" value="0,8"/>
+ <item caption="0,67" value="0,67"/>
+ <item caption="0,5" value="0,5"/>
+ <item caption="0,4" value="0,4"/>
+ <item caption="0,32" value="0,32"/>
+ <item caption="0,25" value="0,25"/>
+ <item caption="0,2" value="0,2"/>
+ <item caption="0,16" value="0,16"/>
+ <item caption="0,125" value="0,125"/>
+ <item caption="0,1" value="0,1"/>
+ <item caption="0,08" value="0,08"/>
+ <item caption="0,05" value="0,05"/>
+ <item caption="6/60" value="6/60"/>
+ <item caption="3/60" value="3/60"/>
+ <item caption="1/18" value="1/18"/>
+ <item caption="1/24" value="1/24"/>
+ <item caption="1/36" value="1/36"/>
+ <item caption="1/60" value="1/60"/>
+ <item caption="FGT" value="FGT"/>
+ <item caption="HBV" value="HBV"/>
+ <item caption="+L+P" value="+L+P"/>
+ <item caption="+L-P" value="+L-P"/>
+ <item caption="-L" value="-L"/>
+ </combobox>
+ </frame>
+ <frame layout="vbox">
+ <label caption="ETDRS:"/>
+ <combobox name="visus.template.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"/>
+ <item caption="3" value="3"/>
+ <item caption="4" value="4"/>
+ <item caption="5" value="5"/>
+ <item caption="6" value="6"/>
+ <item caption="7" value="7"/>
+ <item caption="8" value="8"/>
+ <item caption="9" value="9"/>
+ <item caption="10" value="10"/>
+ <item caption="11" value="11"/>
+ <item caption="12" value="12"/>
+ <item caption="13" value="13"/>
+ <item caption="14" value="14"/>
+ <item caption="15" value="15"/>
+ <item caption="16" value="16"/>
+ <item caption="17" value="17"/>
+ <item caption="18" value="18"/>
+ <item caption="19" value="19"/>
+ <item caption="20" value="20"/>
+ <item caption="21" value="21"/>
+ <item caption="22" value="22"/>
+ <item caption="23" value="23"/>
+ <item caption="24" value="24"/>
+ <item caption="25" value="25"/>
+ <item caption="26" value="26"/>
+ <item caption="27" value="27"/>
+ <item caption="28" value="28"/>
+ <item caption="29" value="29"/>
+ <item caption="30" value="30"/>
+ <item caption="31" value="31"/>
+ <item caption="32" value="32"/>
+ <item caption="33" value="33"/>
+ <item caption="34" value="34"/>
+ <item caption="35" value="35"/>
+ <item caption="36" value="36"/>
+ <item caption="37" value="37"/>
+ <item caption="38" value="38"/>
+ <item caption="39" value="39"/>
+ <item caption="40" value="40"/>
+ <item caption="41" value="41"/>
+ <item caption="42" value="42"/>
+ <item caption="43" value="43"/>
+ <item caption="44" value="44"/>
+ <item caption="45" value="45"/>
+ <item caption="46" value="46"/>
+ <item caption="47" value="47"/>
+ <item caption="48" value="48"/>
+ <item caption="49" value="49"/>
+ <item caption="50" value="50"/>
+ <item caption="51" value="51"/>
+ <item caption="52" value="52"/>
+ <item caption="53" value="53"/>
+ <item caption="54" value="54"/>
+ <item caption="55" value="55"/>
+ <item caption="56" value="56"/>
+ <item caption="57" value="57"/>
+ <item caption="58" value="58"/>
+ <item caption="59" value="59"/>
+ <item caption="60" value="60"/>
+ <item caption="61" value="61"/>
+ <item caption="62" value="62"/>
+ <item caption="63" value="63"/>
+ <item caption="64" value="64"/>
+ <item caption="65" value="65"/>
+ <item caption="66" value="66"/>
+ <item caption="67" value="67"/>
+ <item caption="68" value="68"/>
+ <item caption="69" value="69"/>
+ <item caption="70" value="70"/>
+ <item caption="71" value="71"/>
+ <item caption="72" value="72"/>
+ <item caption="73" value="73"/>
+ <item caption="74" value="74"/>
+ <item caption="75" value="75"/>
+ <item caption="76" value="76"/>
+ <item caption="77" value="77"/>
+ <item caption="78" value="78"/>
+ <item caption="79" value="79"/>
+ <item caption="80" value="80"/>
+ <item caption="81" value="81"/>
+ <item caption="82" value="82"/>
+ <item caption="83" value="83"/>
+ <item caption="84" value="84"/>
+ <item caption="85" value="85"/>
+ <item caption="86" value="86"/>
+ <item caption="87" value="87"/>
+ <item caption="88" value="88"/>
+ <item caption="89" value="89"/>
+ <item caption="90" value="90"/>
+ <item caption="91" value="91"/>
+ <item caption="92" value="92"/>
+ <item caption="93" value="93"/>
+ <item caption="94" value="94"/>
+ <item caption="95" value="95"/>
+ <item caption="96" value="96"/>
+ <item caption="97" value="97"/>
+ <item caption="98" value="98"/>
+ <item caption="99" value="99"/>
+ <item caption="100" value="100"/>
+ </combobox>
+ </frame>
+ </frame>
+ <frame layout="vbox">
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label/>
+ <label caption="Korr:"/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Sf:"/>
+ <lineedit name="visus.template.korr.sf.left" 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.left" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Grader:"/>
+ <lineedit name="visus.template.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
+ </frame>
+ </frame>
+ <frame layout="hbox">
+ <frame layout="vbox">
+ <label caption=""/>
+ <label caption="Add:"/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Sf:"/>
+ <lineedit name="visus.template.add.sf.left" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Cyl:"/>
+ <lineedit name="visus.template.add.cyl.left" regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
+ </frame>
+ <frame layout="vbox">
+ <label caption="Grader:"/>
+ <lineedit name="visus.template.add.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/>
+ </frame>
+ </frame>
+ </frame>
+ </frame>
+ </frame>
+
+ </frame>
+
+ <!-- Knapper -->
+ <frame layout="hbox">
+ <spacer />
+ <button caption="Gem" action="commit"/>
+ </frame>
+ </widgets>
+</macro>
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>