From ddcc6dc06f22f433ad799bb992ac4dc44496fb46 Mon Sep 17 00:00:00 2001
From: Mikael Capelle <capelle.mikael@gmail.com>
Date: Mon, 5 Mar 2018 19:27:30 +0100
Subject: [PATCH] Update path panel.

---
 res/cross_mark.png                            | Bin 0 -> 2118 bytes
 src/main/org/insa/graphics/PathsPanel.java    |  88 ++++++++++++++++--
 .../drawing/components/BasicDrawing.java      |  11 +++
 .../drawing/components/MapViewDrawing.java    |   4 +
 .../graphics/drawing/overlays/Overlay.java    |   6 ++
 5 files changed, 101 insertions(+), 8 deletions(-)
 create mode 100644 res/cross_mark.png

diff --git a/res/cross_mark.png b/res/cross_mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..b84f63557a0db23042a8679b028d6c198c78a0fc
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/src/main/org/insa/graphics/PathsPanel.java b/src/main/org/insa/graphics/PathsPanel.java
index 6c4c3c6..899b131 100644
--- a/src/main/org/insa/graphics/PathsPanel.java
+++ b/src/main/org/insa/graphics/PathsPanel.java
@@ -2,6 +2,8 @@ package org.insa.graphics;
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -15,13 +17,18 @@ import java.io.IOException;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JColorChooser;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 import javax.swing.border.EmptyBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import org.insa.graph.Graph;
 import org.insa.graph.Path;
@@ -49,6 +56,9 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
         // Path Overlay (not final due to redraw)
         private PathOverlay overlay;
 
+        // Color button
+        private final JButton colorButton;
+
         /**
          * Create a new bundle with the given path and create a new overlay
          * corresponding to the path.
@@ -59,7 +69,8 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
         public PathPanel(Path path) {
             super();
             setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-            setBorder(BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Color.GRAY),
+            setBorder(BorderFactory.createCompoundBorder(
+                    BorderFactory.createMatteBorder(0, 0, 1, 0, Color.GRAY),
                     new EmptyBorder(5, 0, 5, 0)));
             this.path = path;
             this.overlay = drawing.drawPath(this.path);
@@ -107,7 +118,58 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
                 }
             });
 
-            JButton saveButton = new JButton("Save");
+            colorButton = new JButton(" ");
+            colorButton.setOpaque(true);
+            colorButton.setBorderPainted(false);
+            colorButton.setBackground(this.overlay.getColor());
+            colorButton.setBorder(new EmptyBorder(0, 0, 0, 0));
+            Dimension size = colorButton.getPreferredSize();
+            size.setSize(size.height, size.height);
+            colorButton.setMinimumSize(size);
+            colorButton.setPreferredSize(size);
+            colorButton.setMaximumSize(size);
+
+            colorButton.setToolTipText("Pick a color");
+
+            colorButton.addActionListener(new ActionListener() {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    final Color originalColor = overlay.getColor();
+                    JColorChooser chooser = new JColorChooser(overlay.getColor());
+                    chooser.getSelectionModel().addChangeListener(new ChangeListener() {
+                        @Override
+                        public void stateChanged(ChangeEvent e) {
+                            colorButton
+                                    .setBackground(chooser.getSelectionModel().getSelectedColor());
+                            overlay.setColor(chooser.getSelectionModel().getSelectedColor());
+                            overlay.redraw();
+                        }
+                    });
+
+                    JColorChooser.createDialog(getTopLevelAncestor(), "Pick a new color", true,
+                            chooser, new ActionListener() {
+                                @Override
+                                public void actionPerformed(ActionEvent e) {
+                                    colorButton.setBackground(
+                                            chooser.getSelectionModel().getSelectedColor());
+                                    overlay.setColor(
+                                            chooser.getSelectionModel().getSelectedColor());
+                                    overlay.redraw();
+                                }
+                            }, new ActionListener() {
+                                @Override
+                                public void actionPerformed(ActionEvent e) {
+                                    colorButton.setBackground(originalColor);
+                                    overlay.setColor(originalColor);
+                                    overlay.redraw();
+                                }
+                            }).setVisible(true);
+                    ;
+
+                }
+            });
+
+            JButton saveButton = new JButton(UIManager.getIcon("FileView.floppyDriveIcon"));
             saveButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
@@ -118,12 +180,14 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
                     JFileChooser fileChooser = new JFileChooser();
                     fileChooser.setSelectedFile(new File(filepath));
                     fileChooser.setApproveButtonText("Save");
+                    fileChooser.setToolTipText("Save");
 
-                    if (fileChooser.showOpenDialog(getTopLevelAncestor()) == JFileChooser.APPROVE_OPTION) {
+                    if (fileChooser
+                            .showSaveDialog(getTopLevelAncestor()) == JFileChooser.APPROVE_OPTION) {
                         File file = fileChooser.getSelectedFile();
                         try {
-                            BinaryPathWriter writer = new BinaryPathWriter(
-                                    new DataOutputStream(new BufferedOutputStream(new FileOutputStream(file))));
+                            BinaryPathWriter writer = new BinaryPathWriter(new DataOutputStream(
+                                    new BufferedOutputStream(new FileOutputStream(file))));
                             writer.writePath(path);
                         }
                         catch (IOException e1) {
@@ -135,7 +199,13 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
                 }
             });
 
-            JButton deleteButton = new JButton("Delete");
+            Image newimg = new ImageIcon("res/cross_mark.png").getImage()
+                    .getScaledInstance(size.width, size.height, java.awt.Image.SCALE_SMOOTH);
+            JButton deleteButton = new JButton(new ImageIcon(newimg));
+            deleteButton.setMinimumSize(size);
+            deleteButton.setMaximumSize(size);
+            deleteButton.setBorderPainted(true);
+            deleteButton.setOpaque(false);
             deleteButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
@@ -148,6 +218,7 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
             add(Box.createHorizontalStrut(5));
             add(infoPanel);
             add(Box.createHorizontalGlue());
+            add(colorButton);
             add(saveButton);
             add(deleteButton);
 
@@ -160,17 +231,18 @@ public class PathsPanel extends JPanel implements DrawingChangeListener, GraphCh
         public void updateOverlay() {
             PathOverlay oldOverlay = this.overlay;
             this.overlay = drawing.drawPath(path);
+            this.colorButton.setBackground(this.overlay.getColor());
             this.overlay.setVisible(oldOverlay.isVisible());
             oldOverlay.delete();
         }
 
         /*
          * (non-Javadoc)
-         * 
          * @see java.lang.Object#toString()
          */
         public String toString() {
-            return "Path from #" + path.getOrigin().getId() + " to #" + path.getDestination().getId();
+            return "Path from #" + path.getOrigin().getId() + " to #"
+                    + path.getDestination().getId();
         }
 
     }
