diff --git a/src/main/java/View/ArrangementDialog.java b/src/main/java/View/ArrangementDialog.java index f88f70a..fe802d8 100644 --- a/src/main/java/View/ArrangementDialog.java +++ b/src/main/java/View/ArrangementDialog.java @@ -36,6 +36,7 @@ public class ArrangementDialog extends JPanel { public ArrangementDialog() { super(); this.setPreferredSize(new Dimension(800, 500)); + this.setMinimumSize(new Dimension(800, 500)); } public void setPrameters(Double pmax, Double pmin, LinkedList lines, LinkedList points) { @@ -78,7 +79,8 @@ public class ArrangementDialog extends JPanel { ValueAxis range = plot.getRangeAxis(); domain.setRange(domainMin - 1, domainMax + 1); - range.setRange(rangeMin - 1, rangeMax + 1); + range.setRange(rangeMin - 1, rangeMax + + 1); plot.setBackgroundPaint(Color.WHITE); plot.setDomainGridlinePaint(Color.white); plot.setRangeGridlinePaint(Color.white); diff --git a/src/main/java/View/MainFrame.java b/src/main/java/View/MainFrame.java index 5e52909..0f93028 100644 --- a/src/main/java/View/MainFrame.java +++ b/src/main/java/View/MainFrame.java @@ -4,6 +4,7 @@ package View; import Presenter.Presenter; import javax.swing.*; +import javax.swing.border.TitledBorder; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -26,8 +27,10 @@ public class MainFrame extends JFrame { private JPanel pane; private JDialog arrangementDialog; private JDialog plotDialog; - private JTextArea output; + private OutputPanel output; private JPanel menupanel; + private JPanel sidepanel; + private JSplitPane splitpane; private JScrollPane scrollPane; private ArrangementDialog arrangement; private PlotDialog plot; @@ -86,27 +89,16 @@ public class MainFrame extends JFrame { } - /** - * log Methode - */ - - public void log(String s) { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - output.append(s + "\n"); - } - }); - } - /** * init GUI */ protected void initGUI() { this.setTitle("MainFrame"); - this.setSize(500, 400); + this.setSize(1000, 700); this.setLayout(new BorderLayout()); pane = new JPanel(); + sidepanel = new SidePanel(); + sidepanel.setMinimumSize(new Dimension(400,500)); pane.setLayout(new FlowLayout()); menupanel = new MenuPanel(); @@ -120,48 +112,46 @@ public class MainFrame extends JFrame { arrangementDialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); plotDialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); - output = new JTextArea(); - output.setEditable(false); - output.setLineWrap(true); - output.setWrapStyleWord(true); - scrollPane = new JScrollPane(output); - scrollPane.setWheelScrollingEnabled(true); + output = new OutputPanel(); + splitpane = new JSplitPane(); + output.setMinimumSize(new Dimension(400,500)); + arrangementButton = new JButton("Arrangement"); plotButton = new JButton("Plot"); button3 = new JButton("Import"); - arrangementButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - getPresenter().startArrangementVisualization(); - } - }); + arrangementButton.addActionListener(e -> getPresenter().startArrangementVisualization()); - plotButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - getPresenter().startScatterPlotVisualization(); - } - }); + plotButton.addActionListener(e -> getPresenter().startScatterPlotVisualization()); - button3.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - log("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \n" + - "\n" + - "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet,"); - } - }); + button3.addActionListener(e -> log("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \n" + + "\n" + + "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet,")); pane.add(arrangementButton); pane.add(plotButton); pane.add(button3); - this.add(menupanel, BorderLayout.NORTH); + splitpane.setOrientation(JSplitPane.HORIZONTAL_SPLIT); + splitpane.setDividerLocation(0.2); + splitpane.setContinuousLayout(true); + splitpane.setLeftComponent(output); + splitpane.setRightComponent(sidepanel); this.add(pane, BorderLayout.SOUTH); - this.add(scrollPane, BorderLayout.CENTER); + this.add(splitpane, BorderLayout.CENTER); + this.add(menupanel, BorderLayout.NORTH); +// this.add(output, BorderLayout.CENTER); +// this.add(sidepanel, BorderLayout.EAST); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.setVisible(true); } + + /** + * log Methode + */ + + public void log(String s) { + SwingUtilities.invokeLater(() -> output.append(s)); + } } diff --git a/src/main/java/View/OutputPanel.java b/src/main/java/View/OutputPanel.java new file mode 100644 index 0000000..a854079 --- /dev/null +++ b/src/main/java/View/OutputPanel.java @@ -0,0 +1,38 @@ +package View; + +import javax.swing.*; +import javax.swing.border.TitledBorder; +import java.awt.*; + +/** + * Implementierung verschiedener Algorithmen zur Berechnung von Ausgleichsgeraden. + * + * @Author: Armin Wolf + * @Email: a_wolf28@uni-muenster.de + * @Date: 02.06.2017. + */ +public class OutputPanel extends JPanel { + + private JTextArea output; + private JScrollPane scrollPane; + + + public OutputPanel(){ + this.setBorder(new TitledBorder("Ausgabekanal")); + this.setLayout(new BorderLayout()); + output = new JTextArea(); + output.setEditable(false); + output.setLineWrap(true); + output.setWrapStyleWord(true); + scrollPane = new JScrollPane(output); + scrollPane.setWheelScrollingEnabled(true); + this.add(scrollPane, BorderLayout.CENTER); + + } + + + public void append(String s) { + output.append(s + "\n"); + } + +} diff --git a/src/main/java/View/PlotDialog.java b/src/main/java/View/PlotDialog.java index 88f1190..427652b 100644 --- a/src/main/java/View/PlotDialog.java +++ b/src/main/java/View/PlotDialog.java @@ -32,16 +32,12 @@ public class PlotDialog extends JPanel { public PlotDialog() { super(); this.setPreferredSize(new Dimension(800, 500)); + this.setMinimumSize(new Dimension(800, 500)); } public void createPlot(LinkedList points) { - Thread thread = new Thread(new Runnable() { - @Override - public void run() { - convertData(points); - } - }); + Thread thread = new Thread(() -> convertData(points)); thread.start(); try { thread.join(); diff --git a/src/main/java/View/SidePanel.java b/src/main/java/View/SidePanel.java new file mode 100644 index 0000000..218bcb0 --- /dev/null +++ b/src/main/java/View/SidePanel.java @@ -0,0 +1,39 @@ +package View; + +import javax.swing.*; +import javax.swing.border.MatteBorder; +import javax.swing.border.TitledBorder; +import java.awt.*; + +/** + * Implementierung verschiedener Algorithmen zur Berechnung von Ausgleichsgeraden. + * + * @Author: Armin Wolf + * @Email: a_wolf28@uni-muenster.de + * @Date: 02.06.2017. + */ +public class SidePanel extends JPanel { + + + private JLabel[] labels; + private JTextField[] text; + + public SidePanel(){ + + this.setBorder(new TitledBorder("Eingabefelder")); + this.labels = new JLabel[10]; + this.text = new JTextField[10]; + this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); + + for (int i=0;i<9;i++){ + this.labels[i] = new JLabel("dummy "+i); + this.text[i] = new JTextField(); + this.add(this.labels[i]); + this.add(this.text[i]); + } + + + + } + +}