I/O und If/Else/IfElse funktionieren (unverschachtelt)

src/main/java/com/ardublock/translator/block/control/ElseBlock.java

 package com.ardublock.translator.block.control;
 
+import java.util.Vector;
+
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeElse;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+
 public class ElseBlock extends TranslatorBlock
 {
 	public ElseBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -25,4 +33,18 @@ public class ElseBlock extends TranslatorBlock
 		ret = ret + "}\n";
 		return ret;
 	}
+	@Override
+	public SimCode toSim() throws BlockException, SocketNullException {
+		//FIXME In jedem Block wo mehrere Blöcke enthalten sind, ist eine Abfrage nach If Else nötig... Auslagerung?.
+		
+		Vector<SimCode> vector = new Vector<SimCode>();
+		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(0);
+		while (translatorBlock != null)
+		{
+			vector.add(translatorBlock.toSim());
+			translatorBlock = translatorBlock.nextTranslatorBlock();
+		}
+		
+		return new CodeElse(vector); 
+	}
 }

src/main/java/com/ardublock/translator/block/control/ElseIfBlock.java

 package com.ardublock.translator.block.control;
 
+import java.util.Vector;
+
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeIf;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeBool;
+
 public class ElseIfBlock extends TranslatorBlock
 {
 	public ElseIfBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -28,4 +36,19 @@ public class ElseIfBlock extends TranslatorBlock
 		ret = ret + "}\n";
 		return ret;
 	}
+	
+	@Override
+	public SimCode toSim() throws BlockException, SocketNullException {
+		//FIXME In jedem Block wo mehrere Blöcke enthalten sind, ist eine Abfrage nach If Else nötig... Auslagerung?.
+		SimTypeBool condition=new SimTypeBool(this.getRequiredTranslatorBlockAtSocket(0).toSim());
+		Vector<SimCode> vector = new Vector<SimCode>();
+		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(1);
+		while (translatorBlock != null)
+		{
+			vector.add(translatorBlock.toSim());
+			translatorBlock = translatorBlock.nextTranslatorBlock();
+		}
+		
+		return new CodeElseIf(condition,vector); 
+	}
 }

src/main/java/com/ardublock/translator/block/control/IfBlock.java

@@ -39,9 +39,8 @@ public class IfBlock extends TranslatorBlock
 	
 	@Override
 	public SimCode toSim() throws BlockException, SocketNullException {
-		//TODO Ardublock muss mein Projekt in den Buildvariabel haben
-		//TODO If Block benötigt den folgenden Block irgendwie vermutlich muss das der Loop Block durchführen
-		SimTypeBool condition= (SimTypeBool) this.getRequiredTranslatorBlockAtSocket(0).toSim();
+		//FIXME In jedem Block wo mehrere Blöcke enthalten sind, ist eine Abfrage nach If Else nötig... Auslagerung?.
+		SimTypeBool condition=new SimTypeBool(this.getRequiredTranslatorBlockAtSocket(0).toSim());
 		Vector<SimCode> vector = new Vector<SimCode>();
 		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(1);
 		while (translatorBlock != null)
@@ -49,8 +48,8 @@ public class IfBlock extends TranslatorBlock
 			vector.add(translatorBlock.toSim());
 			translatorBlock = translatorBlock.nextTranslatorBlock();
 		}
-		CodeIf output=new CodeIf(null, condition,vector); 
-		return null;
+		
+		return new CodeIf(condition,vector); 
 	}
 	
 	

src/main/java/com/ardublock/translator/block/control/IfelseBlock.java

@@ -5,6 +5,7 @@ import com.ardublock.translator.block.TranslatorBlock;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+//FIXME Unterscheidung zwischen Ifelse und Elseif nahezu unmöglich. Vorschlag: Umbennenung in IfAndElseBlock
 public class IfelseBlock extends TranslatorBlock
 {
 	public IfelseBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)

src/main/java/com/ardublock/translator/block/control/LoopBlock.java

@@ -9,6 +9,9 @@ import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
 import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeElse;
+import tec.letsgoing.ardublock.simulator.simcode.control.CodeElseIf;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeIf;
 import tec.letsgoing.ardublock.simulator.simcode.functions.SimCodeFunction;
 
 
