summaryrefslogtreecommitdiff
path: root/server/xml/macros
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml/macros')
-rw-r--r--server/xml/macros/visus-autoref-1.0.xml10
-rw-r--r--server/xml/macros/visus-egen_korr-1.0.xml21
-rw-r--r--server/xml/macros/visus-manifest_refraktion-1.0.xml21
-rw-r--r--server/xml/macros/visus-ou-1.0.xml7
-rw-r--r--server/xml/macros/visus-template-1.0.xml29
-rw-r--r--server/xml/macros/visus-uden_korr-1.0.xml20
6 files changed, 78 insertions, 30 deletions
diff --git a/server/xml/macros/visus-autoref-1.0.xml b/server/xml/macros/visus-autoref-1.0.xml
index b64e476..439e5b0 100644
--- a/server/xml/macros/visus-autoref-1.0.xml
+++ b/server/xml/macros/visus-autoref-1.0.xml
@@ -9,6 +9,10 @@
fjern tilsvarende GUI felter der ikke skal bruges
-->
<resume language="lua">
+ function lttoxml(value)
+ return string.gsub(value, '&lt;', '&amp;lt;')
+ end
+
out = ''
if ( getValue('visus.autoref.mangler.odxt') == '' )
then
@@ -24,7 +28,7 @@
out = out .. ':\n'
if ( getValue('visus.autoref.snellen.odxt') ~= '' )
then
- out = out .. 'Snellen: ' .. getValue('visus.autoref.snellen.odxt') .. '\n'
+ out = out .. 'Snellen: ' .. lttoxml(getValue('visus.autoref.snellen.odxt')) .. '\n'
end
if ( getValue('visus.autoref.etdrs.odxt') ~= '' )
then
@@ -61,7 +65,7 @@
out = out .. ':\n'
if ( getValue('visus.autoref.snellen.osin') ~= '' )
then
- out = out .. 'Snellen: ' .. getValue('visus.autoref.snellen.osin') .. '\n'
+ out = out .. 'Snellen: ' .. lttoxml(getValue('visus.autoref.snellen.osin')) .. '\n'
end
if ( getValue('visus.autoref.etdrs.osin') ~= '' )
then
@@ -280,6 +284,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -465,6 +470,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-egen_korr-1.0.xml b/server/xml/macros/visus-egen_korr-1.0.xml
index 4f4d29f..32c0914 100644
--- a/server/xml/macros/visus-egen_korr-1.0.xml
+++ b/server/xml/macros/visus-egen_korr-1.0.xml
@@ -10,6 +10,10 @@
fjern tilsvarende GUI felter der ikke skal bruges
-->
<resume language="lua">
+ function lttoxml(value)
+ return string.gsub(value, '&lt;', '&amp;lt;')
+ end
+
out = ''
if ( getValue('visus.egen_korr.mangler.odxt') == '' or getValue('visus.egen_korr.mangler.osin') == '' or getValue('visus.egen_korr.ou') ~= '' )
then
@@ -21,7 +25,7 @@
out = out .. 'o.dxt: '
if ( getValue('visus.egen_korr.snellen.odxt') ~= '' )
then
- out = out .. getValue('visus.egen_korr.snellen.odxt')
+ out = out .. lttoxml(getValue('visus.egen_korr.snellen.odxt'))
if ( getValue('visus.egen_korr.etdrs.odxt') == '' )
then
out = out .. ', '
@@ -54,7 +58,7 @@
then
if ( getValue('visus.egen_korr.st_hul.snellen.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('visus.egen_korr.st_hul.snellen.odxt')
+ out = out .. ', ' .. lttoxml(getValue('visus.egen_korr.st_hul.snellen.odxt'))
end
if ( getValue('visus.egen_korr.st_hul.etdrs.odxt') ~= '' )
then
@@ -74,7 +78,7 @@
out = out .. 'o.sin: '
if ( getValue('visus.egen_korr.snellen.osin') ~= '' )
then
- out = out .. getValue('visus.egen_korr.snellen.osin')
+ out = out .. lttoxml(getValue('visus.egen_korr.snellen.osin'))
if ( getValue('visus.egen_korr.etdrs.osin') == '' )
then
out = out .. ', '
@@ -107,13 +111,13 @@
then
if ( getValue('visus.egen_korr.st_hul.snellen.osin') ~= '' )
then
- out = out .. ', ' .. getValue('visus.egen_korr.st_hul.snellen.osin')
+ out = out .. ', ' .. lttoxml(getValue('visus.egen_korr.st_hul.snellen.osin'))
end
if ( getValue('visus.egen_korr.st_hul.etdrs.osin') ~= '' )
then
out = out .. ', ' .. getValue('visus.egen_korr.st_hul.etdrs.osin') .. ' ETDRS'
end
- out = out .. ' st.h.\n'
+ out = out .. ' st.h.'
end
out = out .. '\n'
end
@@ -128,7 +132,7 @@
out = out .. 'o.u: '
if ( getValue('visus.egen_korr.snellen.ou') ~= '' )
then
- out = out .. getValue('visus.egen_korr.snellen.ou')
+ out = out .. lttoxml(getValue('visus.egen_korr.snellen.ou'))
end
if ( getValue('visus.egen_korr.etdrs.ou') ~= '' )
then
@@ -433,6 +437,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -599,6 +604,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -762,6 +768,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -928,6 +935,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1094,6 +1102,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-manifest_refraktion-1.0.xml b/server/xml/macros/visus-manifest_refraktion-1.0.xml
index 35236f6..74b8ea3 100644
--- a/server/xml/macros/visus-manifest_refraktion-1.0.xml
+++ b/server/xml/macros/visus-manifest_refraktion-1.0.xml
@@ -10,6 +10,10 @@
fjern tilsvarende GUI felter der ikke skal bruges
-->
<resume language="lua">
+ function lttoxml(value)
+ return string.gsub(value, '&lt;', '&amp;lt;')
+ end
+
out = ''
if ( getValue('visus.manifest_refraktion.mangler.odxt') == '' or getValue('visus.manifest_refraktion.mangler.osin') == '' or getValue('visus.manifest_refraktion.ou') ~= '' )
then
@@ -21,7 +25,7 @@
out = out .. 'o.dxt: '
if ( getValue('visus.manifest_refraktion.snellen.odxt') ~= '' )
then
- out = out .. getValue('visus.manifest_refraktion.snellen.odxt')
+ out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.odxt'))
if ( getValue('visus.manifest_refraktion.etdrs.odxt') == '' )
then
out = out .. ', '
@@ -54,7 +58,7 @@
then
if ( getValue('visus.manifest_refraktion.st_hul.snellen.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.snellen.odxt')
+ out = out .. ', ' .. lttoxml(getValue('visus.manifest_refraktion.st_hul.snellen.odxt'))
end
if ( getValue('visus.manifest_refraktion.st_hul.etdrs.odxt') ~= '' )
then
@@ -74,7 +78,7 @@
out = out .. 'o.sin: '
if ( getValue('visus.manifest_refraktion.snellen.osin') ~= '' )
then
- out = out .. getValue('visus.manifest_refraktion.snellen.osin')
+ out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.osin'))
if ( getValue('visus.manifest_refraktion.etdrs.osin') == '' )
then
out = out .. ', '
@@ -107,13 +111,13 @@
then
if ( getValue('visus.manifest_refraktion.st_hul.snellen.osin') ~= '' )
then
- out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.snellen.osin')
+ out = out .. ', ' .. lttoxml(getValue('visus.manifest_refraktion.st_hul.snellen.osin'))
end
if ( getValue('visus.manifest_refraktion.st_hul.etdrs.osin') ~= '' )
then
out = out .. ', ' .. getValue('visus.manifest_refraktion.st_hul.etdrs.osin') .. ' ETDRS'
end
- out = out .. ' st.h.\n'
+ out = out .. ' st.h.'
end
out = out .. '\n'
end
@@ -128,7 +132,7 @@
out = out .. 'o.u: '
if ( getValue('visus.manifest_refraktion.snellen.ou') ~= '' )
then
- out = out .. getValue('visus.manifest_refraktion.snellen.ou')
+ out = out .. lttoxml(getValue('visus.manifest_refraktion.snellen.ou'))
end
if ( getValue('visus.manifest_refraktion.etdrs.ou') ~= '' )
then
@@ -433,6 +437,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -599,6 +604,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -762,6 +768,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -928,6 +935,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1094,6 +1102,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-ou-1.0.xml b/server/xml/macros/visus-ou-1.0.xml
index d03607f..3382b4d 100644
--- a/server/xml/macros/visus-ou-1.0.xml
+++ b/server/xml/macros/visus-ou-1.0.xml
@@ -1,6 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<macro name="visus-ou" version="1.0">
<resume language="lua">
+ function lttoxml(value)
+ return string.gsub(value, '&lt;', '&amp;lt;')
+ end
+
out = ''
out = out .. 'Visus, o.u.'
if ( getValue('visus.ou.kontrast') ~= '' )
@@ -14,7 +18,7 @@
out = out .. ':\n'
if ( getValue('visus.ou.snellen') ~= '' )
then
- out = out .. 'Snellen: ' .. getValue('visus.ou.snellen') .. '\n'
+ out = out .. 'Snellen: ' .. lttoxml(getValue('visus.ou.snellen')) .. '\n'
end
if ( getValue('visus.ou.etdrs') ~= '' )
then
@@ -136,6 +140,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-template-1.0.xml b/server/xml/macros/visus-template-1.0.xml
index 1e6cb13..7199903 100644
--- a/server/xml/macros/visus-template-1.0.xml
+++ b/server/xml/macros/visus-template-1.0.xml
@@ -6,10 +6,15 @@
skift macro navnet under macro tagget helt i toppen
skift overskrift i resumeet (navn1->navn2)
skift GUI overskrift for macroen under widgets afsnittet
- fjern resume felter der ikke skal bruges
+ fjern resume felter der ikke skal bruges og juster kommaer saa de passer
fjern tilsvarende GUI felter der ikke skal bruges
-->
<resume language="lua">
+ function lttoxml(value)
+ value = string.gsub(value, '&lt;', '&amp;lt;')
+ return value
+ end
+
out = ''
if ( getValue('visus.template.mangler.odxt') == '' or getValue('visus.template.mangler.osin') == '' or getValue('visus.template.ou') ~= '' )
then
@@ -21,7 +26,7 @@
out = out .. 'o.dxt: '
if ( getValue('visus.template.snellen.odxt') ~= '' )
then
- out = out .. getValue('visus.template.snellen.odxt')
+ out = out .. lttoxml(getValue('visus.template.snellen.odxt'))
if ( getValue('visus.template.etdrs.odxt') == '' )
then
out = out .. ', '
@@ -64,7 +69,7 @@
then
if ( getValue('visus.template.st_hul.snellen.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('visus.template.st_hul.snellen.odxt')
+ out = out .. ', ' .. lttoxml(getValue('visus.template.st_hul.snellen.odxt'))
end
if ( getValue('visus.template.st_hul.etdrs.odxt') ~= '' )
then
@@ -84,7 +89,7 @@
out = out .. 'o.sin: '
if ( getValue('visus.template.snellen.osin') ~= '' )
then
- out = out .. getValue('visus.template.snellen.osin')
+ out = out .. lttoxml(getValue('visus.template.snellen.osin'))
if ( getValue('visus.template.etdrs.osin') == '' )
then
out = out .. ', '
@@ -127,7 +132,7 @@
then
if ( getValue('visus.template.st_hul.snellen.osin') ~= '' )
then
- out = out .. ', ' .. getValue('visus.template.st_hul.snellen.osin')
+ out = out .. ', ' .. lttoxml(getValue('visus.template.st_hul.snellen.osin'))
end
if ( getValue('visus.template.st_hul.etdrs.osin') ~= '' )
then
@@ -148,7 +153,7 @@
out = out .. 'o.u: '
if ( getValue('visus.template.snellen.ou') ~= '' )
then
- out = out .. getValue('visus.template.snellen.ou')
+ out = out .. lttoxml(getValue('visus.template.snellen.ou'))
end
if ( getValue('visus.template.etdrs.ou') ~= '' )
then
@@ -410,8 +415,7 @@
return true
</script>
</scripts>
- <widgets caption="Visus - template"
- layout="vbox">
+ <widgets caption="Visus - template" layout="vbox">
<frame layout="hbox">
@@ -453,6 +457,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -639,6 +644,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -802,6 +808,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -988,6 +995,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1115,13 +1123,13 @@
</frame>
- <!-- Begge øjne -->
+ <!-- Begge oejne -->
<frame layout="hbox">
<spacer/>
<frame layout="vbox">
<checkbox caption="Aktiver o.u. måling"
name="visus.template.ou" script="ou"
- truevalue="ou" falsevalue="" value=""/>
+ truevalue="true" falsevalue="" value=""/>
<frame name="ou_frame" caption="o.u." layout="vbox">
<frame layout="hbox">
<label caption="Kontrast:"/>
@@ -1154,6 +1162,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
diff --git a/server/xml/macros/visus-uden_korr-1.0.xml b/server/xml/macros/visus-uden_korr-1.0.xml
index 05d0d39..886b262 100644
--- a/server/xml/macros/visus-uden_korr-1.0.xml
+++ b/server/xml/macros/visus-uden_korr-1.0.xml
@@ -10,6 +10,11 @@
fjern tilsvarende GUI felter der ikke skal bruges
-->
<resume language="lua">
+ function lttoxml(value)
+ value = string.gsub(value, '&lt;', '&amp;lt;')
+ return value
+ end
+
out = ''
if ( getValue('visus.uden_korr.mangler.odxt') == '' or getValue('visus.uden_korr.mangler.osin') == '' or getValue('visus.uden_korr.ou') ~= '' )
then
@@ -21,7 +26,7 @@
out = out .. 'o.dxt: '
if ( getValue('visus.uden_korr.snellen.odxt') ~= '' )
then
- out = out .. getValue('visus.uden_korr.snellen.odxt')
+ out = out .. lttoxml(getValue('visus.uden_korr.snellen.odxt'))
if ( getValue('visus.uden_korr.etdrs.odxt') == '' )
then
out = out .. ', '
@@ -44,7 +49,7 @@
then
if ( getValue('visus.uden_korr.st_hul.snellen.odxt') ~= '' )
then
- out = out .. ', ' .. getValue('visus.uden_korr.st_hul.snellen.odxt')
+ out = out .. ', ' .. lttoxml(getValue('visus.uden_korr.st_hul.snellen.odxt'))
end
if ( getValue('visus.uden_korr.st_hul.etdrs.odxt') ~= '' )
then
@@ -64,7 +69,7 @@
out = out .. 'o.sin: '
if ( getValue('visus.uden_korr.snellen.osin') ~= '' )
then
- out = out .. getValue('visus.uden_korr.snellen.osin')
+ out = out .. lttoxml(getValue('visus.uden_korr.snellen.osin'))
if ( getValue('visus.uden_korr.etdrs.osin') == '' )
then
out = out .. ', '
@@ -87,7 +92,7 @@
then
if ( getValue('visus.uden_korr.st_hul.snellen.osin') ~= '' )
then
- out = out .. ', ' .. getValue('visus.uden_korr.st_hul.snellen.osin')
+ out = out .. ', ' .. lttoxml(getValue('visus.uden_korr.st_hul.snellen.osin'))
end
if ( getValue('visus.uden_korr.st_hul.etdrs.osin') ~= '' )
then
@@ -108,7 +113,7 @@
out = out .. 'o.u: '
if ( getValue('visus.uden_korr.snellen.ou') ~= '' )
then
- out = out .. getValue('visus.uden_korr.snellen.ou')
+ out = out .. lttoxml(getValue('visus.uden_korr.snellen.ou'))
end
if ( getValue('visus.uden_korr.etdrs.ou') ~= '' )
then
@@ -413,6 +418,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -559,6 +565,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -722,6 +729,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -868,6 +876,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>
@@ -1034,6 +1043,7 @@
<item caption="0,1" value="0,1"/>
<item caption="0,08" value="0,08"/>
<item caption="0,05" value="0,05"/>
+ <item caption="&amp;lt;0,05" value="&amp;lt;0,05"/>
<item caption="6/60" value="6/60"/>
<item caption="3/60" value="3/60"/>
<item caption="1/18" value="1/18"/>