summaryrefslogtreecommitdiff
path: root/server/xml/macros/egen_brille-1.0.xml
diff options
context:
space:
mode:
Diffstat (limited to 'server/xml/macros/egen_brille-1.0.xml')
-rw-r--r--server/xml/macros/egen_brille-1.0.xml88
1 files changed, 44 insertions, 44 deletions
diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml
index 7db6bce..3eb5e53 100644
--- a/server/xml/macros/egen_brille-1.0.xml
+++ b/server/xml/macros/egen_brille-1.0.xml
@@ -2,31 +2,31 @@
<macro name="egen_brille" version="1.0">
<resume language="lua">
out = ''
- if ( getValue('lensmeter.right.missing') == '' )
+ if ( getValue('lensmeter.odxt.missing') == '' )
then
- out = out .. 'Egen brille, o.dxt: ' .. getValue('lensmeter.right.sf') .. ' sf'
- if ( getValue('lensmeter.right.cyl') ~= '' )
+ out = out .. 'Egen brille, o.dxt: ' .. getValue('lensmeter.odxt.sf') .. ' sf'
+ if ( getValue('lensmeter.odxt.cyl') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.right.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('lensmeter.odxt.cyl') .. ' cyl'
end
- if ( getValue('lensmeter.right.grader') ~= '' )
+ if ( getValue('lensmeter.odxt.grader') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.right.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('lensmeter.odxt.grader') .. ' grader\n'
else
out = out .. '\n'
end
end
- if ( getValue('lensmeter.left.missing') == '' )
+ if ( getValue('lensmeter.osin.missing') == '' )
then
- out = out .. 'Egen brille, o.sin: ' .. getValue('lensmeter.left.sf') .. ' sf'
- if ( getValue('lensmeter.left.cyl') ~= '' )
+ out = out .. 'Egen brille, o.sin: ' .. getValue('lensmeter.osin.sf') .. ' sf'
+ if ( getValue('lensmeter.osin.cyl') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.left.cyl') .. ' cyl'
+ out = out .. ', ' .. getValue('lensmeter.osin.cyl') .. ' cyl'
end
- if ( getValue('lensmeter.left.grader') ~= '' )
+ if ( getValue('lensmeter.osin.grader') ~= '' )
then
- out = out .. ', ' .. getValue('lensmeter.left.grader') .. ' grader\n'
+ out = out .. ', ' .. getValue('lensmeter.osin.grader') .. ' grader\n'
else
out = out .. '\n'
end
@@ -80,67 +80,67 @@
end
return value, timestamp, source
</map>
- <map name="lensmeter.left.sf">
+ <map name="lensmeter.osin.sf">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.left and lensmeter.left.sf and lensmeter.left.sf.value and lensmeter.left.sf.timestamp)
+ if(lensmeter and lensmeter.osin and lensmeter.osin.sf and lensmeter.osin.sf.value and lensmeter.osin.sf.timestamp)
then
- value = lensmeter.left.sf.value
+ value = lensmeter.osin.sf.value
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.left.sf.timestamp
- source = lensmeter.left.sf.source
+ timestamp = lensmeter.osin.sf.timestamp
+ source = lensmeter.osin.sf.source
end
return value, timestamp, source
</map>
- <map name="lensmeter.left.cyl">
+ <map name="lensmeter.osin.cyl">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.left and lensmeter.left.cyl and lensmeter.left.cyl.value and lensmeter.left.cyl.timestamp)
+ if(lensmeter and lensmeter.osin and lensmeter.osin.cyl and lensmeter.osin.cyl.value and lensmeter.osin.cyl.timestamp)
then
- value = lensmeter.left.cyl.value
+ value = lensmeter.osin.cyl.value
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.left.cyl.timestamp
- source = lensmeter.left.cyl.source
+ timestamp = lensmeter.osin.cyl.timestamp
+ source = lensmeter.osin.cyl.source
end
return value, timestamp, source
</map>
- <map name="lensmeter.right.sf">
+ <map name="lensmeter.odxt.sf">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.right and lensmeter.right.sf and lensmeter.right.sf.value and lensmeter.right.sf.timestamp)
+ if(lensmeter and lensmeter.odxt and lensmeter.odxt.sf and lensmeter.odxt.sf.value and lensmeter.odxt.sf.timestamp)
then
- value = lensmeter.right.sf.value
+ value = lensmeter.odxt.sf.value
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.right.sf.timestamp
- source = lensmeter.right.sf.source
+ timestamp = lensmeter.odxt.sf.timestamp
+ source = lensmeter.odxt.sf.source
end
return value, timestamp, source
</map>
- <map name="lensmeter.right.cyl">
+ <map name="lensmeter.odxt.cyl">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.right and lensmeter.right.cyl and lensmeter.right.cyl.value and lensmeter.right.cyl.timestamp)
+ if(lensmeter and lensmeter.odxt and lensmeter.odxt.cyl and lensmeter.odxt.cyl.value and lensmeter.odxt.cyl.timestamp)
then
- value = lensmeter.right.cyl.value
+ value = lensmeter.odxt.cyl.value
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.right.cyl.timestamp
- source = lensmeter.right.cyl.source
+ timestamp = lensmeter.odxt.cyl.timestamp
+ source = lensmeter.odxt.cyl.source
end
return value, timestamp, source
</map>
@@ -212,53 +212,53 @@
<frame layout="hbox">
- <!-- Højre øje -->
+ <!-- o.dxt -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på højre øje"
- name="lensmeter.right.missing" script="right_eye"
+ name="lensmeter.odxt.missing" script="right_eye"
map="missing_eye_right_map"
truevalue="mangler" falsevalue="" value=""/>
- <frame name="right_eye_frame" caption="Højre øje" layout="hbox">
+ <frame name="right_eye_frame" caption="o.dxt" layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="lensmeter.right.sf" map="lensmeter.right.sf"
+ <lineedit name="lensmeter.odxt.sf" map="lensmeter.odxt.sf"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="lensmeter.right.cyl" map="lensmeter.right.cyl"
+ <lineedit name="lensmeter.odxt.cyl" map="lensmeter.odxt.cyl"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="lensmeter.right.grader" map="lensmeter.right.grader"
+ <lineedit name="lensmeter.odxt.grader" map="lensmeter.odxt.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
</frame>
- <!-- Venstre øje -->
+ <!-- o.sin -->
<frame layout="vbox">
<checkbox caption="Der er ikke målt på venstre øje"
- name="lensmeter.left.missing" script="left_eye"
+ name="lensmeter.osin.missing" script="left_eye"
map="missing_eye_left_map"
truevalue="mangler" falsevalue="" value=""/>
- <frame name="left_eye_frame" caption="Venstre øje" layout="hbox">
+ <frame name="left_eye_frame" caption="o.sin" layout="hbox">
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="lensmeter.left.sf" map="lensmeter.left.sf"
+ <lineedit name="lensmeter.osin.sf" map="lensmeter.osin.sf"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
<label caption="Cyl:"/>
- <lineedit name="lensmeter.left.cyl" map="lensmeter.left.cyl"
+ <lineedit name="lensmeter.osin.cyl" map="lensmeter.osin.cyl"
regexp="|[+-]{0,1}\d{1,2},\d{2}" script="lt10gt-15" value=""/>
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="lensmeter.left.grader" map="lensmeter.left.grader"
+ <lineedit name="lensmeter.osin.grader" map="lensmeter.osin.grader"
regexp="|[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 13:39:23 +0000