diff --git a/src/main/org/insa/graphics/drawing/components/BasicDrawing.java b/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
index 3cbd885..e249179 100644
--- a/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
+++ b/src/main/org/insa/graphics/drawing/components/BasicDrawing.java
@@ -102,6 +102,10 @@ public class BasicDrawing extends JPanel implements Drawing {
 
         public abstract void drawImpl(Graphics2D g);
 
+        public void redraw() {
+            BasicDrawing.this.repaint();
+        }
+
     };
 
     private class BasicMarkerOverlay extends BasicOverlay implements MarkerOverlay {
@@ -168,6 +172,13 @@ public class BasicDrawing extends JPanel implements Drawing {
             this.color = color;
         }
 
+        @Override
+        public void setColor(Color color) {
+            super.setColor(color);
+            this.origin.setColor(color);
+            this.destination.setColor(color);
+        }
+
         @Override
         public void drawImpl(Graphics2D graphics) {
 
diff --git a/src/main/org/insa/graphics/drawing/components/MapViewDrawing.java b/src/main/org/insa/graphics/drawing/components/MapViewDrawing.java
index 4eb76af..28d3f2f 100644
--- a/src/main/org/insa/graphics/drawing/components/MapViewDrawing.java
+++ b/src/main/org/insa/graphics/drawing/components/MapViewDrawing.java
@@ -107,6 +107,10 @@ public class MapViewDrawing extends MapView implements Drawing {
             }
         }
 
+        @Override
+        public void redraw() {
+            MapViewDrawing.this.getLayerManager().redrawLayers();
+        }
     };
 
     /**
diff --git a/src/main/org/insa/graphics/drawing/overlays/Overlay.java b/src/main/org/insa/graphics/drawing/overlays/Overlay.java
index b95645f..26ad6b5 100644
--- a/src/main/org/insa/graphics/drawing/overlays/Overlay.java
+++ b/src/main/org/insa/graphics/drawing/overlays/Overlay.java
@@ -33,4 +33,10 @@ public interface Overlay {
      */
     public void delete();
 
+    /**
+     * Request a redraw of this overlay - This can start a full redraw of the inner
+     * drawing.
+     */
+    public void redraw();
+
 }