summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsenator <senator>2009-09-23 07:40:55 +0000
committersenator <senator>2009-09-23 07:40:55 +0000
commit30e2de3f0f8f047534917f53159263f1d857c5de (patch)
tree93b7d0057dc2f7b94da55c7caec1bcc934a885fc
parentc3ac91958145e0e34d949947c3b5c594ffc4b904 (diff)
added instrument selection to pupilstoerrelse and central_corneatykkelse
-rw-r--r--server/xml/macros/central_corneatykkelse-1.0.xml23
-rw-r--r--server/xml/macros/pupilstoerrelse-1.0.xml22
2 files changed, 19 insertions, 26 deletions
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">