From 8fa3d2322383941449ee2c0d9e2fe5c6924c529b Mon Sep 17 00:00:00 2001
From: Leon Dieter <Leon Dieter@DESKTOP-L4JC8N4>
Date: Wed, 17 Mar 2021 19:36:48 +0100
Subject: [PATCH] minor changes
---
.../letsgoing/ardublock/simulator/Simulator.java | 16 +++++++++++-----
.../letsgoing/ardublock/simulator/view/GUI.java | 12 ++++++++++++
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/tec/letsgoing/ardublock/simulator/Simulator.java b/src/tec/letsgoing/ardublock/simulator/Simulator.java
index d1acfe1..2f9d849 100644
--- a/src/tec/letsgoing/ardublock/simulator/Simulator.java
+++ b/src/tec/letsgoing/ardublock/simulator/Simulator.java
@@ -160,6 +160,8 @@ public class Simulator implements Runnable, ActionListener{
* Thread nicht korrekt beendet wurde.
*/
public boolean reload() {
+
+
if (simuThread instanceof Thread) {
stopSimu();
try {
@@ -173,20 +175,24 @@ public class Simulator implements Runnable, ActionListener{
Point locationWindow = gui.getLocation();
int WidthWindow = gui.getxscale();
int HeightWindow = gui.getyscale();
- System.out.println(gui.getxscale());
- System.out.println(gui.getyscale());
- System.out.println("aufruf");
+
gui.stopThread();
gui.dispose();
createSubClasses();
gui.setLocation(locationWindow);
- gui.updateGUI(WidthWindow, HeightWindow);
+ gui.setxscale(WidthWindow);
+ gui.setyscale(HeightWindow);
+
+ System.out.println(WidthWindow + " " + HeightWindow);
+ //gui.updateGUI(WidthWindow, HeightWindow);
for (SimCodeFunction function : functionsCode) {
arduino.addFunction(function);
- }
+ }
+
+
return true;
}
diff --git a/src/tec/letsgoing/ardublock/simulator/view/GUI.java b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
index 3f12c28..34c011d 100644
--- a/src/tec/letsgoing/ardublock/simulator/view/GUI.java
+++ b/src/tec/letsgoing/ardublock/simulator/view/GUI.java
@@ -76,6 +76,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
*/
public GUI(Simulator simu) {
super("ArduBlock Simulator");
+
// Konstruktor der Module
modules[0] = new RGB(new ImageIcon(getToolkit()
.getImage(GUI.class.getResource("/tec/letsgoing/ardublock/simulator/img/PM31_RGB_LED.png"))), xscale, yscale);
@@ -198,6 +199,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
*/
public void updateGUI(int _xscale, int _yscale) {
+ System.out.println("update: " + xscale + " " + _yscale);
for(int i = 0; i < 4; i++) {
modules[i].updateGUI(_xscale, _yscale);
@@ -479,6 +481,16 @@ public class GUI extends JFrame implements Runnable, ActionListener {
return yscale;
}
+ public void setxscale(int _xscale) {
+
+ xscale = _xscale;
+ }
+
+ public void setyscale(int _yscale) {
+
+ yscale = _yscale;
+ }
+
--
GitLab