From 30e2de3f0f8f047534917f53159263f1d857c5de Mon Sep 17 00:00:00 2001
From: senator <senator>
Date: Wed, 23 Sep 2009 07:40:55 +0000
Subject: added instrument selection to pupilstoerrelse and
central_corneatykkelse
---
server/xml/macros/central_corneatykkelse-1.0.xml | 23 ++++++++++-------------
server/xml/macros/pupilstoerrelse-1.0.xml | 22 +++++++++-------------
2 files changed, 19 insertions(+), 26 deletions(-)
(limited to 'server/xml')
diff --git a/server/xml/macros/central_corneatykkelse-1.0.xml b/server/xml/macros/central_corneatykkelse-1.0.xml
index e697bbc..98547d7 100644
--- a/server/xml/macros/central_corneatykkelse-1.0.xml
+++ b/server/xml/macros/central_corneatykkelse-1.0.xml
@@ -1,22 +1,10 @@
<?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="central_corneatykkelse" version="1.0">
<resume language="lua">
out = ''
if ( getValue('central_corneatykkelse.right.missing') == '' or getValue('central_corneatykkelse.left.missing') == '' )
then
- out = out .. 'Central corneatykkelse:\n'
+ out = out .. 'Central corneatykkelse, ' .. getValue('central_corneatykkelse.method') .. ':\n'
end
if ( getValue('central_corneatykkelse.right.missing') == '' )
@@ -150,6 +138,15 @@
</frame>
</frame>
</frame>
+
+ <frame name="device_frame" layout="vbox">
+ <label caption="Tonometri foretaget med:"/>
+ <combobox name="central_corneatykkelse.method" value="">
+ <item caption="Automatisk CCT" value="Automatisk CCT"/>
+ <item caption="Pentacam" value="Pentacam"/>
+ <item caption="Optisk pachymetri" value="Optisk pachymetri"/>
+ </combobox>
+ </frame>
<!-- Knapper -->
<frame layout="hbox">
diff --git a/server/xml/macros/pupilstoerrelse-1.0.xml b/server/xml/macros/pupilstoerrelse-1.0.xml
index c2a771a..c2f985b 100644
--- a/server/xml/macros/pupilstoerrelse-1.0.xml
+++ b/server/xml/macros/pupilstoerrelse-1.0.xml
@@ -1,22 +1,10 @@
<?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="pupilstoerrelse" version="1.0">
<resume language="lua">
out = ''
if ( getValue('pupilstoerrelse.right.missing') == '' or getValue('pupilstoerrelse.left.missing') == '' )
then
- out = out .. 'Pupilstørrelse:\n'
+ out = out .. 'Pupilstørrelse, ' .. getValue('pupilstoerrelse.method') .. ':\n'
end
if ( getValue('pupilstoerrelse.right.missing') == '' )
@@ -150,6 +138,14 @@
</frame>
</frame>
</frame>
+
+ <frame name="device_frame" layout="vbox">
+ <label caption="Tonometri foretaget med:"/>
+ <combobox name="pupilstoerrelse.method" value="">
+ <item caption="Fotografisk pupillometer" value="Fotografisk pupillometer"/>
+ <item caption="NIDEK pupillometer" value="NIDEK pupillometer"/>
+ </combobox>
+ </frame>
<!-- Knapper -->
<frame layout="hbox">
--
cgit v1.2.3