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

minor changes

parent 347e2994
No related branches found
No related tags found
No related merge requests found
...@@ -122,7 +122,7 @@ public class GUI extends JFrame implements Runnable, ActionListener { ...@@ -122,7 +122,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
modulPanel.add(modules[2].getPane(), BorderLayout.EAST); modulPanel.add(modules[2].getPane(), BorderLayout.EAST);
modulPanel.add(modules[3].getPane(), BorderLayout.PAGE_END); modulPanel.add(modules[3].getPane(), BorderLayout.PAGE_END);
topPanel.add(modulPanel); topPanel.add(modulPanel);
mainPane.add(topPanel, BorderLayout.CENTER); mainPane.add(topPanel, BorderLayout.NORTH);
//Panel der Buttons auf der rechten Seite wird ausgeblendet //Panel der Buttons auf der rechten Seite wird ausgeblendet
//mainPane.add(createControlPanel(simu), BorderLayout.EAST); //mainPane.add(createControlPanel(simu), BorderLayout.EAST);
mainPane.add(createSerialLog(), BorderLayout.PAGE_END); mainPane.add(createSerialLog(), BorderLayout.PAGE_END);
...@@ -144,15 +144,18 @@ public class GUI extends JFrame implements Runnable, ActionListener { ...@@ -144,15 +144,18 @@ public class GUI extends JFrame implements Runnable, ActionListener {
WindowWidth = getWidth(); WindowWidth = getWidth();
topPanelWidth = topPanel.getWidth(); topPanelWidth = topPanel.getWidth();
topPanelHeight = topPanel.getHeight(); topPanelHeight = topPanel.getHeight();
System.out.println("WindowWidth" + WindowWidth);
System.out.println("WindowHeight" + WindowHeight);
System.out.println("toppanelWidth" + topPanelWidth);
System.out.println("toppanelHeight" + topPanelHeight);
//GUI wird nur gleichmig skaliert mit den Gren des kleineren Seitenverhtlnisses //GUI wird nur gleichmig skaliert mit den Gren des kleineren Seitenverhtlnisses
if(topPanelWidth <= topPanelHeight) { if(WindowWidth <= WindowHeight) {
xscale = topPanelWidth; xscale = WindowWidth;
yscale = topPanelWidth; yscale = WindowWidth;
} }
else { else {
xscale = topPanelHeight; xscale = WindowHeight;
yscale = topPanelHeight; yscale = WindowHeight;
} }
//GUI wird upgedatet //GUI wird upgedatet
...@@ -309,7 +312,7 @@ public class GUI extends JFrame implements Runnable, ActionListener { ...@@ -309,7 +312,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
if(size >= 1000) { if(size >= 1000) {
serialLog.setRows(4); // Anzahl der Angezeigten Reihen serialLog.setRows(3); // Anzahl der Angezeigten Reihen
} }
else if(size < 1000 && size >= 800) { else if(size < 1000 && size >= 800) {
serialLog.setRows(6); // Anzahl der Angezeigten Reihen serialLog.setRows(6); // Anzahl der Angezeigten Reihen
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment