Added GUI Images and Simcode functionality

src/tec/letsgoing/ardublock/simulator/simcode/SimCode.java

@@ -3,6 +3,8 @@
  */
 package tec.letsgoing.ardublock.simulator.simcode;
 
+import java.util.Vector;
+
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 
 /**
@@ -10,7 +12,18 @@ import tec.letsgoing.ardublock.simulator.arduino.Arduino;
  *
  */
 public abstract class SimCode {
+	protected Object returnValue=true;
+	protected Vector<Object> arguments=new Vector<Object>();
+	//TODO temporären Funktionsstack implementieren.
 
 	public abstract void run(Arduino ArduinoClass); // TODO Wie wird man an die Functions kommen?
 	
+	public Object getReturn() {
+		return returnValue;
+	}
+	
+	public void setArguments(Vector<Object> _arguments) {
+		arguments=_arguments;
+	}
+	
 	}

src/tec/letsgoing/ardublock/simulator/view/GUI.java

@@ -72,14 +72,13 @@ public class GUI extends JFrame implements Runnable {
 	@Override
 	public void run() {
 		while (!stopFlag) {
-			System.out.println("Gui");
-			super.repaint();
 			try {
-				Thread.sleep(500);
+				Thread.sleep(7);
 			} catch (InterruptedException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
+			super.repaint();
 		}
 	}
 

src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java

@@ -3,10 +3,16 @@
  */
 package tec.letsgoing.ardublock.simulator.view.modules;
 
+import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
 import java.util.Observable;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JLabel;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.arduino.Pin;
@@ -19,10 +25,13 @@ public class ArduinoUno extends Modul {
 	Arduino arduino;
 
 	public ArduinoUno() {
-		JButton test = new JButton("Arduino");
-		test.setSize(200, 100);
-		layerpane.add(test);
-		layerpane.setPreferredSize(new Dimension(200, 100));
+		layerpane.setPreferredSize(new Dimension(587, 418));		
+		JLabel chiplabel = new JLabel();
+		ImageIcon chipIcon = new ImageIcon("res/ArduinoUno.png");
+		chipIcon=new ImageIcon(chipIcon.getImage().getScaledInstance(587, 418, Image.SCALE_SMOOTH));
+		chiplabel.setIcon(chipIcon);
+		chiplabel.setSize(587, 418);
+		layerpane.add(chiplabel, 1);
 	}
 
 	public void updateModul(Pin arg0) {

src/tec/letsgoing/ardublock/simulator/view/modules/Button.java

@@ -4,9 +4,12 @@
 package tec.letsgoing.ardublock.simulator.view.modules;
 
 import java.awt.Dimension;
+import java.awt.Image;
 import java.util.Observable;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JLabel;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.arduino.Pin;
@@ -18,10 +21,12 @@ import tec.letsgoing.ardublock.simulator.arduino.Pin;
 public class Button extends Modul {
 
 	public Button() {
-		JButton test = new JButton("Button");
-		test.setSize(100, 100);
-		layerpane.add(test);
-		layerpane.setPreferredSize(new Dimension(100, 100));
+		layerpane.setPreferredSize(new Dimension(294, 294));		
+		JLabel chiplabel = new JLabel();
+		ImageIcon chipIcon = new ImageIcon("res/PM26_Taster.png");
+		chiplabel.setIcon(chipIcon);
+		chiplabel.setSize(294, 294);
+		layerpane.add(chiplabel, 1);
 	}
 
 	public void updateModul(Pin pin) {

src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java

@@ -6,7 +6,9 @@ package tec.letsgoing.ardublock.simulator.view.modules;
 import java.awt.Dimension;
 import java.util.Observable;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JLabel;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.arduino.Pin;
@@ -19,10 +21,12 @@ public class Poti extends Modul {
 	int value = 0;
 
 	public Poti() {
-		JButton test = new JButton("Poti");
-		test.setSize(100, 100);
-		layerpane.add(test);
-		layerpane.setPreferredSize(new Dimension(100, 100));
+		layerpane.setPreferredSize(new Dimension(294, 294));		
+		JLabel chiplabel = new JLabel();
+		ImageIcon chipIcon = new ImageIcon("res/PM24_Potentiometer.png");
+		chiplabel.setIcon(chipIcon);
+		chiplabel.setSize(294, 294);
+		layerpane.add(chiplabel, 1);
 
 	}
 

src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java

@@ -5,10 +5,14 @@ package tec.letsgoing.ardublock.simulator.view.modules;
 
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.util.Observable;
 import java.util.Observer;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JLabel;
 
 import tec.letsgoing.ardublock.simulator.arduino.Arduino;
 import tec.letsgoing.ardublock.simulator.arduino.Pin;
@@ -19,15 +23,30 @@ import tec.letsgoing.ardublock.simulator.arduino.Pin;
  */
 public class RGB extends Modul {
 	private int redValue = 0;
-	private int blueValue = 0;
 	private int greenValue = 0;
-	JButton test;
+	private int blueValue = 0;
 	
 	public RGB() {
-		test = new JButton("RGB");
-		test.setSize(100, 100);
-		layerpane.add(test);
-		layerpane.setPreferredSize(new Dimension(100, 100));
+		layerpane.setPreferredSize(new Dimension(294, 294));		
+		JLabel chiplabel = new JLabel();
+		ImageIcon chipIcon = new ImageIcon("res/PM31_RGB_LED.png");
+		chiplabel.setIcon(chipIcon);
+		chiplabel.setSize(294, 294);
+		layerpane.add(chiplabel, 1);
+		
+		JLabel ledlabel = new JLabel() {
+			@Override
+			public void paintComponent(Graphics g) {
+				Graphics2D ga = (Graphics2D) g;
+				ga.setPaint(new Color(redValue/4, greenValue/4, blueValue/4, 200));
+				ga.fillOval(0, 0, 70, 70);
+			}
+
+		};
+		
+		ledlabel.setLocation(185, 110);
+		ledlabel.setSize(200, 200);
+		layerpane.add(ledlabel, 0);
 	}
 
 	public void updateModul(Pin pin) {
@@ -37,14 +56,11 @@ public class RGB extends Modul {
 			blueValue = pin.getValue();
 		if (pin == pins.get(2))
 			greenValue = pin.getValue();
-		if (redValue > 512)
-			test.setBackground(Color.RED);
-		if (redValue < 512)
-			test.setBackground(Color.BLACK);
 		System.out.println("New Values: " + redValue + " " + blueValue + " " + greenValue);
 	}
 
 	public boolean connect(Arduino arduino) {
+		//TODO Pins= R G B ?
 		System.out.println("Connected RGB");
 		Pin tmpPin = arduino.getPin(0);
 		this.addPin(tmpPin);