Commit 73686f34 authored by Valérie Maquil's avatar Valérie Maquil

merging

parents 24ea60b2 b28a4aa0
# 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
......@@ -139,7 +139,7 @@
<unit>Wind Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -194,7 +194,7 @@
<unit>Wind Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -249,7 +249,7 @@
<unit>Wind Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -304,7 +304,7 @@
<unit>Wind Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -359,7 +359,7 @@
<unit>Wind Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
......@@ -417,7 +417,7 @@
<unit>Solar Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -472,7 +472,7 @@
<unit>Solar Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -527,7 +527,7 @@
<unit>Solar Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -582,7 +582,7 @@
<unit>Solar Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
<type>ValueWidget</type>
......@@ -637,7 +637,7 @@
<unit>Solar Park</unit>
<value>1</value>
</variable>
<modifyValueOnRotation>True</modifyValueOnRotation>
<modifyValueOnRotation>false</modifyValueOnRotation>
</object>
<object>
......
......@@ -29,8 +29,11 @@ adapter.class = lu.list.itis.dkd.tui.adapter.TuioAdapter
# The location and name of the root bootstrapping file.
bootstrapping.root = test/Windmill(4).xml
# Properties for the equation system
scriptEngine.executable = C:/Octave/Octave-3.8.2/bin/octave.exe
scriptEngine.workingDir = model
equation.system = test/Windmill(4).xml
scenario.description = test/Windmill(4).xml
......@@ -69,10 +69,10 @@ public class Scenario {
* thrown when the provided URI could not be interpreted and, hence, the scenario
* description document loaded.
*/
public Scenario() throws BuildException {
public Scenario(String file) throws BuildException {
try {
equationSystemBuilder = new EquationSystemBuilder();
equationSystemBuilder.parseEquationFile(new File(PropertiesFetcher.fetchProperties().getProperty("equation.system"))); //$NON-NLS-1$
equationSystemBuilder.parseEquationFile(new File(PropertiesFetcher.fetchProperties(file).getProperty("equation.system"))); //$NON-NLS-1$
} catch (final EquationSystemException exception) {
throw new BuildException("The equation system for this scenario could not be built!", exception); //$NON-NLS-1$
}
......@@ -80,7 +80,7 @@ public class Scenario {
inputs = equationSystemBuilder.getInputVariables();
outputs = equationSystemBuilder.getOutputVariables();
tangibleApplication = new TangibleApplicationBootstrapper(null);
tangibleApplication = new TangibleApplicationBootstrapper(file);
populateVariables();
......@@ -131,9 +131,8 @@ public class Scenario {
* @throws BuildException
*/
public static void main(String[] args) throws BuildException {
Preconditions.checkArgument(args.length == 0, "No parameters are accepted!"); //$NON-NLS-1$
Preconditions.checkArgument(args.length == 1, "1 parameter needed"); //$NON-NLS-1$
@SuppressWarnings("unused")
final Scenario scenario = new Scenario();
final Scenario scenario = new Scenario(args[0]);
}
}
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment