summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorsenator <senator>2009-08-17 06:53:14 +0000
committersenator <senator>2009-08-17 06:53:14 +0000
commit28350af1374c07d1dfdee727d9d6d37219446d4f (patch)
tree6a592230157e6cb63ddf3fb61dfaf3ff4a011b87 /server
parent27d3a44257b60d5a3538f5f70cc644bc1715d8cf (diff)
Et eller andet
Diffstat (limited to 'server')
-rw-r--r--server/xml/macros/keratometri-1.0.xml26
-rw-r--r--server/xml/macros/tonometri-1.0.xml25
2 files changed, 9 insertions, 42 deletions
diff --git a/server/xml/macros/keratometri-1.0.xml b/server/xml/macros/keratometri-1.0.xml
index 2b54164..e568d0e 100644
--- a/server/xml/macros/keratometri-1.0.xml
+++ b/server/xml/macros/keratometri-1.0.xml
@@ -1,33 +1,13 @@
<?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="keratometri" version="1.0">
<resume language="lua">
out = ''
if ( getValue('keratometri.right.missing') == '' )
then
- out = out .. 'Keratometri, højre øje:\n' ..
- 'Radius 1: ' .. getValue('keratometri.right.r1') ..
- 'Radius 2: ' .. getValue('keratometri.right.r2') ..
- 'Cylinder: ' .. getValue('keratometri.right.x1')
+ if ( getValue('keratometri.right.x1') > 0 and getValue('keratometri.right.x1') < 90 )
+
end
-
- if ( getValue('keratometri.left.missing') == '' )
- then
- out = out .. 'Keratometri, venstre øje:\n' ..
- 'Radius 1: ' .. getValue('keratometri.left.r1') ..
- 'Radius 2: ' .. getValue('keratometri.left.r2') ..
- 'Cylinder: ' .. getValue('keratometri.left.x1')
+ out = out .. 'Keratometri, højre øje:\n' .. 'Radius 1: ' .. getValue('keratometri.right.r1') .. ' mm (' .. string.format('%f', 337.50 / getValue('keratometri.right.r1')) .. ' D) i ' .. getValue('keratometri.right.x1') .. ' grader.\n\nRadius 2: ' .. getValue('keratometri.right.r2') .. ' mm (' .. string.format('%f', 337.50 / getValue('keratometri.right.r2')) .. ' D) i ' .. getValue('keratometri.right.x2')'
end
return out
diff --git a/server/xml/macros/tonometri-1.0.xml b/server/xml/macros/tonometri-1.0.xml
index 33171e8..189bdad 100644
--- a/server/xml/macros/tonometri-1.0.xml
+++ b/server/xml/macros/tonometri-1.0.xml
@@ -1,33 +1,20 @@
<?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="tonometri" version="1.0">
<resume language="lua">
out = ''
-
if ( getValue('tonometri.right.missing') == '' or getValue('tonometri.left.missing') == '' )
then
- out = out .. getValue('tonometri.device') .. ':\n'
+ out = out .. getValue('tonometri.method') .. ':\n'
end
if ( getValue('tonometri.right.missing') == '' )
then
- out = out .. 'Højre øje: ' .. getValue('tonometri.pressure.right') .. ' mmHg\n'
+ out = out .. 'Højre øje: ' .. getValue('tonometri.right.pressure') .. ' mmHg\n'
end
if ( getValue('tonometri.left.missing') == '' )
then
- out = out .. 'Venstre øje: ' .. getValue('tonometri.pressure.left') .. ' mmHg\n'
+ out = out .. 'Venstre øje: ' .. getValue('tonometri.left.pressure') .. ' mmHg\n'
end
return out
@@ -142,7 +129,7 @@
<frame name="right_eye_frame" caption="Højre øje" layout="hbox">
<label caption="Tryk:"/>
<spacer/>
- <lineedit name="tonometri.pressure.right" regexp="\d{1,2}" script="lt80gt0" value=""/>
+ <lineedit name="tonometri.right.pressure" regexp="\d{1,2}" script="lt80gt0" value=""/>
<label caption="mmHg"/>
<spacer/>
</frame>
@@ -157,7 +144,7 @@
<frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
<label caption="Tryk:"/>
<spacer/>
- <lineedit name="tonometri.pressure.left" regexp="\d{1,2}" script="lt80gt0" value=""/>
+ <lineedit name="tonometri.left.pressure" regexp="\d{1,2}" script="lt80gt0" value=""/>
<label caption="mmHg"/>
<spacer/>
</frame>
@@ -167,7 +154,7 @@
<frame name="device_frame" layout="vbox">
<label caption="Tonometer måling foretaget med:"/>
- <combobox name="tonometri.device" value="">
+ <combobox name="tonometri.method" value="">
<item caption="Lufttonometer" value="Lufttonometri"/>
<item caption="Applanationstonometer" value="Applanationstonometri"/>
<item caption="Eye Care" value="Eye Care tonometri"/>