Skip to content
Snippets Groups Projects
Commit e11fc4ca authored by Lucas Stratmann's avatar Lucas Stratmann
Browse files

GUI Position gets saved at reload

parent 6d1d8133
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
*/ */
package tec.letsgoing.ardublock.simulator; package tec.letsgoing.ardublock.simulator;
import java.awt.Point;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Vector; import java.util.Vector;
...@@ -110,10 +111,14 @@ public class Simulator implements Runnable, ActionListener { ...@@ -110,10 +111,14 @@ public class Simulator implements Runnable, ActionListener {
arduino.errorAbort("Thread Überwachung gestört - Bitte Programm neustarten"); arduino.errorAbort("Thread Überwachung gestört - Bitte Programm neustarten");
} }
} }
Point locationWindow;
locationWindow=gui.getLocation();
gui.stopThread(); gui.stopThread();
gui.dispose(); gui.dispose();
createSubClasses(); createSubClasses();
gui.setLocation(locationWindow);
for (SimCodeFunction function : functionsCode) { for (SimCodeFunction function : functionsCode) {
arduino.addFunction(function); arduino.addFunction(function);
} }
......
...@@ -11,6 +11,7 @@ import java.util.Observer; ...@@ -11,6 +11,7 @@ import java.util.Observer;
* *
*/ */
public class Pin extends Observable { public class Pin extends Observable {
//FIXME Java 8 oder 11?
private int value = 0; private int value = 0;
private boolean mode = false; // false == Input, true==Output private boolean mode = false; // false == Input, true==Output
......
...@@ -69,11 +69,9 @@ public class Button extends Modul implements ActionListener { ...@@ -69,11 +69,9 @@ public class Button extends Modul implements ActionListener {
public void updateModul(Pin pin) { public void updateModul(Pin pin) {
int pinNumber = 0; int pinNumber = 0;
if (pin == pins.get(0))
pinNumber = 0;
if (pin == pins.get(1)) if (pin == pins.get(1))
pinNumber = 1; pinNumber = 1;
if (pin == pins.get(2)) else if (pin == pins.get(2))
pinNumber = 2; pinNumber = 2;
if (pins.get(pinNumber).getValue() != lastState[pinNumber]) { if (pins.get(pinNumber).getValue() != lastState[pinNumber]) {
pins.get(pinNumber).setValue(lastState[pinNumber]); pins.get(pinNumber).setValue(lastState[pinNumber]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment