Commit bf3fabe6 authored by Valérie Maquil's avatar Valérie Maquil

Cleaned up the scenarios

Each scenario has now its own folder. Updated the paths in the xml
accordingly
parent 06b2140a
# Properties for the Logger
logger.event.output.location = log.txt
logger.event.output.enabled = false
logger.level = ALL
logger.event.configuration = logger.xml
# Widget IDs to be mapped
# Properties for calibrating the interface
frameTitle = NUI Application
windowWidth = 1920
windowHeight = 1080
fullScreen = false
font = Arial
fontSize = 13
colour = BLACK
centred = false
# Properties for the calibration of the object manager
#The value below is best left at or above 1024
cursor.id.remapping.constant = 1024
# The low-level computer vision (or similar) adapter to load.
# Syntax is : adapter.class = packageName.ClassName
adapter.class = lu.list.itis.dkd.tui.adapter.TuioAdapter
# The location and name of the root bootstrapping file.
bootstrapping.root = circuit_scenario.xml
# Properties for the equation system
scriptEngine.executable = C:/Octave/Octave-3.8.2/bin/octave.exe
scriptEngine.workingDir = model
equation.system = circuit_scenario.xml
scenario.description = circuit_scenario.xml
\ No newline at end of file
# Properties for the Logger
logger.event.output.location = log.txt
logger.event.output.enabled = false
logger.level = ALL
logger.event.configuration = logger.xml
# Widget IDs to be mapped
# Properties for calibrating the interface
frameTitle = NUI Application
windowWidth = 1920
windowHeight = 1080
fullScreen = false
font = Arial
fontSize = 13
colour = BLACK
centred = false
# Properties for the calibration of the object manager
#The value below is best left at or above 1024
cursor.id.remapping.constant = 1024
# The low-level computer vision (or similar) adapter to load.
# Syntax is : adapter.class = packageName.ClassName
adapter.class = lu.list.itis.dkd.tui.adapter.TuioAdapter
# The location and name of the root bootstrapping file.
bootstrapping.root = gear_scenario_uni.xml
# Properties for the equation system
scriptEngine.executable = C:/Octave/Octave-3.8.2/bin/octave.exe
scriptEngine.workingDir = model
equation.system = gear_scenario_uni.xml
scenario.description = gear_scenario_uni.xml
\ No newline at end of file
# Properties for the Logger
logger.event.output.location = log.txt
logger.event.output.enabled = false
logger.level = ALL
logger.event.configuration = logger.xml
# Widget IDs to be mapped
# Properties for calibrating the interface
frameTitle = NUI Application
windowWidth = 1920
windowHeight = 1080
fullScreen = false
font = Arial
fontSize = 13
colour = BLACK
centred = false
# Properties for the calibration of the object manager
#The value below is best left at or above 1024
cursor.id.remapping.constant = 1024
# The low-level computer vision (or similar) adapter to load.
# Syntax is : adapter.class = packageName.ClassName
adapter.class = lu.list.itis.dkd.tui.adapter.TuioAdapter
# The location and name of the root bootstrapping file.
bootstrapping.root = power_scenario.xml
# Properties for the equation system
scriptEngine.executable = C:/Octave/Octave-3.8.2/bin/octave.exe
scriptEngine.workingDir = model
equation.system = power_scenario.xml
scenario.description = power_scenario.xml
\ No newline at end of file
......@@ -4,8 +4,8 @@
<!-- Template Scene: Copy for each scene -->
<scene>
<name>Background0</name> <!-- The name of the scene -->
<image>scenarios/image.png</image> <!-- The image file name: needs to be 1920x1080 px -->
<sound>scenarios/sound.wav</sound> <!-- The sound file name -->
<image>scenarios/00_template/image.png</image> <!-- The image file name: needs to be 1920x1080 px -->
<sound>scenarios/00_template/sound.wav</sound> <!-- The sound file name -->
<triggerCondition>output &gt; 100</triggerCondition> <!-- Condition: &gt; &lt; == != &amp;&amp; -->
<drawPriority>0</drawPriority> <!-- Smaller drawing priority is occluded by bigger drawing priority -->
</scene>
......@@ -53,7 +53,7 @@
<width>200</width> <!-- width of the gauge -->
<height>200</height><!-- height of the gauge -->
<lowerBound>0</lowerBound> <!-- lowerbound: min value -->
<upperBound>2000</upperBound> <!-- upperbound: max value -->
<upperBound>100</upperBound> <!-- upperbound: max value -->
<drawPriority>270</drawPriority> <!-- needs to be different for each corona -->
<scale>1</scale>
<title/>
......@@ -72,7 +72,7 @@
<type>ConditionalCorona</type>
<drawPriority>273</drawPriority> <!-- needs to be different for each corona -->
<rotateWithHandle>false</rotateWithHandle> <!-- if true it rotates with the object -->
<image>scenarios/image2.png</image> <!-- The image file name -->
<image>scenarios/00_template/image2.png</image> <!-- The image file name -->
<triggerCondition>true</triggerCondition> <!-- Condition: &gt; &lt; == != &amp;&amp; -->
<spinOnCoronaCentre>false</spinOnCoronaCentre>
<triggers>
......
<?xml version="1.0" encoding="UTF-8"?>
<scenario>
<scenes>
<scene>
<name>bon</name>
<image>assets/bechamel_bon.png</image>
<triggerCondition>Durete &gt; -0.3 &amp;&amp; Durete &lt; 0.3</triggerCondition>
<drawPriority>2</drawPriority>
</scene>
<scene>
<name>liquide</name>
<image>assets/bechamel_liquide.png</image>
<triggerCondition>Durete &lt; -0.3</triggerCondition>
<drawPriority>2</drawPriority>
</scene>
<scene>
<name>solide</name>
<image>assets/bechamel_solide.png</image>
<triggerCondition>Durete &gt; 0.3</triggerCondition>
<drawPriority>2</drawPriority>
</scene>
<scene>
<name>vide</name>
<image>assets/bechamel_vide.png</image>
<triggerCondition>Chaleur == 0</triggerCondition>
<drawPriority>3</drawPriority>
</scene>
</scenes>
<objects>
<object>
<type>ValueWidget</type>
<handles>
<handle>0</handle>
</handles>
<coronas>
<corona>
<type>Shadow</type>
<handle>0</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona>
<corona>
<type>Gauge</type>
<handle>0</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>0</lowerBound>
<upperBound>2000</upperBound>
<scale>1</scale>
<title>Roux</title>
<unit>gr</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
<name>Roux</name>
<definingShape></definingShape>
<networkAdapter></networkAdapter>
<lowerBound>0</lowerBound>
<upperBound>2000</upperBound>
<lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle>
<stepSize>1</stepSize>
<variable>
<name>Roux</name>
<unit>gr</unit>
<value>0</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
<handles>
<handle>11</handle>
</handles>
<coronas>
<corona>
<type>Shadow</type>
<handle>11</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona>
<corona>
<type>Gauge</type>
<handle>11</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>0</lowerBound>
<upperBound>10</upperBound>
<scale>1</scale>
<title>Lait</title>
<unit>l</unit>
<rotateWithHandle>false</rotateWithHandle>
</corona>
</coronas>
<name>Lait</name>
<definingShape></definingShape>
<networkAdapter></networkAdapter>
<lowerBound>0</lowerBound>
<upperBound>10</upperBound>
<lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle>
<stepSize>1</stepSize>
<variable>
<name>Lait</name>
<unit>l</unit>
<value>0</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
<handles>
<handle>1</handle>
</handles>
<coronas>
<corona>
<type>Shadow</type>
<handle>1</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<shape>Circle</shape>
<drawPriority>0</drawPriority>
</corona>
<corona>
<type>ConditionalCorona</type>
<handle>1</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<initialTranslation>
<x>-150</x>
<y>-150</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<drawPriority>2</drawPriority>
<width>200</width>
<height>200</height>
<drawPriority>2</drawPriority>
<image>assets/chaleur_on.png</image>
<rotateWithHandle>false</rotateWithHandle>
<triggerCondition>Chaleur == 1</triggerCondition>
</corona>
<corona>
<type>Image</type>
<handle>1</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<initialTranslation>
<x>-150</x>
<y>-150</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<drawPriority>3</drawPriority>
<width>200</width>
<height>200</height>
<drawPriority>2</drawPriority>
<image>assets/chaleur_off.png</image>
<rotateWithHandle>false</rotateWithHandle>
<!-- <triggerCondition>Chaleur == 0</triggerCondition> -->
</corona>
</coronas>
<name>Chaleur</name>
<definingShape></definingShape>
<networkAdapter></networkAdapter>
<lowerBound>0</lowerBound>
<upperBound>1</upperBound>
<lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle>
<stepSize>1</stepSize>
<variable>
<name>Chaleur</name>
<unit>piece</unit>
<value>0</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
<handles>
<handle>4</handle>
</handles>
<coronas>
<corona>
<type>Shadow</type>
<handle>4</handle>
<centre>
<x>0</x>
<y>0</y>
<z>0</z>
</centre>
<shape>RoundedSquare</shape>
<drawPriority>0</drawPriority>
</corona>
<corona>
<type>TextBox</type>
<handle>4</handle>
<centre>
<x>50</x>
<y>50</y>
<z>0</z>
</centre>
<drawPriority>1</drawPriority>
<rotateWithHandle>false</rotateWithHandle>
<lineWidth>100</lineWidth>
<font>Arial-20</font>
<colour>black</colour>
<initialTranslation>
<x>0</x>
<y>75</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<text>Banana</text>
<centred>true</centred>
</corona>
</coronas>
<name>Personnes</name>
<definingShape></definingShape>
<networkAdapter></networkAdapter>
<lowerBound>0</lowerBound>
<upperBound>1</upperBound>
<lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle>
<stepSize>1</stepSize>
<variable>
<name>Personnes</name>
<unit>Pieces</unit>
<value>0</value>
</variable>
<modifyValueOnRotation>False</modifyValueOnRotation>
<dynamic>true</dynamic>
</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>RoundedSquare</shape>
<drawPriority>0</drawPriority>
</corona>
<corona>
<type>TextBox</type>
<handle>2</handle>
<centre>
<x>50</x>
<y>50</y>
<z>0</z>
</centre>
<drawPriority>1</drawPriority>
<lineWidth>100</lineWidth>
<font>Arial-20</font>
<colour>black</colour>
<initialTranslation>
<x>0</x>
<y>75</y>
<z>0</z>
<state>ScreenCoordinates</state>
</initialTranslation>
<centred>true</centred>
<rotateWithHandle>false</rotateWithHandle>
<text>Banana</text>
</corona>
</coronas>
<name>Durete</name>
<definingShape></definingShape>
<networkAdapter></networkAdapter>
<lowerBound>0</lowerBound>
<upperBound>1</upperBound>
<lowerStopAngle>0</lowerStopAngle>
<upperStopAngle>6.28318530718</upperStopAngle>
<stepSize>1</stepSize>
<variable>
<name>Durete</name>
<unit>Unit</unit>
<value>0</value>
</variable>
<modifyValueOnRotation>False</modifyValueOnRotation>
<dynamic>true</dynamic>
</object>
</objects>
<system>
<outputs>
<output>
<name>Personnes</name>
<unit>Pieces</unit>
</output>
<output>
<name>Durete</name>
<unit>Unit</unit>
</output>
</outputs>
<equations>
<equation>
<name>Bechamel</name>
<parameters>
<parameter>
<name>Roux</name>
<unit>gr</unit>
</parameter>
<parameter>
<name>Lait</name>
<unit>l</unit>
</parameter>
<parameter>
<name>Chaleur</name>
<unit>none</unit>
</parameter>
</parameters>
<invoke>Math.min((Roux/100),Lait)</invoke>