diff options
Diffstat (limited to 'server/xml/macros/keratometri-1.0.xml')
| -rw-r--r-- | server/xml/macros/keratometri-1.0.xml | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/server/xml/macros/keratometri-1.0.xml b/server/xml/macros/keratometri-1.0.xml index c762309..be01e01 100644 --- a/server/xml/macros/keratometri-1.0.xml +++ b/server/xml/macros/keratometri-1.0.xml @@ -14,12 +14,12 @@ out = '' - if ( getValue('keratometri.odxt.missing') == '' ) + if ( getValue('keratometri.mangler.odxt') == '' ) then - rr1 = tonmb(getValue('keratometri.odxt.r1')) - rr2 = tonmb(getValue('keratometri.odxt.r2')) - rx1 = tonmb(getValue('keratometri.odxt.x1')) + rr1 = tonmb(getValue('keratometri.r.odxt1')) + rr2 = tonmb(getValue('keratometri.r.odxt2')) + rx1 = tonmb(getValue('keratometri.x.odxt1')) if ( rx1 >= 0 and rx1 < 90 ) then rx2 = rx1 + 90 @@ -53,12 +53,12 @@ end - if ( getValue('keratometri.osin.missing') == '' ) + if ( getValue('keratometri.mangler.osin') == '' ) then - lr1 = tonmb(getValue('keratometri.osin.r1')) - lr2 = tonmb(getValue('keratometri.osin.r2')) - lx1 = tonmb(getValue('keratometri.osin.x1')) + lr1 = tonmb(getValue('keratometri.r.osin1')) + lr2 = tonmb(getValue('keratometri.r.osin2')) + lx1 = tonmb(getValue('keratometri.x.osin1')) if ( lx1 >= 0 and lx1 < 90 ) then lx2 = lx1 + 90 @@ -96,42 +96,42 @@ </resume> <queries> <query class="keratometri" ttl="100000"/> - <query service="pracro" class="missing_eye_right" ttl="1000000"/> - <query service="pracro" class="missing_eye_left" ttl="1000000"/> + <query service="pracro" class="missing_eye_odxt" ttl="1000000"/> + <query service="pracro" class="missing_eye_osin" ttl="1000000"/> </queries> <maps> - <map name="missing_eye_right_map"> + <map name="missing_eye_odxt_map"> value = 0 timestamp = 0 source = 'pracro' - 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 @@ -193,22 +193,22 @@ <!-- o.dxt --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.dxt" - name="keratometri.odxt.missing" script="right_eye" - map="missing_eye_right_map" + name="keratometri.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"> <label caption="R1:"/> - <lineedit name="keratometri.odxt.r1" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/> + <lineedit name="keratometri.r.odxt1" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/> </frame> <frame layout="vbox"> <label caption="R2:"/> - <lineedit name="keratometri.odxt.r2" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/> + <lineedit name="keratometri.r.odxt2" regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt0" value=""/> </frame> <frame layout="vbox"> <label caption="X1 (fladeste akse):"/> - <lineedit name="keratometri.odxt.x1" regexp="[\d]+" script="lt180gt0" value=""/> + <lineedit name="keratometri.x.odxt1" regexp="[\d]+" script="lt180gt0" value=""/> </frame> </frame> </frame> @@ -216,22 +216,22 @@ <!-- o.sin --> <frame layout="vbox"> <checkbox caption="Der er ikke målt på o.sin" - name="keratometri.osin.missing" script="left_eye" - map="missing_eye_left_map" + name="keratometri.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"> <label caption="R1:"/> - <lineedit name="keratometri.osin.r1" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/> + <lineedit name="keratometri.r.osin1" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/> </frame> <frame layout="vbox"> <label caption="R2:"/> - <lineedit name="keratometri.osin.r2" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/> + <lineedit name="keratometri.r.osin2" regexp="\d{1,2},\d{2}" script="lt20gt0" value=""/> </frame> <frame layout="vbox"> <label caption="X1 (fladeste akse):"/> - <lineedit name="keratometri.osin.x1" regexp="[\d]+" script="lt180gt0" value=""/> + <lineedit name="keratometri.x.osin1" regexp="[\d]+" script="lt180gt0" value=""/> </frame> </frame> </frame> |