Commit 89b46722 authored by Eric Tobias's avatar Eric Tobias
Browse files

updated scenarios to new XML structure

parent 31b81d95
Pipeline #125 skipped
......@@ -6,7 +6,7 @@
<image>assets/bechamel_bon.png</image>
<triggerCondition>true</triggerCondition>
</scene>
<scene>
<scene>
<name>liquide</name>
<image>assets/bechamel_liquide.png</image>
<triggerCondition>Durete &lt; -0.5</triggerCondition>
......@@ -42,27 +42,27 @@
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona>
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>0</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>0</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<corona>
<type>Gauge</type>
<handle>0</handle>
......@@ -84,7 +84,7 @@
<upperBound>2000</upperBound>
<scale>1</scale>
<title>Roux</title>
<unit>gr</unit>
<unit>gr</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
......@@ -120,27 +120,27 @@
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona>
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>1</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>1</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<corona>
<type>Gauge</type>
<handle>11</handle>
......@@ -162,7 +162,7 @@
<upperBound>10</upperBound>
<scale>1</scale>
<title>Lait</title>
<unit>l</unit>
<unit>l</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
......@@ -181,84 +181,34 @@
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>
<!-- <object>
<type>ValueWidget</type>
<handles>
<handle>2</handle>
</handles>
<coronas>
<corona>
<type>Shadow</type>
<handle>2</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona> -->
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>2</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<!-- <corona>
<type>Gauge</type>
<handle>2</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<initialTranslation>
<x>-125</x>
<y>-125</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<drawPriority>2</drawPriority>
<width>250</width>
<height>250</height>
<lowerBound>1</lowerBound>
<upperBound>100</upperBound>
<scale>1</scale>
<title>Nr de personnes</title>
<unit>pieces</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
<name>NrPersonnes</name>
<definingShape></definingShape>
<networkAdapter></networkAdapter>
<lowerBound>1</lowerBound>
<upperBound>100</upperBound>
<lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle>
<stepSize>1</stepSize>
<variable>
<name>NrPersonnes</name>
<unit>piece</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>-->
<!-- <object> <type>ValueWidget</type> <handles> <handle>2</handle> </handles> <coronas> <corona> <type>Shadow</type> <handle>2</handle> <centre> <x>0</x> <y>0</y> <z>0</z> </centre> <shape>Circle</shape>
<drawPriority>0</drawPriority> </corona> -->
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>2</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<!-- <corona> <type>Gauge</type> <handle>2</handle> <centre> <x>0</x> <y>0</y> <z>0</z> </centre> <initialTranslation> <x>-125</x> <y>-125</y> <z>0</z> <state>ScreenCoordinates</state> </initialTranslation>
<drawPriority>2</drawPriority> <width>250</width> <height>250</height> <lowerBound>1</lowerBound> <upperBound>100</upperBound> <scale>1</scale> <title>Nr de personnes</title> <unit>pieces</unit> <rotateWithHandle>false</rotateWithHandle>
</corona> </coronas> <name>NrPersonnes</name> <definingShape></definingShape> <networkAdapter></networkAdapter> <lowerBound>1</lowerBound> <upperBound>100</upperBound> <lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle> <stepSize>1</stepSize> <variable> <name>NrPersonnes</name> <unit>piece</unit> <value>1</value> </variable> <modifyValueOnRotation>True</modifyValueOnRotation>
</object> -->
<object>
<type>ValueWidget</type>
<handles>
......@@ -276,27 +226,27 @@
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona>
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>2</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<!-- <corona> -->
<!-- <type>TextBox</type> -->
<!-- <handle>2</handle> -->
<!-- <centre> -->
<!-- <x>0</x> -->
<!-- <y>0</y> -->
<!-- <z>0</z> -->
<!-- </centre> -->
<!-- <drawPriority>1</drawPriority> -->
<!-- <lineWidth>100</lineWidth> -->
<!-- <font>Arial-20</font> -->
<!-- <initialTranslation> -->
<!-- <x>0</x> -->
<!-- <y>120</y> -->
<!-- <z>0</z> -->
<!-- <state>ScreenCoordinates</state> -->
<!-- </initialTranslation> -->
<!-- <rotateWithHandle>false</rotateWithHandle> -->
<!-- <centred>true</centred> -->
<!-- <text>Banana</text> -->
<!-- </corona> -->
<corona>
<type>Gauge</type>
<handle>1</handle>
......@@ -318,7 +268,7 @@
<upperBound>1</upperBound>
<scale>1</scale>
<title>Chaleur</title>
<unit>pieces</unit>
<unit>pieces</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
......@@ -337,7 +287,7 @@
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>
<object>
<object>
<type>ValueWidget</type>
<handles>
<handle>4</handle>
......@@ -452,31 +402,62 @@
</objects>
<system>
<outputs>
<output name="Personnes" />
<output name="Durete" />
<output>
<name>Personnes</name>
<unit>Pieces</unit>
</output>
<output>
<name>Durete</name>
<unit>Unit</unit>
</output>
</outputs>
<equations>
<equation name="Bechamel">
<equation>
<name>Bechamel</name>
<parameters>
<parameter name="Roux" unit="gr" />
<parameter name="Lait" unit="l" />
<parameter name="Chaleur" />
<parameter>
<name>Roux</name>
<unit>gr</unit>
</parameter>
<parameter>
<name>Lait</name>
<unit>l</unit>
</parameter>
<parameter>
<name>Chaleur</name>
<unit></unit>
</parameter>
</parameters>
<invoke>Math.min((Roux/100),Lait)</invoke>
<results>
<result name="Personnes" />
<result>
<name>Personnes</name>
<unit>Pieces</unit>
</result>
</results>
</equation>
<equation name="Durete">
<equation>
<name>Durete</name>
<parameters>
<parameter name="Roux" unit="gr" />
<parameter name="Lait" unit="l" />
<parameter name="Chaleur" />
<parameter>
<name>Roux</name>
<unit>gr</unit>
</parameter>
<parameter>
<name>Lait</name>
<unit>l</unit>
</parameter>
<parameter>
<name>Chaleur</name>
<unit></unit>
</parameter>
</parameters>
<invoke>(Roux/100) - (Lait)</invoke>
<results>
<result name="Durete" />
<result>
<name>Durete</name>
</result>
</results>
</equation>
......
......@@ -665,7 +665,7 @@
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>
<object>
<object>
<type>ValueWidget</type>
<handles>
<handle>11</handle>
......@@ -703,7 +703,7 @@
<centred>true</centred>
<text>Banana</text>
</corona>
</coronas>
<name>Savings</name>
<definingShape></definingShape>
......@@ -890,49 +890,112 @@
<system>
<outputs>
<output name="Needs" unit="€" />
<output name="Wants" unit="€" />
<output name="RemainingMoney" unit="€" />
<output>
<name>Needs</name>
<unit></unit>
</output>
<output>
<name>Wants</name>
<unit></unit>
</output>
<output>
<name>RemainingMoney</name>
<unit></unit>
</output>
</outputs>
<equations>
<equation name="Needs">
<equation>
<name>Needs</name>
<parameters>
<parameter name="FoodAndHygiene" unit="€" />
<parameter name="LoanAndRent" unit="€" />
<parameter name="Insurances" unit="€" />
<parameter name="UtilityBills" unit="€" />
<parameter name="Transport" unit="€" />
<parameter name="Clothes" unit="€" />
<parameter name="UnforeseenExpenses" unit="€" />
<parameter>
<name>FoodAndHygiene</name>
<unit></unit>
</parameter>
<parameter>
<name>LoanAndRent</name>
<unit></unit>
</parameter>
<parameter>
<name>Insurances</name>
<unit></unit>
</parameter>
<parameter>
<name>UtilityBills</name>
<unit></unit>
</parameter>
<parameter>
<name>Transport</name>
<unit></unit>
</parameter>
<parameter>
<name>Clothes</name>
<unit></unit>
</parameter>
<parameter>
<name>UnforeseenExpenses</name>
<unit></unit>
</parameter>
</parameters>
<invoke>FoodAndHygiene + LoanAndRent + Insurances + UtilityBills + Transport + Clothes + UnforeseenExpenses;</invoke>
<results>
<result name="Needs" />
<result>
<name>Needs</name>
<unit></unit>
</result>
</results>
</equation>
<equation name="Wants">
<equation>
<name>Wants</name>
<parameters>
<parameter name="Hobbies" unit="€" />
<parameter name="InternetAndTv" unit="€" />
<parameter name="Entertainment" unit="€" />
<parameter name="Others" unit="€" />
<parameter>
<name>Hobbies</name>
<unit></unit>
</parameter>
<parameter>
<name>InternetAndTv</name>
<unit></unit>
</parameter>
<parameter>
<name>Entertainment</name>
<unit></unit>
</parameter>
<parameter>
<name>Others</name>
<unit></unit>
</parameter>
</parameters>
<invoke>Hobbies + InternetAndTv + Entertainment + Others;</invoke>
<results>
<result name="Wants" />
<result>
<name>Wants</name>
<unit></unit>
</result>
</results>
</equation>
<equation name="RemainingMoney">
<equation>
<name>RemainingMoney</name>
<parameters>
<parameter name="Needs" unit="€" />
<parameter name="Wants" unit="€" />
<parameter name="Savings" unit="€" />
<parameter>
<name>Needs</name>
<unit></unit>
</parameter>
<parameter>
<name>Wants</name>
<unit></unit>
</parameter>
<parameter>
<name>Savings</name>
<unit></unit>
</parameter>
</parameters>
<invoke>700 - (Needs + Wants + Savings);</invoke>
<results>
<result name="RemainingMoney" />
<result>
<name>RemainingMoney</name>
<unit></unit>
</result>
</results>
</equation>
......
......@@ -451,32 +451,68 @@
</objects>
<system>
<outputs>
<output name="Load" unit="%" />
<output name="Ampere" unit="A" />
<output>
<name>Load</name>
<unit>%</unit>
</output>
<output>
<name>Ampere</name>
<unit>A</unit>
</output>
</outputs>
<equations>
<equation name="PowerConsumption">
<equation>
<name>PowerConsumption</name>
<parameters>
<parameter name="Lights" unit="W" />
<parameter name="Dryer" unit="W" />
<parameter name="Dishwasher" unit="W" />
<parameter name="Laptop" unit="W" />
<parameter name="Smartphone" unit="W" />
<parameter>
<name>Lights</name>
<unit>W</unit>
</parameter>
<parameter>
<name>Dryer</name>
<unit>W</unit>
</parameter>
<parameter>
<name>Dishwasher</name>
<unit>W</unit>
</parameter>
<parameter>
<name>Laptop</name>
<unit>W</unit>
</parameter>
<parameter>
<name>Smartphone</name>
<unit>W</unit>
</parameter>
</parameters>
<invoke>(Lights + Dryer + Dishwasher + Laptop + Smartphone) / 230</invoke>
<results>
<result name="Ampere" />
<result>
<name>Ampere</name>
<unit>A</unit>
</result>
</results>
</equation>
<equation name="CircuitLoad">
<equation>
<name>CircuitLoad</name>
<parameters>
<parameter name="Breaker" unit="A" />
<parameter name="Ampere" unit="A" />
<parameter>
<name>Breaker</name>
<unit>A</unit>
</parameter>
<parameter>
<name>Ampere</name>
<unit>A</unit>
</parameter>
</parameters>
<invoke>(Ampere / Breaker) * 100</invoke>
<results>
<result name="Load" />
<result>
<name>Load</name>
<unit>%</unit>
</result>
</results>
</equation>
......
......@@ -5,7 +5,7 @@
<name>Background</name>
<image>assets/checkered_tablecloth.jpg</image>
<triggerCondition>true</triggerCondition>
</scene>
</scene>
</scenes>
<objects>
......@@ -68,7 +68,7 @@
<upperBound>1000</upperBound>
<scale>1</scale>
<title>Beef</title>
<unit>gr</unit>
<unit>gr</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
......@@ -146,7 +146,7 @@
<upperBound>1000</upperBound>
<scale>1</scale>
<title>Chicken</title>
<unit>gr</unit>