Changeset 26713 in osm for applications/editors/josm/plugins

Timestamp:

2011-09-27T21:23:20+02:00 (13 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam

Files:

• panels/PanelCol.java (modified) (3 diffs)
• panels/PanelPat.java (modified) (1 diff)
• seamarks/SeaMark.java (modified) (2 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelCol.java

@@ -6 +6 @@
 import java.awt.event.*;
 import javax.swing.*;
+
 import java.util.*;
 
@@ -41 +42 @@
                                         if (dlg.mark != null) {
                                                 dlg.mark.setColour(ent, col);
-                                                // act.actionPerformed(null);
+                                                if (ent != Ent.LIGHT) {
+                                                        stackCol.get(stackIdx).setBackground(dlg.mark.ColMAP.get(dlg.mark.getColour(ent, stackIdx)));
+                                                }
                                         }
+                                        button.setBorderPainted(true);
+                                } else
+                                        button.setBorderPainted(false);
+                        }
+                }
+        };
+        private JPanel stack;
+        private ButtonGroup stackColours = new ButtonGroup();
+        private ArrayList<JRadioButton> stackCol = new ArrayList<JRadioButton>();
+        private int stackIdx = 0;
+        private ActionListener alStack = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        for (int i = 0; stackCol.size() > i; i++) {
+                                JRadioButton button = stackCol.get(i);
+                                if (button.isSelected()) {
+                                        stackIdx = i;
                                         button.setBorderPainted(true);
                                 } else
@@ -71 +90 @@
                         this.add(getColButton(magentaButton, 35, 48, 34, 16, Messages.getString("Magenta"), Col.MAGENTA), null);
                         this.add(getColButton(pinkButton, 35, 64, 34, 16, Messages.getString("Pink"), Col.PINK), null);
+
+                        stack = new JPanel();
+                        stack.setBorder(BorderFactory.createLineBorder(Color.black));
+                        stack.setBounds(37, 89, 30, 60);
+                        this.add(stack);
+                        Col col;
+                        for (int i = 0; (col = dlg.mark.getColour(ent, i)) != Col.UNKNOWN; i++) {
+                                stackCol.add(new JRadioButton());
+                        }
+
                 }
         }

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPat.java

@@ -53 +53 @@
                 this.add(getPatButton(squareButton, 72, 104, 27, 27, "SquarePat", Pat.SQUARE), null);
                 this.add(getPatButton(borderButton, 72, 130, 27, 27, "BorderPat", Pat.BORDER), null);
-
+                
         }
 

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -3 +3 @@
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.Color.*;
 import javax.swing.*;
 import java.util.*;
@@ -259 +260 @@
         }
 
+        public static final EnumMap<Col, Color> ColMAP = new EnumMap<Col, Color>(Col.class);
+        static {
+                ColMAP.put(Col.WHITE, Color.WHITE);
+                ColMAP.put(Col.RED, Color.RED);
+                ColMAP.put(Col.ORANGE, Color.ORANGE);
+                ColMAP.put(Col.AMBER, new Color(0xffbf00f));
+                ColMAP.put(Col.YELLOW, Color.YELLOW);
+                ColMAP.put(Col.GREEN, Color.GREEN);
+                ColMAP.put(Col.BLUE, Color.BLUE);
+                ColMAP.put(Col.VIOLET, new Color(0x8f00ff));
+                ColMAP.put(Col.BLACK, Color.BLACK);
+                ColMAP.put(Col.GREY, Color.GRAY);
+                ColMAP.put(Col.BROWN, new Color(0xa45a58));
+                ColMAP.put(Col.MAGENTA, Color.MAGENTA);
+                ColMAP.put(Col.PINK, Color.PINK);
+        }
+
         public static final EnumMap<Col, String> ColSTR = new EnumMap<Col, String>(Col.class);
         static {