diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java index 40c96ac5479a1e5d605b0e65f2a8b5f16e0ee60c..e9939a2eaea3c150eff8b6006850883918c614c9 100644 --- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java +++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java @@ -121,7 +121,9 @@ public class Arduino { } public void serialPrint(String content) { + if (!stopFlag) { gui.serialPrint(content); + } } public void addFunction(SimCodeFunction function) { diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java index 128ba12cd5dc4572e479e7f7d9582bb8bca18161..f506535ab8ed64ab2cd576606caaa65ec4ad6cd4 100644 --- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java +++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElse.java @@ -36,8 +36,6 @@ public class CodeElse extends SimTypeIf { public String toString() { return null; } - public void setFollowBlock(SimTypeIf _follow) { - - } + } diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java index c0c62aacfb766487996c3de76ac532fba1b0b254..e342fc22243d5625e366886b76c84eb82a5945d2 100644 --- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java +++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeElseIf.java @@ -21,8 +21,8 @@ public class CodeElseIf extends SimTypeIf { private SimTypeBool condition; private Vector<SimCode> codeBlocks; - public CodeElseIf(SimTypeBool _condition, Vector<SimCode> _vec) { - + public CodeElseIf(SimTypeIf _follow,SimTypeBool _condition, Vector<SimCode> _vec) { + follow = _follow; condition = _condition; codeBlocks = _vec; } @@ -41,11 +41,7 @@ public class CodeElseIf extends SimTypeIf { return null; } } - -public void setFollowBlock(SimTypeIf _follow) { - follow = _follow; - } - + @Override public String toString() { diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java index bb897ef4528a599c9745e7dc861d16f332ffbc59..1013aca58657d6a1bfc4273f93bdfd76b86f2eeb 100644 --- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java +++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeIf.java @@ -22,10 +22,10 @@ public class CodeIf extends SimTypeIf { private SimTypeBool condition; private Vector<SimCode> codeBlocks; - public CodeIf(SimTypeBool _condition, Vector<SimCode> _vec) { + public CodeIf(SimTypeIf _follow,SimTypeBool _condition, Vector<SimCode> _vec) { condition = _condition; codeBlocks = _vec; - + follow = _follow; } /** @@ -43,10 +43,7 @@ public class CodeIf extends SimTypeIf { } } - - public void setFollowBlock(SimTypeIf _follow) { - follow = _follow; - } + public String toString() { return null; diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java index c82cc4ce50927dbfda402b17b72025de356419c6..21612c26cc339e6c74ec0c2345e7d6ac82b2d0fd 100644 --- a/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java +++ b/src/tec/letsgoing/ardublock/simulator/simcode/datatypes/SimTypeIf.java @@ -22,6 +22,5 @@ public abstract class SimTypeIf extends SimCode { @Override public abstract String toString(); - public abstract void setFollowBlock(SimTypeIf _follow); } diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java index 2b239bf94c3a1be718dd77820bc97b8fe498853f..e282cabf87eeb53ece95ec0bf8cfe0cd664dc2d0 100644 --- a/src/tec/letsgoing/ardublock/simulator/view/GUI.java +++ b/src/tec/letsgoing/ardublock/simulator/view/GUI.java @@ -86,7 +86,7 @@ public class GUI extends JFrame implements Runnable, ActionListener { mainPane.add(createControlPanel(simu), BorderLayout.LINE_END); mainPane.add(createSerialLog(), BorderLayout.PAGE_END); this.pack(); - System.out.println(modules[2].getPane().getLocation()); + //this.setLocation(-1300, 0); //FIXME Code to Run the Window on second screen this.setVisible(true);