summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsenator <senator>2010-05-27 17:53:10 +0000
committersenator <senator>2010-05-27 17:53:10 +0000
commit57934a5a16e0734384decdab06b893c831296c65 (patch)
tree077cb13f3af8561a2a6d8bb3bb0acb3bf7c29716
parent658a76862b2d446e1c0b0a4d90c4e2d9cbb7146e (diff)
added possibility for choosing more than one thing in stroma
-rw-r--r--server/xml/macros/ref-spaltelampe-1.0.xml203
1 files changed, 165 insertions, 38 deletions
diff --git a/server/xml/macros/ref-spaltelampe-1.0.xml b/server/xml/macros/ref-spaltelampe-1.0.xml
index 2e62dcd..c7ce659 100644
--- a/server/xml/macros/ref-spaltelampe-1.0.xml
+++ b/server/xml/macros/ref-spaltelampe-1.0.xml
@@ -52,10 +52,66 @@
out = out .. getValue('spaltelampe.epitel.andet.odxt') .. '\n'
end
- if ( getValue('spaltelampe.stroma.odxt') ~= '' )
- then
- out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.odxt') .. '\n'
+ if ( getValue('spaltelampe.stroma.klart.odxt') ~= '' or getValue('spaltelampe.stroma.karindvaekst.odxt') ~= '' or getValue('spaltelampe.stroma.makulering.odxt') ~= '' or getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
+ then
+ out = out .. ' Stroma: '
+ if ( getValue('spaltelampe.stroma.klart.odxt') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.klart.odxt')
+ if ( getValue('spaltelampe.stroma.karindvaekst.odxt') ~= '' or getValue('spaltelampe.stroma.makulering.odxt') ~= '' or getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.karindvaekst.odxt') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.karindvaekst.odxt')
+ if ( getValue('spaltelampe.stroma.makulering.odxt') ~= '' or getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.makulering.odxt') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.makulering.odxt')
+ if ( getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' or getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.mdfolder.odxt') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.mdfolder.odxt')
+ if ( getValue('spaltelampe.stroma.andet.odxt') ~= '' or getValue('spaltelampe.stroma.haze.odxt') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.haze.odxt') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.haze.odxt')
+ if ( getValue('spaltelampe.stroma.andet.odxt') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.andet.odxt') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.andet.odxt')
+ out = out .. '\n'
+ end
end
+
if ( getValue('spaltelampe.flap.odxt') ~= '' )
then
out = out .. ' Flap: ' .. getValue('spaltelampe.flap.odxt') .. '\n'
@@ -154,10 +210,67 @@
then
out = out .. ' Epitel: ' .. getValue('spaltelampe.epitel.osin') .. '\n'
end
- if ( getValue('spaltelampe.stroma.osin') ~= '' )
- then
- out = out .. ' Stroma: ' .. getValue('spaltelampe.stroma.osin') .. '\n'
+
+ if ( getValue('spaltelampe.stroma.klart.osin') ~= '' or getValue('spaltelampe.stroma.karindvaekst.osin') ~= '' or getValue('spaltelampe.stroma.makulering.osin') ~= '' or getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
+ then
+ out = out .. ' Stroma: '
+ if ( getValue('spaltelampe.stroma.klart.osin') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.klart.osin')
+ if ( getValue('spaltelampe.stroma.karindvaekst.osin') ~= '' or getValue('spaltelampe.stroma.makulering.osin') ~= '' or getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.karindvaekst.osin') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.karindvaekst.osin')
+ if ( getValue('spaltelampe.stroma.makulering.osin') ~= '' or getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.makulering.osin') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.makulering.osin')
+ if ( getValue('spaltelampe.stroma.mdfolder.osin') ~= '' or getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.mdfolder.osin') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.mdfolder.osin')
+ if ( getValue('spaltelampe.stroma.andet.osin') ~= '' or getValue('spaltelampe.stroma.haze.osin') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.haze.osin') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.haze.osin')
+ if ( getValue('spaltelampe.stroma.andet.osin') ~= '' )
+ then
+ out = out .. ', '
+ else
+ out = out .. '\n'
+ end
+ end
+ if ( getValue('spaltelampe.stroma.andet.osin') ~= '' )
+ then
+ out = out .. getValue('spaltelampe.stroma.andet.osin')
+ out = out .. '\n'
+ end
end
+
if ( getValue('spaltelampe.flap.osin') ~= '' )
then
out = out .. ' Flap: ' .. getValue('spaltelampe.flap.osin') .. '\n'
@@ -321,24 +434,31 @@
<frame layout="vbox">
<label caption="Stroma:"/>
<label/>
+ <label/>
+ <label/>
+ <label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.stroma.odxt" layout="vbox" value="Klart">
- <item caption="Ikke udfyldt" value=""/>
- <item caption="Klart" value="Klart"/>
- <item caption="Karindvækst" value="Karindvækst"/>
- <item caption="Makulering" value="Makulering"/>
- <item caption="MD-folder" value="MD-folder"/>
- <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
- <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
- <item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
- <item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
- <item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.stroma.andet.odxt">
- <label caption="Andet:"/>
- <lineedit name="spaltelampe.stroma.andet.odxt"/>
- </altitem>
- </altcombobox>
+ <checkbox name="spaltelampe.stroma.klart.odxt" caption="Klart" falsevalue="" truevalue="Klart"/>
+ <checkbox name="spaltelampe.stroma.karindvaekst.odxt" caption="Karindvækst" falsevalue="" truevalue="Karindvækst"/>
+ <checkbox name="spaltelampe.stroma.makulering.odxt" caption="Makulering" falsevalue="" truevalue="Makulering"/>
+ <checkbox name="spaltelampe.stroma.mdfolder.odxt" caption="MD-folder" falsevalue="" truevalue="MD-folder"/>
+ <frame layout="hbox">
+ <label caption="Haze:"/>
+ <combobox name="spaltelampe.stroma.haze.odxt" layout="vbox" value="">
+ <item caption="Ingen" value=""/>
+ <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
+ <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
+ <item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
+ <item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
+ <item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
+ </combobox>
+ <spacer/>
+ </frame>
+ <frame layout="hbox">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.stroma.andet.odxt"/>
+ </frame>
</frame>
</frame>
@@ -511,24 +631,31 @@
<frame layout="vbox">
<label caption="Stroma:"/>
<label/>
+ <label/>
+ <label/>
+ <label/>
</frame>
<frame layout="vbox">
- <altcombobox name="spaltelampe.stroma.osin" layout="vbox" value="Klart">
- <item caption="Ikke udfyldt" value=""/>
- <item caption="Klart" value="Klart"/>
- <item caption="Karindvækst" value="Karindvækst"/>
- <item caption="Makulering" value="Makulering"/>
- <item caption="MD-folder" value="MD-folder"/>
- <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
- <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
- <item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
- <item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
- <item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
- <altitem caption="Andet" value="andet" layout="hbox" innerwidget="spaltelampe.stroma.andet.osin">
- <label caption="Andet:"/>
- <lineedit name="spaltelampe.stroma.andet.osin"/>
- </altitem>
- </altcombobox>
+ <checkbox name="spaltelampe.stroma.klart.osin" caption="Klart" falsevalue="" truevalue="Klart"/>
+ <checkbox name="spaltelampe.stroma.karindvaekst.osin" caption="Karindvækst" falsevalue="" truevalue="Karindvækst"/>
+ <checkbox name="spaltelampe.stroma.makulering.osin" caption="Makulering" falsevalue="" truevalue="Makulering"/>
+ <checkbox name="spaltelampe.stroma.mdfolder.osin" caption="MD-folder" falsevalue="" truevalue="MD-folder"/>
+ <frame layout="hbox">
+ <label caption="Haze:"/>
+ <combobox name="spaltelampe.stroma.haze.osin" layout="vbox" value="">
+ <item caption="Ingen" value=""/>
+ <item caption="Spor af haze - grad 0,5" value="Spor af haze - grad 0,5"/>
+ <item caption="Let haze - grad 1" value="Let haze - grad 1"/>
+ <item caption="Nogen haze - grad 2" value="Nogen haze - grad 2"/>
+ <item caption="Udtalt haze - grad 3" value="Udtalt haze - grad 3"/>
+ <item caption="Massiv haze - grad 4" value="Massiv haze - grad 4"/>
+ </combobox>
+ <spacer/>
+ </frame>
+ <frame layout="hbox">
+ <label caption="Andet:"/>
+ <lineedit name="spaltelampe.stroma.andet.osin"/>
+ </frame>
</frame>
</frame>