diff options
Diffstat (limited to 'server/xml/macros/topografi-1.0.xml')
| -rw-r--r-- | server/xml/macros/topografi-1.0.xml | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/server/xml/macros/topografi-1.0.xml b/server/xml/macros/topografi-1.0.xml index 92a4027..7eedcfa 100644 --- a/server/xml/macros/topografi-1.0.xml +++ b/server/xml/macros/topografi-1.0.xml @@ -2,19 +2,19 @@ <macro name="topografi" version="1.0"> <resume language="lua"> out = '' - if ( getValue('topografi.odxt.missing') == '' or getValue('topografi.osin.missing') == '' ) + if ( getValue('topografi.mangler.odxt') == '' or getValue('topografi.mangler.osin') == '' ) then out = out .. 'Topografi, ' .. getValue('topografi.method') .. ':\n' end - if ( getValue('topografi.odxt.missing') == '' ) + if ( getValue('topografi.mangler.odxt') == '' ) then - out = out .. 'o.dxt: ' .. getValue('topografi.odxt.judgement') .. '\n' + out = out .. 'o.dxt: ' .. getValue('topografi.judgement.odxt') .. '\n' end - if ( getValue('topografi.osin.missing') == '' ) + if ( getValue('topografi.mangler.osin') == '' ) then - out = out .. 'o.sin: ' .. getValue('topografi.osin.judgement') .. '\n' + out = out .. 'o.sin: ' .. getValue('topografi.judgement.osin') .. '\n' end return out @@ -22,38 +22,38 @@ <queries> </queries> <maps> - <map name="missing_eye_right_map"> + <map name="missing_eye_odxt_map"> value = 0 timestamp = 0 source = '' - if( missing_eye_right ) + if( missing_eye_odxt ) then - if( missing_eye_right.value and missing_eye_right.value == '' ) + if( missing_eye_odxt.value and missing_eye_odxt.value == '' ) then value = '' - timestamp = missing_eye_right.timestamp + timestamp = missing_eye_odxt.timestamp else value = 'mangler' - timestamp = missing_eye_right.timestamp + timestamp = missing_eye_odxt.timestamp end end return value, timestamp, source </map> - <map name="missing_eye_left_map"> + <map name="missing_eye_osin_map"> value = 0 timestamp = 0 source = 'pracro' - if( missing_eye_left ) + if( missing_eye_osin ) then - if( missing_eye_left.value and missing_eye_left.value == '' ) + if( missing_eye_osin.value and missing_eye_osin.value == '' ) then value = '' - timestamp = missing_eye_left.timestamp + timestamp = missing_eye_osin.timestamp else value = 'mangler' - timestamp = missing_eye_left.timestamp + timestamp = missing_eye_osin.timestamp end end return value, timestamp, source @@ -101,23 +101,23 @@ <!-- o.dxt --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.dxt" - name="topografi.odxt.missing" script="right_eye" - map="missing_eye_right_map" + name="topografi.mangler.odxt" script="right_eye" + map="missing_eye_odxt_map" truevalue="mangler" falsevalue="" value=""/> <frame name="right_eye_frame" caption="o.dxt" layout="hbox"> <frame layout="vbox"> - <altcombobox name="topografi.odxt.judgement" layout="vbox"> + <altcombobox name="topografi.judgement.odxt" layout="vbox"> <item caption="Symmetrisk cornea" value="Symmetrisk cornea"/> <item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/> <item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/> <item caption="Keratoconus" value="Keratoconus"/> <item caption="Centreret ablationer" value="Centreret ablationer"/> <item caption="Decentreret ablationer" value="Decentreret ablationer"/> - <altitem caption="Andet" value="andet" innerwidget="topografi.odxt.andet"> + <altitem caption="Andet" value="andet" innerwidget="topografi.andet.odxt"> <frame layout="hbox"> <label caption="Andet:"/> - <lineedit name="topografi.odxt.andet"/> + <lineedit name="topografi.andet.odxt"/> </frame> </altitem> </altcombobox> @@ -129,23 +129,23 @@ <!-- o.sin --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.sin" - name="topografi.osin.missing" script="left_eye" - map="missing_eye_left_map" + name="topografi.mangler.osin" script="left_eye" + map="missing_eye_osin_map" truevalue="mangler" falsevalue="" value=""/> <frame name="left_eye_frame" caption="o.sin" layout="hbox"> <frame layout="vbox"> - <altcombobox name="topografi.osin.judgement" layout="vbox"> + <altcombobox name="topografi.judgement.osin" layout="vbox"> <item caption="Symmetrisk cornea" value="Symmetrisk cornea"/> <item caption="Regelmæssig astigmatisme" value="Regelmæssig astigmatisme"/> <item caption="Uregelmæssig astigmatisme" value="Uregelmæssig astigmatisme"/> <item caption="Keratoconus" value="Keratoconus"/> <item caption="Centreret ablationer" value="Centreret ablationer"/> <item caption="Decentreret ablationer" value="Decentreret ablationer"/> - <altitem caption="Andet" value="andet" innerwidget="topografi.osin.andet"> + <altitem caption="Andet" value="andet" innerwidget="topografi.andet.osin"> <frame layout="hbox"> <label caption="Andet:"/> - <lineedit name="topografi.osin.andet"/> + <lineedit name="topografi.andet.osin"/> </frame> </altitem> </altcombobox> |