diff --git a/src/main/java/View/ArrangementDialog2.java b/src/main/java/View/ArrangementDialog2.java new file mode 100644 index 0000000..8e1dc8e --- /dev/null +++ b/src/main/java/View/ArrangementDialog2.java @@ -0,0 +1,66 @@ +package View; + +import Model.Coordinates; + +import javax.swing.*; +import java.awt.*; +import java.util.LinkedList; + +/** + * Implementierung verschiedener Algorithmen zur Berechnung von Ausgleichsgeraden. + * + * @Author: Armin Wolf + * @Email: a_wolf28@uni-muenster.de + * @Date: 03.06.2017. + */ +public class ArrangementDialog2 extends JPanel { + + private double scale; + + private int min = 0; + private int max = 600; + private int zero = max/2; + + private Dimension dimension; + private LinkedList lines; + private LinkedList points; + + + public ArrangementDialog2(){ + super(); + this.dimension = new Dimension(max,max); + this.setPreferredSize(dimension); + } + + public void setPrameters(Double pmax, Double pmin, LinkedList lines, LinkedList points) { + this.scale = max / (Math.abs(pmin) - Math.abs(pmax)); + this.lines = lines; + this.points = points; + + scalePoints(); + this.repaint(); + } + + private void scalePoints(){ + for (Coordinates c : lines) { + c.setX(c.getX() * scale); + c.setY(c.getY() * scale); + } + + JOptionPane.showMessageDialog(null,points.size()); + for (Coordinates c : points) { + c.setX((c.getX() * scale) + zero); + c.setY((c.getY()* scale) + zero); + } + + } + + @Override + protected void paintComponent(Graphics g){ + super.paintComponent(g); + g.setColor(Color.BLACK); + for (Coordinates point : points) { + g.drawRect(point.getX().intValue(),point.getY().intValue(), 5, 5); + } + } +} diff --git a/src/main/java/View/MainFrame.java b/src/main/java/View/MainFrame.java index e72762a..6a13fa9 100644 --- a/src/main/java/View/MainFrame.java +++ b/src/main/java/View/MainFrame.java @@ -30,7 +30,7 @@ public class MainFrame extends JFrame { private JPanel sidepanel; private JSplitPane splitpane; private JScrollPane scrollPane; - private ArrangementDialog arrangement; + private ArrangementDialog2 arrangement; private PlotDialog plot; public MainFrame() { @@ -51,9 +51,9 @@ public class MainFrame extends JFrame { public void createArrangement() { if (arrangement == null) { - arrangement = new ArrangementDialog(); + arrangement = new ArrangementDialog2(); arrangement.setPrameters(getPresenter().getMax(), getPresenter().getMin(), getPresenter().getLines(), getPresenter().getModel().getNodes()); - arrangement.createArrangement(); + // arrangement.createArrangement(); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { @@ -103,7 +103,7 @@ public class MainFrame extends JFrame { arrangementDialog = new JDialog(); plotDialog = new JDialog(); - arrangementDialog.setSize(new Dimension(700, 470)); + arrangementDialog.setSize(new Dimension(600, 600)); plotDialog.setSize(new Dimension(700, 470)); arrangementDialog.setTitle("Arrangement Dialog"); plotDialog.setTitle("Scatter Plot Dialog");