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.xml36
1 files changed, 18 insertions, 18 deletions
diff --git a/server/xml/macros/egen_brille-1.0.xml b/server/xml/macros/egen_brille-1.0.xml
index c6d1fe6..fef3a1e 100644
--- a/server/xml/macros/egen_brille-1.0.xml
+++ b/server/xml/macros/egen_brille-1.0.xml
@@ -16,16 +16,16 @@
out = ''
if ( getValue('lensmeter.right.missing') == '' )
then
- out = out .. 'Egen brille højre øje: ' .. getValue('lensmeter.right.sphere')
+ out = out .. 'Egen brille højre øje: ' .. getValue('lensmeter.right.sf')
.. ' sf, ' .. getValue('lensmeter.right.cyl') .. ' cyl '
- .. getValue('lensmeter.right.axis') .. ' grader.'
+ .. getValue('lensmeter.right.grader') .. ' grader.'
end
if ( getValue('lensmeter.left.missing') == '' )
then
- out = out .. 'Egen brille venstre øje: ' .. getValue('lensmeter.left.sphere')
+ out = out .. 'Egen brille venstre øje: ' .. getValue('lensmeter.left.sf')
.. ' sf, ' .. getValue('lensmeter.left.cyl') .. ' cyl '
- .. getValue('lensmeter.left.axis') .. ' grader.'
+ .. getValue('lensmeter.left.grader') .. ' grader.'
end
return out
@@ -76,19 +76,19 @@
end
return value, timestamp, source
</map>
- <map name="lensmeter.left.sphere">
+ <map name="lensmeter.left.sf">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.left and lensmeter.left.sphere and lensmeter.left.sphere.value and lensmeter.left.sphere.timestamp)
+ if(lensmeter and lensmeter.left and lensmeter.left.sf and lensmeter.left.sf.value and lensmeter.left.sf.timestamp)
then
- value = lensmeter.left.sphere.value
+ value = lensmeter.left.sf.value
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.left.sphere.timestamp
- source = lensmeter.left.sphere.source
+ timestamp = lensmeter.left.sf.timestamp
+ source = lensmeter.left.sf.source
end
return value, timestamp, source
</map>
@@ -108,19 +108,19 @@
end
return value, timestamp, source
</map>
- <map name="lensmeter.right.sphere">
+ <map name="lensmeter.right.sf">
-- Returning 0, 0 invalidates the result
value = 0
timestamp = 0
source = 0
- if(lensmeter and lensmeter.right and lensmeter.right.sphere and lensmeter.right.sphere.value and lensmeter.right.sphere.timestamp)
+ if(lensmeter and lensmeter.right and lensmeter.right.sf and lensmeter.right.sf.value and lensmeter.right.sf.timestamp)
then
- value = lensmeter.right.sphere.value
+ value = lensmeter.right.sf.value
-- convert . to ,
value = string.gsub(value, '[.]', ',')
- timestamp = lensmeter.right.sphere.timestamp
- source = lensmeter.right.sphere.source
+ timestamp = lensmeter.right.sf.timestamp
+ source = lensmeter.right.sf.source
end
return value, timestamp, source
</map>
@@ -218,7 +218,7 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="lensmeter.right.sphere" map="lensmeter.right.sphere"
+ <lineedit name="lensmeter.right.sf" map="lensmeter.right.sf"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -228,7 +228,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="lensmeter.right.axis" map="lensmeter.right.axis"
+ <lineedit name="lensmeter.right.grader" map="lensmeter.right.grader"
regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>
@@ -244,7 +244,7 @@
<frame layout="vbox">
<label caption="Sf:"/>
- <lineedit name="lensmeter.left.sphere" map="lensmeter.left.sphere"
+ <lineedit name="lensmeter.left.sf" map="lensmeter.left.sf"
regexp="[+-]{0,1}\d{1,2},\d{2}" script="lt20gt-25" value=""/>
</frame>
<frame layout="vbox">
@@ -254,7 +254,7 @@
</frame>
<frame layout="vbox">
<label caption="Grader:"/>
- <lineedit name="lensmeter.left.axis" map="lensmeter.left.axis"
+ <lineedit name="lensmeter.left.grader" map="lensmeter.left.grader"
regexp="[\d]+" script="lt359gt0" value=""/>
</frame>
</frame>