Skip to content
Snippets Groups Projects
Commit 936d2c2e authored by Leon Dieter's avatar Leon Dieter
Browse files

minor changes

parent 30c9069b
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 94 additions and 77 deletions
src/tec/letsgoing/ardublock/simulator/view/GUI.java
+ 2
− 2
View file @ 936d2c2e
...@@ -138,7 +138,7 @@ public class GUI extends JFrame implements Runnable, ActionListener { ...@@ -138,7 +138,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
//Das Fenster soll erst dann upgedatet werden wenn eine Grennderung grer 30 stattgefunden hat //Das Fenster soll erst dann upgedatet werden wenn eine Grennderung grer 30 stattgefunden hat
//um zu verhindern dass die update Funktion durch ein zu hufiges Aufrufen das Programm aufhngt. //um zu verhindern dass die update Funktion durch ein zu hufiges Aufrufen das Programm aufhngt.
if(Math.abs(WindowHeight - getHeight()) > 5 || Math.abs(WindowWidth - getWidth()) > 5) { if(Math.abs(WindowHeight - getHeight()) > 10 || Math.abs(WindowWidth - getWidth()) > 10) {
WindowHeight = getHeight(); WindowHeight = getHeight();
WindowWidth = getWidth(); WindowWidth = getWidth();
......
src/tec/letsgoing/ardublock/simulator/view/modules/ArduinoUno.java
+ 47
− 37
View file @ 936d2c2e
...@@ -40,7 +40,11 @@ public class ArduinoUno extends Modul { ...@@ -40,7 +40,11 @@ public class ArduinoUno extends Modul {
this.xscale = _xscale; this.xscale = _xscale;
this.yscale = _yscale; this.yscale = _yscale;
chiplabel = new JLabel(); chiplabel = new JLabel();
chipIcon = _icon; chipIcon = _icon;
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.606*xscale)), ((int)(0.432*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
button = new JButton(); button = new JButton();
button.setActionCommand("reset"); button.setActionCommand("reset");
button.addActionListener(simu); button.addActionListener(simu);
...@@ -52,8 +56,41 @@ public class ArduinoUno extends Modul { ...@@ -52,8 +56,41 @@ public class ArduinoUno extends Modul {
labelButton.add(button); labelButton.add(button);
layerpane.add(labelButton, 0); layerpane.add(labelButton, 0);
// Label fr die PowerLED
labelPower = new JLabel() {
private static final long serialVersionUID = 1L;
@Override
public void paintComponent(Graphics g) {
Graphics2D ga = (Graphics2D) g;
int transparancy = 0;
if (ledOn)
transparancy = 220;
ga.setPaint(new Color(255, 255, 0, transparancy));
ga.fillRect(0, 0,((int)(0.02066*xscale)), ((int)(0.01034*yscale)));
}
};
// Label für die Pin 13 LED
label13 = new JLabel() {
private static final long serialVersionUID = 1L;
@Override
public void paintComponent(Graphics g) {
Graphics2D ga = (Graphics2D) g;
ga.setPaint(new Color(255, 255, 0, led13 / 4));
ga.fillRect(0, 0, ((int)(0.02066*xscale)), ((int)(0.01034*yscale)));
}
};
updateGUI(xscale, yscale); updateGUI(xscale, yscale);
} }
@Override @Override
...@@ -70,51 +107,26 @@ public class ArduinoUno extends Modul { ...@@ -70,51 +107,26 @@ public class ArduinoUno extends Modul {
this.xscale = _xscale; this.xscale = _xscale;
this.yscale = _yscale; this.yscale = _yscale;
// Offset für den Arduino um diesen mehr mittig zu platzieren. // Offset für den Arduino um diesen mehr mittig zu platzieren.
int locx = ((int)(0.0516*xscale)); int locx = ((int)(0.0516*xscale));
int locy = ((int)(0.0517*yscale)); int locy = ((int)(0.0517*yscale));
calculatePinPos(locx, locy); calculatePinPos(locx, locy);
layerpane.setPreferredSize(new Dimension(((int)(0.606*xscale)) + locx, ((int)(0.432*yscale)) + locy)); layerpane.setPreferredSize(new Dimension(((int)(0.606*xscale)) + locx, ((int)(0.432*yscale)) + locy));
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.606*xscale)), ((int)(0.432*yscale)), Image.SCALE_SMOOTH)); chipIcon_temp.setImage(chipIcon.getImage().getScaledInstance(((int)(0.606*xscale)), ((int)(0.432*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
chiplabel.setSize(((int)(0.606*xscale)), ((int)(0.432*yscale))); chiplabel.setSize(((int)(0.606*xscale)), ((int)(0.432*yscale)));
chiplabel.setLocation(locx, locy); chiplabel.setLocation(locx, locy);
layerpane.add(chiplabel, 0);
// Label fr die PowerLED layerpane.add(chiplabel, 0);
labelPower = new JLabel() {
private static final long serialVersionUID = 1L;
@Override
public void paintComponent(Graphics g) {
Graphics2D ga = (Graphics2D) g;
int transparancy = 0;
if (ledOn)
transparancy = 220;
ga.setPaint(new Color(255, 255, 0, transparancy));
ga.fillRect(0, 0,((int)(0.02066*xscale)), ((int)(0.01034*yscale)));
}
};
labelPower.setLocation(((int)(0.5207*xscale))+locx, ((int)(0.13*yscale))+locy); labelPower.setLocation(((int)(0.5207*xscale))+locx, ((int)(0.13*yscale))+locy);
labelPower.setSize(((int)(0.02066*xscale)), ((int)(0.01034*yscale))); labelPower.setSize(((int)(0.02066*xscale)), ((int)(0.01034*yscale)));
layerpane.add(labelPower, 0); layerpane.add(labelPower, 0);
// Label für die Pin 13 LED
label13 = new JLabel() {
private static final long serialVersionUID = 1L;
@Override
public void paintComponent(Graphics g) {
Graphics2D ga = (Graphics2D) g;
ga.setPaint(new Color(255, 255, 0, led13 / 4));
ga.fillRect(0, 0, ((int)(0.02066*xscale)), ((int)(0.01034*yscale)));
}
};
label13.setLocation(((int)(0.2655*xscale))+locx, ((int)(0.092*yscale))+locy); label13.setLocation(((int)(0.2655*xscale))+locx, ((int)(0.092*yscale))+locy);
label13.setSize(((int)(0.02066*xscale)), ((int)(0.01034*yscale))); label13.setSize(((int)(0.02066*xscale)), ((int)(0.01034*yscale)));
...@@ -124,9 +136,6 @@ public class ArduinoUno extends Modul { ...@@ -124,9 +136,6 @@ public class ArduinoUno extends Modul {
button.setSize(((int)(0.0723*xscale)), ((int)(0.0724*yscale))); button.setSize(((int)(0.0723*xscale)), ((int)(0.0724*yscale)));
labelButton.setSize(((int)(0.062*xscale)), ((int)(0.0527*yscale))); labelButton.setSize(((int)(0.062*xscale)), ((int)(0.0527*yscale)));
labelButton.setLocation(((int)(0.06612*xscale))+locx, ((int)(0.00103*yscale))+locy); labelButton.setLocation(((int)(0.06612*xscale))+locx, ((int)(0.00103*yscale))+locy);
...@@ -155,6 +164,7 @@ public class ArduinoUno extends Modul { ...@@ -155,6 +164,7 @@ public class ArduinoUno extends Modul {
} }
private void calculatePinPos(int locx, int locy) { private void calculatePinPos(int locx, int locy) {
Vector<Point> pins = new Vector<Point>(); Vector<Point> pins = new Vector<Point>();
int offset = 0; int offset = 0;
for (int i = 15; i > 1; i--) { for (int i = 15; i > 1; i--) {
......
src/tec/letsgoing/ardublock/simulator/view/modules/Button.java
+ 8
− 6
View file @ 936d2c2e
...@@ -68,8 +68,10 @@ public class Button extends Modul implements ActionListener { ...@@ -68,8 +68,10 @@ public class Button extends Modul implements ActionListener {
label3 = new JLabel(); label3 = new JLabel();
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
iconOff_temp = new ImageIcon(iconOff.getImage().getScaledInstance(((int)(0.0723*xscale)), ((int)(0.0724*yscale)), Image.SCALE_SMOOTH));
iconOn_temp = new ImageIcon(iconOn.getImage().getScaledInstance(((int)(0.0723*xscale)), ((int)(0.0724*yscale)), Image.SCALE_SMOOTH));
updateGUI(xscale, yscale); updateGUI(xscale, yscale);
...@@ -81,8 +83,8 @@ public class Button extends Modul implements ActionListener { ...@@ -81,8 +83,8 @@ public class Button extends Modul implements ActionListener {
this.yscale = _yscale; this.yscale = _yscale;
layerpane.setPreferredSize(new Dimension(((int)(0.3037*xscale)), ((int)(0.304*yscale)))); layerpane.setPreferredSize(new Dimension(((int)(0.3037*xscale)), ((int)(0.304*yscale))));
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH)); chipIcon_temp.setImage(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
chiplabel.setSize(((int)(0.3037*xscale)), ((int)(0.304*yscale))); chiplabel.setSize(((int)(0.3037*xscale)), ((int)(0.304*yscale)));
...@@ -93,8 +95,8 @@ public class Button extends Modul implements ActionListener { ...@@ -93,8 +95,8 @@ public class Button extends Modul implements ActionListener {
label1.setLocation(((int)(0.02996*xscale)), ((int)(0.06618*yscale))); label1.setLocation(((int)(0.02996*xscale)), ((int)(0.06618*yscale)));
iconOff_temp = new ImageIcon(iconOff.getImage().getScaledInstance(((int)(0.0723*xscale)), ((int)(0.0724*yscale)), Image.SCALE_SMOOTH)); iconOff_temp.setImage(iconOff.getImage().getScaledInstance(((int)(0.0723*xscale)), ((int)(0.0724*yscale)), Image.SCALE_SMOOTH));
iconOn_temp = new ImageIcon(iconOn.getImage().getScaledInstance(((int)(0.0723*xscale)), ((int)(0.0724*yscale)), Image.SCALE_SMOOTH)); iconOn_temp.setImage(iconOn.getImage().getScaledInstance(((int)(0.0723*xscale)), ((int)(0.0724*yscale)), Image.SCALE_SMOOTH));
//Abfrage ob der jeweilige Button im moment gedrckt wurde oder nicht und dementsprechend wird das gas gezoomte icon gesetzt //Abfrage ob der jeweilige Button im moment gedrckt wurde oder nicht und dementsprechend wird das gas gezoomte icon gesetzt
if(!but1.isSelected()) if(!but1.isSelected())
......
src/tec/letsgoing/ardublock/simulator/view/modules/Poti.java
+ 4
− 3
View file @ 936d2c2e
...@@ -68,7 +68,8 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener { ...@@ -68,7 +68,8 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener {
layerpane.add(chiplabel, 0); layerpane.add(chiplabel, 0);
layerpane.add(sliderPanel, 0); layerpane.add(sliderPanel, 0);
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
updateGUI(xscale, yscale); updateGUI(xscale, yscale);
...@@ -83,8 +84,8 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener { ...@@ -83,8 +84,8 @@ public class Poti extends Modul implements ChangeListener, MouseWheelListener {
layerpane.setPreferredSize(new Dimension(((int)(0.3037*xscale)), ((int)(0.304*yscale)))); layerpane.setPreferredSize(new Dimension(((int)(0.3037*xscale)), ((int)(0.304*yscale))));
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH)); chipIcon_temp.setImage(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
chiplabel.setSize(((int)(0.3037*xscale)), ((int)(0.304*yscale))); chiplabel.setSize(((int)(0.3037*xscale)), ((int)(0.304*yscale)));
......
src/tec/letsgoing/ardublock/simulator/view/modules/RGB.java
+ 33
− 29
View file @ 936d2c2e
...@@ -41,31 +41,6 @@ public class RGB extends Modul { ...@@ -41,31 +41,6 @@ public class RGB extends Modul {
chiplabel = new JLabel(); chiplabel = new JLabel();
chipIcon = _icon; chipIcon = _icon;
updateGUI(xscale, yscale);
}
@Override
public void updateGUI(int _xscale, int _yscale) {
//Alte label werden entfernt, wenn vorhanden. Da sonst die alten Label bestehen bleiben wrden
if(ledlabel != null) {
layerpane.remove(ledlabel);
}
this.xscale = _xscale;
this.yscale = _yscale;
// Erstellen der JLayerPane für das Modul
layerpane.setPreferredSize(new Dimension(((int)(0.3037*xscale)), ((int)(0.304*yscale))));
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
chiplabel.setSize(((int)(0.3037*xscale)), ((int)(0.304*yscale)));
layerpane.add(chiplabel, 0);
// Erzeuge ein JLabel welches das Leuchten der LED darstellt.
ledlabel = new JLabel() { ledlabel = new JLabel() {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -94,6 +69,35 @@ public class RGB extends Modul { ...@@ -94,6 +69,35 @@ public class RGB extends Modul {
}; };
chipIcon_temp = new ImageIcon(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setIcon(chipIcon_temp);
updateGUI(xscale, yscale);
}
@Override
public void updateGUI(int _xscale, int _yscale) {
//Alte label werden entfernt, wenn vorhanden. Da sonst die alten Label bestehen bleiben wrden
if(ledlabel != null) {
layerpane.remove(ledlabel);
}
this.xscale = _xscale;
this.yscale = _yscale;
// Erstellen der JLayerPane für das Modul
layerpane.setPreferredSize(new Dimension(((int)(0.3037*xscale)), ((int)(0.304*yscale))));
chipIcon_temp.setImage(chipIcon.getImage().getScaledInstance(((int)(0.3037*xscale)), ((int)(0.304*yscale)), Image.SCALE_SMOOTH));
chiplabel.setSize(((int)(0.3037*xscale)), ((int)(0.304*yscale)));
layerpane.add(chiplabel, 0);
// Erzeuge ein JLabel welches das Leuchten der LED darstellt.
// Setze Position des Labels // Setze Position des Labels
ledlabel.setLocation(((int)(0.11*xscale)), ((int)(0.0383*yscale))); ledlabel.setLocation(((int)(0.11*xscale)), ((int)(0.0383*yscale)));
ledlabel.setSize(((int)(0.2066*xscale)), ((int)(0.2068*yscale))); ledlabel.setSize(((int)(0.2066*xscale)), ((int)(0.2068*yscale)));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment