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

minor changes

parent 936d2c2e
No related branches found
No related tags found
No related merge requests found
......@@ -138,15 +138,15 @@ public class GUI extends JFrame implements Runnable, ActionListener {
//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.
if(Math.abs(WindowHeight - getHeight()) > 10 || Math.abs(WindowWidth - getWidth()) > 10) {
if((Math.abs(WindowHeight - getHeight()) > 15) || (Math.abs(WindowWidth - getWidth()) > 15)) {
WindowHeight = getHeight();
WindowWidth = getWidth();
topPanelWidth = topPanel.getWidth();
topPanelHeight = topPanel.getHeight();
// topPanelWidth = topPanel.getWidth();
// topPanelHeight = topPanel.getHeight();
//GUI wird nur gleichmig skaliert mit den Gren des kleineren Seitenverhtlnisses
if(WindowWidth <= WindowHeight - 80) {
if(WindowWidth <= (WindowHeight - 80)) {
xscale = WindowWidth;
yscale = WindowWidth;
}
......@@ -161,7 +161,6 @@ public class GUI extends JFrame implements Runnable, ActionListener {
}
updateSerialLog(getHeight()-topPanel.getHeight());
}
@Override
......@@ -201,8 +200,10 @@ public class GUI extends JFrame implements Runnable, ActionListener {
modules[2].updateGUI(xscale, yscale);
modules[3].updateGUI(xscale, yscale);
//updateSerialLog(getHeight()-topPanel.getHeight());
System.out.println(xscale + " : " + yscale);
System.out.println(getWidth() + " : " + getHeight());
}
......@@ -297,6 +298,9 @@ public class GUI extends JFrame implements Runnable, ActionListener {
panel.add(checkBox, BorderLayout.EAST);
panel.add(scrollPane, BorderLayout.PAGE_END);
updateSerialLog(getHeight()-topPanel.getHeight());
return panel;
}
......
......@@ -43,35 +43,29 @@ public class Button extends Modul implements ActionListener {
iconOn_temp = iconOn;
chiplabel = new JLabel();
but1 = new JToggleButton();
but1.setIcon(iconOff_temp);
but1.setActionCommand("0");
but1.addActionListener(this);
but2 = new JToggleButton();
but2.setIcon(iconOff_temp);
but2.setActionCommand("1");
but2.addActionListener(this);
but3 = new JToggleButton();
but3.setIcon(iconOff_temp);
but3.setActionCommand("2");
but3.addActionListener(this);
label1 = new JLabel();
label2 = new JLabel();
label1 = new JLabel();
label2 = 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));
but1.setIcon(iconOff_temp);
but2.setIcon(iconOff_temp);
but3.setIcon(iconOff_temp);
updateGUI(xscale, yscale);
......@@ -99,26 +93,26 @@ public class Button extends Modul implements ActionListener {
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
if(!but1.isSelected())
but1.setIcon(iconOff_temp);
else
but1.setIcon(iconOn_temp);
if(!but2.isSelected())
but2.setIcon(iconOff_temp);
else
but2.setIcon(iconOn_temp);
if(!but3.isSelected())
but3.setIcon(iconOff_temp);
else
but3.setIcon(iconOn_temp);
// if(!but1.isSelected())
// but1.setIcon(iconOff_temp);
// else
// but1.setIcon(iconOn_temp);
//
//
//
//
// if(!but2.isSelected())
// but2.setIcon(iconOff_temp);
// else
// but2.setIcon(iconOn_temp);
//
//
//
// if(!but3.isSelected())
// but3.setIcon(iconOff_temp);
// else
// but3.setIcon(iconOn_temp);
//
but2.setSize(((int)(0.0723*xscale)), ((int)(0.0724*yscale)));
......
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