Commit 96acfb10 authored by moll's avatar moll
Browse files

Adaptions to tulip-cps 1.4.0; trigger sound not in paint

parent df185030
......@@ -28,12 +28,12 @@
<dependency>
<groupId>lu.list.itis.dkd.tui</groupId>
<artifactId>tulip</artifactId>
<version>2.3.1</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>lu.list.itis.dkd.tui</groupId>
<artifactId>tulip-cps</artifactId>
<version>1.3.1</version>
<version>1.4.0</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
......@@ -31,8 +31,9 @@ bootstrapping.root = circuit_scenario.xml
# Properties for the equation system
scriptEngine.executable = C:/Octave/Octave-3.8.2/bin/octave.exe
scriptEngine.workingDir = model
executor.class = lu.list.itis.dkd.tui.cps.system.executor.JavascriptExecutor
numeric.variable.class = lu.list.itis.dkd.tui.cps.variable.tangible.TangibleNumericalVariable
equation.system = circuit_scenario.xml
scenario.description = circuit_scenario.xml
......
# Properties for the Logger
logger.event.output.location = log.txt
logger.event.output.enabled = false
......@@ -31,12 +32,6 @@ bootstrapping.root = light_scenario.xml
# Properties for the equation system
#scriptEngine.executable = C:/Octave/Octave-3.8.2/bin/octave.exe
#scriptEngine.workingDir = model
executor.class=lu.list.itis.dkd.tui.cps.system.executor.JavascriptExecutor
variable.class=lu.list.itis.dkd.tui.cps.variable.tangible.TangibleNumericalVariable
equation.system = light_scenario.xml
scenario.description = light_scenario.xml
executor.class = lu.list.itis.dkd.tui.cps.system.executor.JavascriptExecutor
numeric.variable.class = lu.list.itis.dkd.tui.cps.variable.tangible.TangibleNumericalVariable
logic.variable.class = lu.list.itis.dkd.tui.cps.variable.BooleanVariable
/**
* Copyright Luxembourg Institute of Science and Technology, 2016.
*
......@@ -72,8 +73,8 @@ public class Scenario {
* description document loaded.
*/
public Scenario(String file) throws BuildException {
properties = PropertiesFetcher.fetchProperties(file);
try {
properties = PropertiesFetcher.fetchProperties(file);
equationSystemBuilder = new EquationSystemBuilder(properties);
equationSystemBuilder.parseEquationFile(new File(properties.getProperty("equation.system"))); //$NON-NLS-1$
} catch (final EquationSystemException exception) {
......
......@@ -26,6 +26,7 @@ import lu.list.itis.dkd.tui.TangibleContentManager;
import lu.list.itis.dkd.tui.content.Content;
import lu.list.itis.dkd.tui.cps.system.Equation;
import lu.list.itis.dkd.tui.cps.system.Mapping;
import lu.list.itis.dkd.tui.cps.system.executor.JavascriptExecutor;
import lu.list.itis.dkd.tui.cps.variable.BooleanVariable;
import lu.list.itis.dkd.tui.cps.variable.Variable;
import lu.list.itis.dkd.tui.exception.BuildException;
......@@ -77,6 +78,7 @@ public class Scene extends Content {
private boolean triggered = false;
private AudioInputStream audioIn;
private AudioInputStream audioStream;
private boolean isPlaying;
/**
* Constructor initializing all fields.
......@@ -110,10 +112,12 @@ public class Scene extends Content {
variables.add(triggerVariable);
}
final LinkedHashSet<Variable> triggerVariables = new LinkedHashSet<Variable>();
// trigger = new Equation(new Mapping(variables, triggerVariable), triggerCondition);
triggerVariables.add(triggerVariable);
trigger = new Equation(new Mapping(variables, triggerVariables), triggerCondition);
final LinkedHashSet<Variable> outputs = new LinkedHashSet<>();
outputs.add(triggerVariable);
trigger = new Equation(new Mapping(variables, outputs), triggerCondition);
trigger.setExecutor(new JavascriptExecutor());
try {
final Element imageNode = element.getChild(Externalization.IMAGE_ELEMENT);
......@@ -132,7 +136,6 @@ public class Scene extends Content {
final Element imageBase64Node = element.getChild(Externalization.IMAGE_BASE64_ELEMENT);
if ((null != imageBase64Node) && (imageBase64Node.getText() != "")) { //$NON-NLS-1$
final String[] tokens = (imageBase64Node.getText()).split(","); //$NON-NLS-1$
// System.out.println(tokens[1]);
byte[] imageByte;
imageByte = Base64.getDecoder().decode(tokens[1]);
final ByteArrayInputStream bis = new ByteArrayInputStream(imageByte);
......@@ -170,9 +173,10 @@ public class Scene extends Content {
final Element soundBase64Node = element.getChild(Externalization.SOUND_BASE64_NODE);
if ((null != soundBase64Node) && (soundBase64Node.getText() != "")) { //$NON-NLS-1$
final String[] tokens = (soundBase64Node.getText()).split(","); //$NON-NLS-1$
// System.out.println(tokens[1]);
final byte[] soundByte = Base64.getDecoder().decode(tokens[1]);
audioIn = AudioSystem.getAudioInputStream(new ByteArrayInputStream(soundByte));
final byte[] soundByte = Base64.getDecoder().decode(tokens[1]).clone();
final ByteArrayInputStream ais = new ByteArrayInputStream(soundByte);
audioIn = AudioSystem.getAudioInputStream(ais);
audioClip = AudioSystem.getClip();
audioClip.open(audioIn);
......@@ -211,26 +215,21 @@ public class Scene extends Content {
triggered = false;
}
if (triggerVariable.getValue() && !triggered) {
playSound();
}
return triggerVariable.getValue();
}
/** {@inheritDoc} */
@Override
public void paint(Graphics2D canvas) {
// canvas.drawImage(scenery, 0, 0, null);
if (scenery != null) {
scenery.paintIcon(null, canvas, 0, 0);
}
if ((!triggered) && (audioClip != null)) {
audioClip.setFramePosition(0);
audioClip.start();
triggered = true;
}
}
/** {@inheritDoc} */
@Override
public void initialise() {
......@@ -239,4 +238,21 @@ public class Scene extends Content {
/**
* @throws IOException
* @throws LineUnavailableException
*
*/
public void playSound() {
if (audioClip != null && !isPlaying && !triggered) {
triggered = true;
audioClip.setFramePosition(0);
audioClip.start();
// audioClip.drain();
// audioClip.loop(1);
}
}
}
\ No newline at end of file
/**
* Copyright Luxembourg Institute of Science and Technology, 2016.
*
......@@ -23,8 +24,6 @@ package lu.list.itis.dkd.tui.scenario;
import lu.list.itis.dkd.dbc.annotation.NonNullByDefault;
import lu.list.itis.dkd.tui.TangibleContentManager;
import lu.list.itis.dkd.tui.content.Content;
import lu.list.itis.dkd.tui.cps.system.executor.Executor;
import lu.list.itis.dkd.tui.cps.system.executor.JavascriptExecutor;
import lu.list.itis.dkd.tui.event.ContentEvent;
import java.util.ArrayList;
......@@ -32,6 +31,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
/**
* @author Eric Tobias [eric.tobias@list.lu]
* @since 1.0
......@@ -41,13 +43,11 @@ import java.util.Map;
public class StageManager extends TangibleContentManager {
private static final StageManager INSTANCE = new StageManager();
private static Map<String, Scene> scenes;
// private static ScriptEngine scriptEngine;
private static Executor scriptEngine;
private static ScriptEngine scriptEngine;
ArrayList<Content> drawableContents = new ArrayList<>();
private StageManager() {
scriptEngine = new JavascriptExecutor();
// scriptEngine = new ScriptEngineManager().getEngineByName("js"); //$NON-NLS-1$
scriptEngine = new ScriptEngineManager().getEngineByName("js"); //$NON-NLS-1$
}
/**
......@@ -65,7 +65,6 @@ public class StageManager extends TangibleContentManager {
public static void setScenes(Map<String, Scene> _scenes) {
scenes = _scenes;
// scenes.values().forEach(scene -> scene.getTrigger().setScriptEngine(scriptEngine));
scenes.values().forEach(scene -> scene.getTrigger().setExecutor(scriptEngine));
}
......@@ -89,8 +88,7 @@ public class StageManager extends TangibleContentManager {
}
}
Collections.sort(drawableContents);
return drawableContents;
return drawableContents;
}
}
\ 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