@@ -39,10 +42,20 @@ public class LoopBlock extends TranslatorBlock
 	public SimCode toSim() throws BlockException, SocketNullException {
 		Vector<SimCode> vec =new Vector<SimCode>();
 		TranslatorBlock translatorBlock = getTranslatorBlockAtSocket(0);
+		SimCode prevSimCode=null;
 		while (translatorBlock != null)
 		{
-			vec.add(translatorBlock.toSim());
+			SimCode newSimCode = translatorBlock.toSim();
+			
 			translatorBlock = translatorBlock.nextTranslatorBlock();
+			if (newSimCode instanceof CodeElseIf ||  newSimCode instanceof CodeElse) {
+				((SimTypeIf)prevSimCode).setFollowBlock((SimTypeIf) newSimCode);
+			} else {
+				vec.add(newSimCode);
+			}
+			if (newSimCode instanceof SimTypeIf) {
+				prevSimCode=newSimCode;
+			}
 		}
 		SimCodeFunction loop =new SimCodeFunction("loop",vec);
 		return loop;

src/main/java/com/ardublock/translator/block/input/AnalogInputBlock.java

@@ -2,9 +2,15 @@ package com.ardublock.translator.block.input;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogRead;
+import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogWrite;
+
 public class AnalogInputBlock extends TranslatorBlock
 {
 	
@@ -22,5 +28,9 @@ public class AnalogInputBlock extends TranslatorBlock
 		ret = ret + ")";
 		return codePrefix + ret + codeSuffix;
 	}
+	public SimCode toSim() throws BlockException, SocketNullException {
+		TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
+		return new CodeAnalogRead(new SimTypeInt(translatorBlock.toSim()));
+	}
 
 }

src/main/java/com/ardublock/translator/block/input/DigitalInputBlock.java

@@ -2,11 +2,17 @@ package com.ardublock.translator.block.input;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 import com.ardublock.translator.block.numbers.NumberBlock;
 import com.ardublock.translator.block.numbers.VariableNumberBlock;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogRead;
+import tec.letsgoing.ardublock.simulator.simcode.io.CodeDigitalRead;
+
 public class DigitalInputBlock extends TranslatorBlock
 {
 	public DigitalInputBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -32,5 +38,9 @@ public class DigitalInputBlock extends TranslatorBlock
 		ret = ret + ")";
 		return codePrefix + ret + codeSuffix;
 	} 
+	public SimCode toSim() throws BlockException, SocketNullException {
+		TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
+		return new CodeDigitalRead(new SimTypeInt(translatorBlock.toSim()));
+	}
 
 }

src/main/java/com/ardublock/translator/block/output/AnalogOutputBlock.java

@@ -2,9 +2,14 @@ package com.ardublock.translator.block.output;
 
 import com.ardublock.translator.Translator;
 import com.ardublock.translator.block.TranslatorBlock;
+import com.ardublock.translator.block.exception.BlockException;
 import com.ardublock.translator.block.exception.SocketNullException;
 import com.ardublock.translator.block.exception.SubroutineNotDeclaredException;
 
+import tec.letsgoing.ardublock.simulator.simcode.SimCode;
+import tec.letsgoing.ardublock.simulator.simcode.datatypes.SimTypeInt;
+import tec.letsgoing.ardublock.simulator.simcode.io.CodeAnalogWrite;
+
 public class AnalogOutputBlock extends TranslatorBlock
 {
 	public AnalogOutputBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
@@ -25,6 +30,13 @@ public class AnalogOutputBlock extends TranslatorBlock
 		String ret = "analogWrite(" + portNum + " , " + value + ");\n";
 		return ret;
 	}
+	public SimCode toSim() throws BlockException, SocketNullException {
+		TranslatorBlock translatorBlock = this.getRequiredTranslatorBlockAtSocket(0);
+		SimTypeInt pin=new SimTypeInt(translatorBlock.toSim());
+		translatorBlock = this.getRequiredTranslatorBlockAtSocket(1);
+		SimTypeInt value= new SimTypeInt(translatorBlock.toSim());
+		return new CodeAnalogWrite(pin,value);
+	}
 
 }
 

src/main/java/com/ardublock/ui/listener/SimulateCodeButtonListener.java

@@ -322,9 +322,11 @@ public class SimulateCodeButtonListener implements ActionListener
 
 			//sim.addFunctionsCode(setupCode);
 			System.out.println("Add new Functions");
+			sim.stopSimu();
 			sim.resetFunctions();
 			sim.addFunctionsCode(loop);
 			sim.addFunctionsCode(main);
+			//TODO Autostart?
 			//TODO ! start simulator here
 			//sim.run();
 			//sim.startSimu();