correctly resizing windows in progress..

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

@@ -11,6 +11,8 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
 import java.awt.Point;
 import java.awt.Stroke;
 import java.awt.event.ActionEvent;
@@ -53,6 +55,14 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 	private Modul[] modules = new Modul[4];
 	private volatile boolean stopFlag = false;
 	private JTextArea serialLog = new JTextArea();
+	private JPanel botControlPanel, topControlPanel, controlPanel, panel, topPanel;
+	private JButton goButton;
+	private JButton stopButton;
+	private JButton reloadButton;
+	private JButton measButton;
+	private JButton clearButton;
+	private JCheckBox checkBox;
+	private JScrollPane scrollPane;
 	private static int xscale= 968;
 	private static int yscale= 968;
 	private JPanel modulPanel;
@@ -86,17 +96,22 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 				// gew�nscht.
 				this.setResizable(true); //TODO Muss in true ge�ndert werden wenn skalierbar
 				
-				
+				createControlPanel(simu);
 				mainPane = this.getContentPane();
 				
+				topPanel = new JPanel(new GridBagLayout());
+				
 				// Panel welches alle Module sowie die Verdrahtung enth�lt.
 				modulPanel = new JPanel(new BorderLayout()) {
 					private static final long serialVersionUID = 1L;
 
 					@Override
 					public void paint(Graphics g) {
+						
+						
 							super.paint(g);
 							drawConnections(g); // Zeichne Verdrahtung
+						
 					}
 
 				};
@@ -105,10 +120,10 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 				modulPanel.add(modules[1].getPane(), BorderLayout.CENTER);
 				modulPanel.add(modules[2].getPane(), BorderLayout.EAST);
 				modulPanel.add(modules[3].getPane(), BorderLayout.PAGE_END);
-
-				mainPane.add(modulPanel, BorderLayout.CENTER);
+				topPanel.add(modulPanel);
+				mainPane.add(topPanel, BorderLayout.CENTER);
 				//Panel der Buttons auf der rechten Seite wird ausgeblendet
-				//mainPane.add(createControlPanel(simu), BorderLayout.LINE_END);
+				//mainPane.add(createControlPanel(simu), BorderLayout.EAST);
 				mainPane.add(createSerialLog(), BorderLayout.PAGE_END);
 				//this.setSize(xscale, yscale);
 				this.pack();
@@ -118,19 +133,40 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 		this.addComponentListener(new ComponentListener() {
 			@Override
 			public void componentResized(ComponentEvent e) {
-				if(!(xscale == getWidth() && yscale == getHeight())) {
 				
+				System.out.println("topPanel Hhe und Weite:  " + topPanel.getHeight() + "\t" + topPanel.getWidth());	
+				System.out.println("modulPanel Hhe und Weite:  " + modulPanel.getHeight() + "\t" + modulPanel.getWidth());	
+				System.out.println("Fenster Hhe und Weite:  " + getHeight() + "\t" + getWidth());	
+				
+				
+				
+					if((getWidth() - topPanel.getWidth() < 100) || (topPanel.getHeight() - modulPanel.getHeight() < 100)) {
 						
 						xscale = getWidth();
-						yscale = getHeight();
+						yscale = getWidth();
 						
 						
 						
 					
-					updateGUI(xscale, yscale);
 					
-					System.out.println("xScale: " + xscale +  "\tyScale: " + yscale);
+					
+						
+						xscale = getHeight();
+						yscale = getHeight();
+						
 					}	
+					
+					else {
+						xscale = getWidth();
+						yscale = getHeight();
+					}
+						
+					if(xscale % 4 == 0 || yscale % 10 == 0) {
+						updateGUI(xscale, yscale);
+					}
+					
+					//System.out.println("xScale: " + xscale +  "\tyScale: " + yscale);
+				
 			}
 
 			@Override
@@ -177,13 +213,18 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 	 * @return JPanel mit allen Knöpfen
 	 */
 	private JPanel createControlPanel(Simulator simu) {
-		JPanel controlPanel = new JPanel();
-		controlPanel.setLayout(new BoxLayout(controlPanel, BoxLayout.Y_AXIS));
 		
-		JButton goButton = new JButton();
-		JButton stopButton = new JButton();
-		JButton reloadButton = new JButton();
-		JButton measButton = new JButton();
+		
+		controlPanel = new JPanel(new BorderLayout());
+		topControlPanel = new JPanel(new GridLayout(2,1));
+		botControlPanel = new JPanel(new GridLayout(2,1));
+		
+	
+
+		goButton = new JButton();
+		stopButton = new JButton();
+		reloadButton = new JButton();
+		measButton = new JButton();
 		
 		goButton.setIcon(new ImageIcon(
 				getToolkit().getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/Play.png"))));
@@ -204,23 +245,34 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 		reloadButton.setActionCommand("reload");
 		measButton.setActionCommand("meas");
 
-		controlPanel.add(goButton);
-		controlPanel.add(stopButton);
-		controlPanel.add(Box.createRigidArea(new Dimension(0, 450)));
-		controlPanel.add(reloadButton);
-		controlPanel.add(measButton);
+		
+		topControlPanel.add(goButton);
+		topControlPanel.add(stopButton);
+		//controlPanel.add(Box.createRigidArea(new Dimension(0, ((int)(0.3*yscale)))));
+		botControlPanel.add(reloadButton);						 
+		botControlPanel.add(measButton);
+		
+		controlPanel.add(topControlPanel, BorderLayout.NORTH);
+		controlPanel.add(botControlPanel, BorderLayout.SOUTH);
+		
 		return controlPanel;
+		
+		
+		
+		
 	}
 	
+	
+
 	/**
 	 * Erzeuge den Bereich mit dem SerialLog
 	 * 
 	 * @return JPanel des SerialLogs
 	 */
 	private JPanel createSerialLog() {
-		JPanel panel = new JPanel(new BorderLayout());
-		JScrollPane scrollPane = new JScrollPane(serialLog);
-		serialLog.setRows(8); // Anzahl der Angezeigten Reihen
+		panel = new JPanel(new BorderLayout());
+		scrollPane = new JScrollPane(serialLog);
+		serialLog.setRows(4); // Anzahl der Angezeigten Reihen
 		serialLog.setAutoscrolls(true);
 		serialLog.setForeground(Color.black);
 		serialLog.setBackground(Color.white);
@@ -228,12 +280,12 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 		DefaultCaret caret = (DefaultCaret) serialLog.getCaret();
 		caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE);
 
-		JButton clearButton = new JButton("Clear Serial Output");
+		clearButton = new JButton("Clear Serial Output");
 		clearButton.setActionCommand("clearSerial");
 		clearButton.addActionListener(this);
 		panel.add(clearButton, BorderLayout.CENTER);
 
-		JCheckBox checkBox = new JCheckBox("Autoscroll");
+		checkBox = new JCheckBox("Autoscroll");
 		checkBox.setActionCommand("autoscroll");
 		checkBox.addActionListener(this);
 		checkBox.setSelected(true);
@@ -251,6 +303,11 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 	 * @param g Graphics Instanz des Panels
 	 */
 	private void drawConnections(Graphics g) {
+		
+		
+		
+			
+		
 			// Zeichne die Stromversorgung
 			for (int i = -1; i < 2; i++) {
 				g.setColor(Color.BLACK);
@@ -298,6 +355,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
 					counter++;
 				}
 			}
+		
 	}
 
 	/**