diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/xml/macros/autorefraktion-1.0.xml | 52 | ||||
| -rw-r--r-- | server/xml/macros/cycloplegisk_refraktion-1.0.xml | 53 | ||||
| -rw-r--r-- | server/xml/macros/egen_brille-1.0.xml | 44 | ||||
| -rw-r--r-- | server/xml/macros/manifest_refraktion-1.0.xml | 41 | ||||
| -rw-r--r-- | server/xml/macros/visus-egen_korr-1.0.xml | 649 | ||||
| -rw-r--r-- | server/xml/macros/visus-manifest_refraktion-1.0.xml | 649 | ||||
| -rw-r--r-- | server/xml/macros/visus-template-1.0.xml | 3 | ||||
| -rw-r--r-- | server/xml/macros/visus-uden_korr-1.0.xml | 659 | ||||
| -rw-r--r-- | server/xml/templates/ref_efterkontrol.xml | 3 | ||||
| -rw-r--r-- | server/xml/templates/ref_forunders.xml | 3 |
10 files changed, 2023 insertions, 133 deletions
diff --git a/server/xml/macros/autorefraktion-1.0.xml b/server/xml/macros/autorefraktion-1.0.xml index 54fd5bb..706300e 100644 --- a/server/xml/macros/autorefraktion-1.0.xml +++ b/server/xml/macros/autorefraktion-1.0.xml @@ -1,31 +1,35 @@ <?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. - --> -<!-- - 20090402: Bent Bisballe Nyeng - 'missing eye' tilføjet. - --> <macro name="autorefraktion" version="1.0"> <resume language="lua"> out = '' if ( getValue('autorefractor.right.missing') == '' ) then - out = out .. 'Autorefraktion højre øje: ' .. getValue('autorefractor.right.sphere') - .. ' sf, ' .. getValue('autorefractor.right.cyl') - .. ' cyl ' .. getValue('autorefractor.right.axis') .. ' grader.\n' + out = out .. 'Autorefraktion, o.dxt: ' .. getValue('autorefractor.right.sphere') .. ' sf' + if ( getValue('autorefractor.right.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.right.cyl') .. ' cyl' + end + if ( getValue('autorefractor.right.axis') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.right.axis') .. ' grader\n' + else + out = out .. '\n' + end end if ( getValue('autorefractor.left.missing') == '' ) then - out = out .. 'Autorefraktion venstre øje: ' .. getValue('autorefractor.left.sphere') - .. ' sf, ' .. getValue('autorefractor.left.cyl') - .. ' cyl ' .. getValue('autorefractor.left.axis') .. ' grader.\n' + out = out .. 'Autorefraktion, o.sin: ' .. getValue('autorefractor.left.sphere') .. ' sf' + if ( getValue('autorefractor.left.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.left.cyl') .. ' cyl' + end + if ( getValue('autorefractor.left.axis') ~= '' ) + then + out = out .. ', ' .. getValue('autorefractor.left.axis') .. ' grader\n' + else + out = out .. '\n' + end end return out @@ -94,7 +98,7 @@ <script language="lua" name="lt10gt-15"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -108,7 +112,7 @@ <script language="lua" name="lt359gt0"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -159,12 +163,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="autorefractor.right.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="autorefractor.right.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> @@ -186,12 +190,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="autorefractor.left.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="autorefractor.left.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml index eaa333a..523aa18 100644 --- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml +++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml @@ -1,32 +1,35 @@ <?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="cycloplegisk_refraktion" version="1.0"> <resume language="lua"> out = '' - out = out .. 'Cycloplegisk refraktion:\n' if ( getValue('cycloplegisk_refraktion.right.missing') == '' ) then - out = out .. 'Højre øje: ' .. getValue('cycloplegisk_refraktion.right.sf') - .. ' sf, ' .. getValue('cycloplegisk_refraktion.right.cyl') .. ' x ' - .. getValue('cycloplegisk_refraktion.right.grader') .. '\n' + out = out .. 'Cycloplegisk refraktion, o.dxt: ' .. getValue('cycloplegisk_refraktion.right.sf') .. ' sf' + if ( getValue('cycloplegisk_refraktion.right.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('cycloplegisk_refraktion.right.cyl') .. ' cyl' + end + if ( getValue('cycloplegisk_refraktion.right.grader') ~= '' ) + then + out = out .. ', ' .. getValue('cycloplegisk_refraktion.right.grader') .. ' grader\n' + else + out = out .. '\n' + end end if ( getValue('cycloplegisk_refraktion.left.missing') == '' ) then - out = out .. 'Venstre øje: ' .. getValue('cycloplegisk_refraktion.left.sf') - .. ' sf, ' .. getValue('cycloplegisk_refraktion.left.cyl') .. ' x ' - .. getValue('cycloplegisk_refraktion.left.grader') .. '\n' + out = out .. 'Cycloplegisk refraktion, o.sin: ' .. getValue('cycloplegisk_refraktion.left.sf') .. ' sf' + if ( getValue('cycloplegisk_refraktion.left.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('cycloplegisk_refraktion.left.cyl') .. ' cyl' + end + if ( getValue('cycloplegisk_refraktion.left.grader') ~= '' ) + then + out = out .. ', ' .. getValue('cycloplegisk_refraktion.left.grader') .. ' grader\n' + else + out = out .. '\n' + end end return out @@ -92,7 +95,7 @@ <script language="lua" name="lt10gt-15"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -106,7 +109,7 @@ <script language="lua" name="lt359gt0"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -157,12 +160,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="cycloplegisk_refraktion.right.cyl" map="cycloplegisk_refraktion.right.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="cycloplegisk_refraktion.right.grader" map="cycloplegisk_refraktion.right.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> @@ -183,12 +186,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="cycloplegisk_refraktion.left.cyl" map="cycloplegisk_refraktion.left.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="cycloplegisk_refraktion.left.grader" map="cycloplegisk_refraktion.left.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml index a917dff..7db6bce 100644 --- a/server/xml/macros/egen_brille-1.0.xml +++ b/server/xml/macros/egen_brille-1.0.xml @@ -4,20 +4,32 @@ out = '' if ( getValue('lensmeter.right.missing') == '' ) then - 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 + out = out .. 'Egen brille, o.dxt: ' .. getValue('lensmeter.right.sf') .. ' sf' + if ( getValue('lensmeter.right.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('lensmeter.right.cyl') .. ' cyl' + end + if ( getValue('lensmeter.right.grader') ~= '' ) + then + out = out .. ', ' .. getValue('lensmeter.right.grader') .. ' grader\n' + else + out = out .. '\n' + end end if ( getValue('lensmeter.left.missing') == '' ) then - out = out .. 'Egen brille venstre øje: ' .. getValue('lensmeter.left.sf') - .. ' sf, ' .. getValue('lensmeter.left.cyl') .. ' cyl ' - .. getValue('lensmeter.left.grader') .. ' grader.' + out = out .. 'Egen brille, o.sin: ' .. getValue('lensmeter.left.sf') .. ' sf' + if ( getValue('lensmeter.left.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('lensmeter.left.cyl') .. ' cyl' + end + if ( getValue('lensmeter.left.grader') ~= '' ) + then + out = out .. ', ' .. getValue('lensmeter.left.grader') .. ' grader\n' + else + out = out .. '\n' + end end return out @@ -151,7 +163,7 @@ <script language="lua" name="lt10gt-15"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -165,7 +177,7 @@ <script language="lua" name="lt359gt0"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -216,12 +228,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="lensmeter.right.cyl" map="lensmeter.right.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="lensmeter.right.grader" map="lensmeter.right.grader" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> @@ -242,12 +254,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="lensmeter.left.cyl" map="lensmeter.left.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="lensmeter.left.grader" map="lensmeter.left.grader" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> diff --git a/server/xml/macros/manifest_refraktion-1.0.xml b/server/xml/macros/manifest_refraktion-1.0.xml index ba1216a..10afe07 100644 --- a/server/xml/macros/manifest_refraktion-1.0.xml +++ b/server/xml/macros/manifest_refraktion-1.0.xml @@ -2,19 +2,34 @@ <macro name="manifest_refraktion" version="1.0"> <resume language="lua"> out = '' - out = out .. 'Manifest refraktion:\n' if ( getValue('manifest_refraktion.right.missing') == '' ) then - out = out .. 'Højre øje: ' .. getValue('manifest_refraktion.right.sf') - .. ' sf, ' .. getValue('manifest_refraktion.right.cyl') .. ' x ' - .. getValue('manifest_refraktion.right.grader') .. '\n' + out = out .. 'Manifest refraktion, o.dxt: ' .. getValue('manifest_refraktion.right.sf') .. ' sf' + if ( getValue('manifest_refraktion.right.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.right.cyl') .. ' cyl' + end + if ( getValue('manifest_refraktion.right.grader') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.right.grader') .. ' grader\n' + else + out = out .. '\n' + end end if ( getValue('manifest_refraktion.left.missing') == '' ) then - out = out .. 'Venstre øje: ' .. getValue('manifest_refraktion.left.sf') - .. ' sf, ' .. getValue('manifest_refraktion.left.cyl') .. ' x ' - .. getValue('manifest_refraktion.left.grader') .. '\n' + out = out .. 'Manifest refraktion, o.sin: ' .. getValue('manifest_refraktion.left.sf') .. ' sf' + if ( getValue('manifest_refraktion.left.cyl') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.left.cyl') .. ' cyl' + end + if ( getValue('manifest_refraktion.left.grader') ~= '' ) + then + out = out .. ', ' .. getValue('manifest_refraktion.left.grader') .. ' grader\n' + else + out = out .. '\n' + end end return out @@ -80,7 +95,7 @@ <script language="lua" name="lt10gt-15"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -94,7 +109,7 @@ <script language="lua" name="lt359gt0"> if(value == '') then - return false + return true end value = string.gsub(value, ',', '.') @@ -153,12 +168,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="manifest_refraktion.right.cyl" map="manifest_refraktion.right.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="manifest_refraktion.right.grader" map="manifest_refraktion.right.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> </frame> @@ -181,12 +196,12 @@ <frame layout="vbox"> <label caption="Cyl:"/> <lineedit name="manifest_refraktion.left.cyl" map="manifest_refraktion.left.cyl" - regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> + regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/> </frame> <frame layout="vbox"> <label caption="Grader:"/> <lineedit name="manifest_refraktion.left.grader" map="manifest_refraktion.left.axis" - regexp="[\d]+" script="lt359gt0" value=""/> + 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 bbdd5ca..5256b07 100644 --- a/server/xml/macros/visus-egen_korr-1.0.xml +++ b/server/xml/macros/visus-egen_korr-1.0.xml @@ -9,10 +9,6 @@ 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 @@ -32,13 +28,32 @@ out = out .. ', ' .. getValue('visus.egen_korr.korr.grader.right') .. ' grader' end out = out .. '\n' - + if ( getValue('visus.egen_korr.st_hul.right') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.egen_korr.st_hul.snellen.right') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.egen_korr.st_hul.snellen.right') .. '\n' + end + if ( getValue('visus.egen_korr.st_hul.etdrs.right') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.st_hul.etdrs.right') .. '\n' + end + end if ( getValue('visus.egen_korr.missing.left') == '' ) then out = out .. '\n' end end + + + + + + + + if ( getValue('visus.egen_korr.missing.left') == '' ) then out = out .. 'Visus, egen korr., o.sin' @@ -46,10 +61,6 @@ 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 @@ -69,13 +80,51 @@ out = out .. ', ' .. getValue('visus.egen_korr.korr.grader.left') .. ' grader' end out = out .. '\n' - + if ( getValue('visus.egen_korr.st_hul.left') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.egen_korr.st_hul.snellen.left') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.egen_korr.st_hul.snellen.left') .. '\n' + end + if ( getValue('visus.egen_korr.st_hul.etdrs.left') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.st_hul.etdrs.left') .. '\n' + end + end if ( getValue('visus.egen_korr.missing.left') == '' ) then out = out .. '\n' end end + + + + + + + + + + if ( getValue('visus.egen_korr.ou') ~= '' ) + then + out = out .. 'Visus, egen korr., o.u' + if ( getValue('visus.egen_korr.kontrast.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.egen_korr.kontrast.ou') .. ' kontrast' + end + out = out .. ':\n' + if ( getValue('visus.egen_korr.snellen.ou') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.egen_korr.snellen.ou') .. '\n' + end + if ( getValue('visus.egen_korr.etdrs.ou') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.egen_korr.etdrs.ou') .. '\n' + end + end + return out </resume> <queries> @@ -207,6 +256,93 @@ end return true </script> + <script language="lua" name="st_hul.snellen.right"> + if (value == '') + then + if ( getValue('visus.egen_korr.st_hul.etdrs.right') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.snellen.left"> + if (value == '') + then + if ( getValue('visus.egen_korr.st_hul.etdrs.left') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.etdrs.right"> + if (value == '') + then + if ( getValue('visus.egen_korr.st_hul.snellen.right') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.etdrs.left"> + if (value == '') + then + if ( getValue('visus.egen_korr.st_hul.snellen.left') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="etdrs.ou"> + if (value == '') + then + if ( getValue('visus.egen_korr.snellen.ou') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="snellen.ou"> + if (value == '') + then + if ( getValue('visus.egen_korr.etdrs.ou') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul_check.right"> + if (value == '') + then + disable('st_hul_frame.right') + else + enable('st_hul_frame.right') + end + return true + </script> + <script language="lua" name="st_hul_check.left"> + if (value == '') + then + disable('st_hul_frame.left') + else + enable('st_hul_frame.left') + end + return true + </script> + <script language="lua" name="st_hul_check.ou"> + if (value == '') + then + disable('st_hul_frame.ou') + else + enable('st_hul_frame.ou') + end + return true + </script> <script language="lua" name="right_eye"> if ( value == 'mangler' ) then @@ -225,6 +361,15 @@ end return true </script> + <script language="lua" name="ou"> + if ( value == '' ) + then + disable('ou_frame') + else + enable('ou_frame') + end + return true + </script> </scripts> <widgets caption="Visus - egen korrektion" layout="vbox"> @@ -249,9 +394,6 @@ <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"> @@ -412,6 +554,151 @@ <lineedit name="visus.egen_korr.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> + <frame layout="hbox"> + <checkbox name="visus.egen_korr.st_hul.right" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.right"/> + </frame> + <frame layout="hbox" name="st_hul_frame.right"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.egen_korr.st_hul.snellen.right" layout="vbox" type="search" value="" script="st_hul.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.st_hul.etdrs.right" value="" type="search" script="st_hul.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> </frame> </frame> @@ -434,9 +721,6 @@ <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"> @@ -597,12 +881,345 @@ <lineedit name="visus.egen_korr.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> + <frame layout="hbox"> + <checkbox name="visus.egen_korr.st_hul.left" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.left"/> + </frame> + <frame layout="hbox" name="st_hul_frame.left"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.egen_korr.st_hul.snellen.left" layout="vbox" type="search" value="" script="st_hul.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.st_hul.etdrs.left" value="" type="search" script="st_hul.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> </frame> </frame> </frame> + <!-- Begge øjne --> + <frame layout="hbox"> + <spacer/> + <frame layout="vbox"> + <checkbox caption="Aktiver o.u. måling" + name="visus.egen_korr.ou" script="ou" + truevalue="ou" falsevalue="" value=""/> + <frame name="ou_frame" caption="o.u." layout="vbox"> + <frame layout="hbox"> + <label caption="Kontrast:"/> + <combobox name="visus.egen_korr.kontrast.ou" 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"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.egen_korr.snellen.ou" layout="vbox" type="search" value="" script="snellen.ou"> + <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.ou" value="" type="search" script="etdrs.ou"> + <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.egen_korr.korr.sf.ou" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> + </frame> + <frame layout="vbox"> + <label caption="Cyl:"/> + <lineedit name="visus.egen_korr.korr.cyl.ou" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/> + </frame> + <frame layout="vbox"> + <label caption="Grader:"/> + <lineedit name="visus.egen_korr.korr.grader.ou" regexp="|[\d]+" script="lt359gt0" value=""/> + </frame> + </frame> + </frame> + --> + </frame> + </frame> + <spacer/> + </frame> + <!-- Knapper --> <frame layout="hbox"> <spacer /> diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml index 3747fb5..a2c16fc 100644 --- a/server/xml/macros/visus-manifest_refraktion-1.0.xml +++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml @@ -9,10 +9,6 @@ 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 @@ -32,13 +28,32 @@ out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.grader.right') .. ' grader' end out = out .. '\n' - + if ( getValue('visus.manifest_refraktion.st_hul.right') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.manifest_refraktion.st_hul.snellen.right') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.st_hul.snellen.right') .. '\n' + end + if ( getValue('visus.manifest_refraktion.st_hul.etdrs.right') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.st_hul.etdrs.right') .. '\n' + end + end if ( getValue('visus.manifest_refraktion.missing.left') == '' ) then out = out .. '\n' end end + + + + + + + + if ( getValue('visus.manifest_refraktion.missing.left') == '' ) then out = out .. 'Visus, manifest refraktion, o.sin' @@ -46,10 +61,6 @@ 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 @@ -69,13 +80,51 @@ out = out .. ', ' .. getValue('visus.manifest_refraktion.korr.grader.left') .. ' grader' end out = out .. '\n' - + if ( getValue('visus.manifest_refraktion.st_hul.left') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.manifest_refraktion.st_hul.snellen.left') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.st_hul.snellen.left') .. '\n' + end + if ( getValue('visus.manifest_refraktion.st_hul.etdrs.left') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.st_hul.etdrs.left') .. '\n' + end + end if ( getValue('visus.manifest_refraktion.missing.left') == '' ) then out = out .. '\n' end end + + + + + + + + + + if ( getValue('visus.manifest_refraktion.ou') ~= '' ) + then + out = out .. 'Visus, manifest refraktion, o.u' + if ( getValue('visus.manifest_refraktion.kontrast.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.manifest_refraktion.kontrast.ou') .. ' kontrast' + end + out = out .. ':\n' + if ( getValue('visus.manifest_refraktion.snellen.ou') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.manifest_refraktion.snellen.ou') .. '\n' + end + if ( getValue('visus.manifest_refraktion.etdrs.ou') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.manifest_refraktion.etdrs.ou') .. '\n' + end + end + return out </resume> <queries> @@ -207,6 +256,93 @@ end return true </script> + <script language="lua" name="st_hul.snellen.right"> + if (value == '') + then + if ( getValue('visus.manifest_refraktion.st_hul.etdrs.right') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.snellen.left"> + if (value == '') + then + if ( getValue('visus.manifest_refraktion.st_hul.etdrs.left') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.etdrs.right"> + if (value == '') + then + if ( getValue('visus.manifest_refraktion.st_hul.snellen.right') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.etdrs.left"> + if (value == '') + then + if ( getValue('visus.manifest_refraktion.st_hul.snellen.left') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="etdrs.ou"> + if (value == '') + then + if ( getValue('visus.manifest_refraktion.snellen.ou') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="snellen.ou"> + if (value == '') + then + if ( getValue('visus.manifest_refraktion.etdrs.ou') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul_check.right"> + if (value == '') + then + disable('st_hul_frame.right') + else + enable('st_hul_frame.right') + end + return true + </script> + <script language="lua" name="st_hul_check.left"> + if (value == '') + then + disable('st_hul_frame.left') + else + enable('st_hul_frame.left') + end + return true + </script> + <script language="lua" name="st_hul_check.ou"> + if (value == '') + then + disable('st_hul_frame.ou') + else + enable('st_hul_frame.ou') + end + return true + </script> <script language="lua" name="right_eye"> if ( value == 'mangler' ) then @@ -225,6 +361,15 @@ end return true </script> + <script language="lua" name="ou"> + if ( value == '' ) + then + disable('ou_frame') + else + enable('ou_frame') + end + return true + </script> </scripts> <widgets caption="Visus - manifest refraktion" layout="vbox"> @@ -249,9 +394,6 @@ <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"> @@ -412,6 +554,151 @@ <lineedit name="visus.manifest_refraktion.korr.grader.right" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> + <frame layout="hbox"> + <checkbox name="visus.manifest_refraktion.st_hul.right" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.right"/> + </frame> + <frame layout="hbox" name="st_hul_frame.right"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.manifest_refraktion.st_hul.snellen.right" layout="vbox" type="search" value="" script="st_hul.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.st_hul.etdrs.right" value="" type="search" script="st_hul.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> </frame> </frame> @@ -434,9 +721,6 @@ <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"> @@ -597,12 +881,345 @@ <lineedit name="visus.manifest_refraktion.korr.grader.left" regexp="|[\d]+" script="lt359gt0" value=""/> </frame> </frame> + <frame layout="hbox"> + <checkbox name="visus.manifest_refraktion.st_hul.left" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.left"/> + </frame> + <frame layout="hbox" name="st_hul_frame.left"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.manifest_refraktion.st_hul.snellen.left" layout="vbox" type="search" value="" script="st_hul.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.st_hul.etdrs.left" value="" type="search" script="st_hul.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> </frame> </frame> </frame> + <!-- Begge øjne --> + <frame layout="hbox"> + <spacer/> + <frame layout="vbox"> + <checkbox caption="Aktiver o.u. måling" + name="visus.manifest_refraktion.ou" script="ou" + truevalue="ou" falsevalue="" value=""/> + <frame name="ou_frame" caption="o.u." layout="vbox"> + <frame layout="hbox"> + <label caption="Kontrast:"/> + <combobox name="visus.manifest_refraktion.kontrast.ou" 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"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.manifest_refraktion.snellen.ou" layout="vbox" type="search" value="" script="snellen.ou"> + <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.ou" value="" type="search" script="etdrs.ou"> + <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.manifest_refraktion.korr.sf.ou" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> + </frame> + <frame layout="vbox"> + <label caption="Cyl:"/> + <lineedit name="visus.manifest_refraktion.korr.cyl.ou" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/> + </frame> + <frame layout="vbox"> + <label caption="Grader:"/> + <lineedit name="visus.manifest_refraktion.korr.grader.ou" regexp="|[\d]+" script="lt359gt0" value=""/> + </frame> + </frame> + </frame> + --> + </frame> + </frame> + <spacer/> + </frame> + <!-- Knapper --> <frame layout="hbox"> <spacer /> diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml index 10a45a1..57fb8d5 100644 --- a/server/xml/macros/visus-template-1.0.xml +++ b/server/xml/macros/visus-template-1.0.xml @@ -3,7 +3,8 @@ <!-- 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 macro navnet under macro tagget helt i toppen + skift overskrift for begge øjne + ou 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 diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml index 56380f3..9d450e6 100644 --- a/server/xml/macros/visus-uden_korr-1.0.xml +++ b/server/xml/macros/visus-uden_korr-1.0.xml @@ -9,18 +9,26 @@ 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' + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.right') .. '\n' end if ( getValue('visus.uden_korr.etdrs.right') ~= '' ) then - out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.right') .. ' s.c.\n' + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.right') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.right') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.uden_korr.st_hul.snellen.right') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.st_hul.snellen.right') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.etdrs.right') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.st_hul.etdrs.right') .. '\n' + end end if ( getValue('visus.uden_korr.missing.left') == '' ) then @@ -28,6 +36,14 @@ end end + + + + + + + + if ( getValue('visus.uden_korr.missing.left') == '' ) then out = out .. 'Visus, uden korr., o.sin' @@ -35,18 +51,26 @@ 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' + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.left') .. '\n' end if ( getValue('visus.uden_korr.etdrs.left') ~= '' ) then - out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.left') .. ' s.c.\n' + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.left') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.left') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.uden_korr.st_hul.snellen.left') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.st_hul.snellen.left') .. '\n' + end + if ( getValue('visus.uden_korr.st_hul.etdrs.left') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.st_hul.etdrs.left') .. '\n' + end end if ( getValue('visus.uden_korr.missing.left') == '' ) then @@ -54,6 +78,33 @@ end end + + + + + + + + + + if ( getValue('visus.uden_korr.ou') ~= '' ) + then + out = out .. 'Visus, uden korr., o.u' + if ( getValue('visus.uden_korr.kontrast.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.uden_korr.kontrast.ou') .. ' kontrast' + end + out = out .. ':\n' + if ( getValue('visus.uden_korr.snellen.ou') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.uden_korr.snellen.ou') .. '\n' + end + if ( getValue('visus.uden_korr.etdrs.ou') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.uden_korr.etdrs.ou') .. '\n' + end + end + return out </resume> <queries> @@ -185,6 +236,93 @@ end return true </script> + <script language="lua" name="st_hul.snellen.right"> + if (value == '') + then + if ( getValue('visus.uden_korr.st_hul.etdrs.right') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.snellen.left"> + if (value == '') + then + if ( getValue('visus.uden_korr.st_hul.etdrs.left') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.etdrs.right"> + if (value == '') + then + if ( getValue('visus.uden_korr.st_hul.snellen.right') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul.etdrs.left"> + if (value == '') + then + if ( getValue('visus.uden_korr.st_hul.snellen.left') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="etdrs.ou"> + if (value == '') + then + if ( getValue('visus.uden_korr.snellen.ou') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="snellen.ou"> + if (value == '') + then + if ( getValue('visus.uden_korr.etdrs.ou') == '' ) + then + return false + end + end + return true + </script> + <script language="lua" name="st_hul_check.right"> + if (value == '') + then + disable('st_hul_frame.right') + else + enable('st_hul_frame.right') + end + return true + </script> + <script language="lua" name="st_hul_check.left"> + if (value == '') + then + disable('st_hul_frame.left') + else + enable('st_hul_frame.left') + end + return true + </script> + <script language="lua" name="st_hul_check.ou"> + if (value == '') + then + disable('st_hul_frame.ou') + else + enable('st_hul_frame.ou') + end + return true + </script> <script language="lua" name="right_eye"> if ( value == 'mangler' ) then @@ -203,6 +341,15 @@ end return true </script> + <script language="lua" name="ou"> + if ( value == '' ) + then + disable('ou_frame') + else + enable('ou_frame') + end + return true + </script> </scripts> <widgets caption="Visus - uden korrektion" layout="vbox"> @@ -227,9 +374,6 @@ <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:"/> <combobox name="visus.uden_korr.snellen.right" layout="vbox" type="search" value="" script="snellen.right"> @@ -371,6 +515,153 @@ </combobox> </frame> </frame> + <frame layout="vbox"> + <frame layout="hbox"> + <checkbox name="visus.uden_korr.st_hul.right" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.right"/> + </frame> + <frame layout="hbox" name="st_hul_frame.right"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.uden_korr.st_hul.snellen.right" layout="vbox" type="search" value="" script="st_hul.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.uden_korr.st_hul.etdrs.right" value="" type="search" script="st_hul.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> </frame> </frame> @@ -392,9 +683,6 @@ <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:"/> <combobox name="visus.uden_korr.snellen.left" layout="vbox" type="search" value="" script="snellen.left"> @@ -536,11 +824,346 @@ </combobox> </frame> </frame> + <frame layout="vbox"> + <frame layout="hbox"> + <checkbox name="visus.uden_korr.st_hul.left" caption="Yderligere måling med st. hul (udfyld herunder)" truevalue="true" falsevalue="" script="st_hul_check.left"/> + </frame> + <frame layout="hbox" name="st_hul_frame.left"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.uden_korr.st_hul.snellen.left" layout="vbox" type="search" value="" script="st_hul.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.uden_korr.st_hul.etdrs.left" value="" type="search" script="st_hul.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> </frame> </frame> </frame> + <!-- Begge øjne --> + <frame layout="hbox"> + <spacer/> + <frame layout="vbox"> + <checkbox caption="Aktiver o.u. måling" + name="visus.uden_korr.ou" script="ou" + truevalue="ou" falsevalue="" value=""/> + <frame name="ou_frame" caption="o.u." layout="vbox"> + <frame layout="hbox"> + <label caption="Kontrast:"/> + <combobox name="visus.uden_korr.kontrast.ou" 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"> + <frame layout="vbox"> + <label caption="Snellen:"/> + <combobox name="visus.uden_korr.snellen.ou" layout="vbox" type="search" value="" script="snellen.ou"> + <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.uden_korr.etdrs.ou" value="" type="search" script="etdrs.ou"> + <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.uden_korr.korr.sf.ou" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/> + </frame> + <frame layout="vbox"> + <label caption="Cyl:"/> + <lineedit name="visus.uden_korr.korr.cyl.ou" regexp="|[-+]?[\d]{1,2},[\d]{2,2}" script="lt10gt-15" value=""/> + </frame> + <frame layout="vbox"> + <label caption="Grader:"/> + <lineedit name="visus.uden_korr.korr.grader.ou" regexp="|[\d]+" script="lt359gt0" value=""/> + </frame> + </frame> + </frame> + --> + </frame> + </frame> + <spacer/> + </frame> + <!-- Knapper --> <frame layout="hbox"> <spacer /> diff --git a/server/xml/templates/ref_efterkontrol.xml b/server/xml/templates/ref_efterkontrol.xml index 00c6f85..bf49538 100644 --- a/server/xml/templates/ref_efterkontrol.xml +++ b/server/xml/templates/ref_efterkontrol.xml @@ -14,9 +14,8 @@ <macro name="visus-egen_korr" requires="ref_efterkontrol.overskrift"/> <macro name="visus-manifest_refraktion" requires="henvisning"/> <macro name="egen_brille" requires="ref_efterkontrol.overskrift"/> - <macro name="visus-ou" requires="ref_efterkontrol.overskrift"/> <macro name="autorefraktion" requires="ref_efterkontrol.overskrift"/> - <macro name="manifest_refraktion" requires="ref_efterkontrol.overskrift"/> +<!-- <macro name="manifest_refraktion" requires="ref_efterkontrol.overskrift"/> --> <macro name="cycloplegisk_refraktion" requires="ref_efterkontrol.overskrift"/> <macro name="keratometri" requires="ref_efterkontrol.overskrift"/> <macro name="tonometri" requires="ref_efterkontrol.overskrift"/> diff --git a/server/xml/templates/ref_forunders.xml b/server/xml/templates/ref_forunders.xml index 368a6e0..b398df1 100644 --- a/server/xml/templates/ref_forunders.xml +++ b/server/xml/templates/ref_forunders.xml @@ -13,12 +13,11 @@ <macro name="ref_aktuelle" requires="henvisning"/> <header caption="Objektiv undersøgelse"/> - <macro name="visus-template" requires="henvisning"/> <macro name="visus-uden_korr" requires="henvisning"/> <macro name="egen_brille" requires="henvisning"/> <macro name="visus-egen_korr" requires="henvisning"/> <macro name="autorefraktion" requires="henvisning"/> - <macro name="manifest_refraktion" requires="henvisning"/> +<!-- <macro name="manifest_refraktion" requires="henvisning"/> --> <macro name="visus-manifest_refraktion" requires="henvisning"/> <macro name="cycloplegisk_refraktion" requires="henvisning"/> <macro name="keratometri" requires="henvisning"/> |