From 2cd1f061475f496f20c9f9e297eef210524b55cd Mon Sep 17 00:00:00 2001 From: senator Date: Wed, 4 Nov 2009 10:41:55 +0000 Subject: Further refined visus template, also minor changes to other things --- server/xml/macros/visus-template-1.0.xml | 651 ++++++++++++++++++++++++++++++- 1 file changed, 636 insertions(+), 15 deletions(-) (limited to 'server/xml/macros/visus-template-1.0.xml') diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml index 5bf0853..b7dcb19 100644 --- a/server/xml/macros/visus-template-1.0.xml +++ b/server/xml/macros/visus-template-1.0.xml @@ -17,10 +17,6 @@ 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 @@ -51,12 +47,32 @@ out = out .. ', ' .. getValue('visus.template.add.grader.right') .. ' grader' end out = out .. '\n' + if ( getValue('visus.template.st_hul.right') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.template.st_hul.snellen.right') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.template.st_hul.snellen.right') .. '\n' + end + if ( getValue('visus.template.st_hul.etdrs.right') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.template.st_hul.etdrs.right') .. '\n' + end + end 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' @@ -64,10 +80,6 @@ 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 @@ -98,12 +110,60 @@ out = out .. ', ' .. getValue('visus.template.add.grader.left') .. ' grader' end out = out .. '\n' + if ( getValue('visus.template.st_hul.left') ~= '' ) + then + out = out .. 'Måling foretaget med st. hul:\n' + if ( getValue('visus.template.st_hul.snellen.left') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.template.st_hul.snellen.left') .. '\n' + end + if ( getValue('visus.template.st_hul.etdrs.left') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.template.st_hul.etdrs.left') .. '\n' + end + end if ( getValue('visus.template.missing.left') == '' ) then out = out .. '\n' end end + + + + + + + + + + if ( getValue('visus.template.ou') ~= '' ) + then + out = out .. 'Visus, template, o.u' + if ( getValue('visus.template.kontrast.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.template.kontrast.ou') .. ' kontrast' + end + out = out .. ':\n' + if ( getValue('visus.template.snellen.ou') ~= '' ) + then + out = out .. 'Snellen: ' .. getValue('visus.template.snellen.ou') .. '\n' + end + if ( getValue('visus.template.etdrs.ou') ~= '' ) + then + out = out .. 'ETDRS: ' .. getValue('visus.template.etdrs.ou') .. '\n' + end + out = out .. 'Korr.: ' .. getValue('visus.template.korr.sf.ou') .. ' sf' + if ( getValue('visus.template.korr.cyl.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.template.korr.cyl.ou') .. ' cyl' + end + if ( getValue('visus.template.korr.grader.ou') ~= '' ) + then + out = out .. ', ' .. getValue('visus.template.korr.grader.ou') .. ' grader' + end + end + return out @@ -235,6 +295,93 @@ end return true + + + + + + + + + + - @@ -276,9 +432,6 @@ - - -