From 63d2c20c6d9099d611d4d748f81bcc782f28a3cf Mon Sep 17 00:00:00 2001
From: Leon Dieter <Leon Dieter@DESKTOP-L4JC8N4>
Date: Sun, 7 Mar 2021 12:33:15 +0100
Subject: [PATCH] Minor changes
---
.../ardublock/simulator/view/GUI.java | 19 +++++++++----------
.../simulator/view/modules/ArduinoUno.java | 2 +-
.../simulator/view/modules/Button.java | 1 +
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
index 49eb53f..4c08608 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 8d3a1b6..dad8d8a 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 45bd755..97c7b94 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;
--
GitLab