diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java index 49eb53f35a635184c6a14359ac6095ce120ba37a..4c0860872d91a0e7a77d0f5121efaef9d8d727bb 100644 --- a/src/tec/letsgoing/ardublock/simulator/view/GUI.java +++ b/src/tec/letsgoing/ardublock/simulator/view/GUI.java @@ -135,17 +135,16 @@ public class GUI extends JFrame implements Runnable, ActionListener { @Override public void componentResized(ComponentEvent e) { + //Das Fenster soll erst dann upgedatet werden wenn eine Größenänderung größer 30 stattegefunden hat + //um zu verhindern dass die update Funktion durch ein zu häufiges Aufrufen das Programm aufhängt. if(Math.abs(WindowHeight - getHeight()) > 30 || Math.abs(WindowWidth - getWidth()) > 30) { - - - System.out.println("boom.."); + WindowHeight = getHeight(); WindowWidth = getWidth(); topPanelWidth = topPanel.getWidth(); topPanelHeight = topPanel.getHeight(); - - - + + //GUI wird nur quadratisch skaliert mit den Größen des kleineren Seitenverhätlnisses if(topPanelWidth <= topPanelHeight) { xscale = topPanelWidth; yscale = topPanelWidth; @@ -153,11 +152,12 @@ public class GUI extends JFrame implements Runnable, ActionListener { else { xscale = topPanelHeight; yscale = topPanelHeight; - } - //if(WindowWidth % 3 == 0 || WindowHeight % 3 == 0) { + } + + //GUI wird mit den aktuellen Seitenverhältnissen upgedatet updateGUI(xscale, yscale); - //} + } @@ -294,7 +294,6 @@ public class GUI extends JFrame implements Runnable, ActionListener { public void updateSerialLog(int size) { - System.out.println(size); if(size >= 1000) { serialLog.setRows(4); // Anzahl der Angezeigten Reihen diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java b/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java index 8d3a1b670d29ea4b98ec455e3d801273c50e2a88..dad8d8adf6e93ffa734cf881ddfb79aa12e71a19 100644 --- a/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java +++ b/src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java @@ -159,7 +159,7 @@ public class ArduinoUno extends Modul { int offset = 0; for (int i = 15; i > 1; i--) { if (i < 8) - offset = -((int)(0.01136*xscale)); + offset = -((int)(0.012*xscale)); pins.add(new Point(i * ((int)(0.02066*xscale)) + locx + ((int)(0.2541*xscale)) + offset, locy + ((int)(0.01965*yscale)))); } for (int i = 0; i < 6; i++) { diff --git a/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java b/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java index 45bd755d2dd49005e8a449285b61ba3dbbf6d388..97c7b94d7c4b4ba5288ac94b8883b5fbc28fa291 100644 --- a/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java +++ b/src/tec/letsgoing/ardublock/simulator/view/modules/Button.java @@ -33,6 +33,7 @@ public class Button extends Modul implements ActionListener { private int yscale; public Button(ImageIcon _icon, ImageIcon _icon1, ImageIcon _icon2, int _xscale, int _yscale) { + this.xscale = _xscale; this.yscale = _yscale; chipIcon = _icon;