Skip to content

Commit

Permalink
Issue debrief#1160 - Aesthetic color scheme for tracks
Browse files Browse the repository at this point in the history
  • Loading branch information
@pecko
pecko committed May 6, 2015
1 parent 1c45302 commit 53250e9
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 28 deletions.
37 changes: 20 additions & 17 deletions org.mwc.cmap.legacy/src/MWC/GUI/Properties/ColorPropertyEditor.java
View file
Expand Up @@ -132,23 +132,26 @@ public ColorPropertyEditor()
protected Vector<NamedColor> createColors()
{
final Vector<NamedColor> theColors = new Vector<NamedColor>();
theColors.addElement(new NamedColor("Red", Color.red));
theColors.addElement(new NamedColor("Blue", Color.blue));
theColors.addElement(new NamedColor("Green", Color.green));
theColors.addElement(new NamedColor("Yellow", Color.yellow));
theColors.addElement(new NamedColor("Magenta", Color.magenta));
theColors.addElement(new NamedColor("Purple", new Color(169, 1, 132)));
theColors.addElement(new NamedColor("Orange", Color.orange));
theColors.addElement(new NamedColor("Brown", new Color(188, 93, 6)));
theColors.addElement(new NamedColor("Cyan", Color.cyan));
theColors.addElement(new NamedColor("Light Green", new Color(100, 240, 100)));
theColors.addElement(new NamedColor("Gold", new Color(230, 200, 20)));
theColors.addElement(new NamedColor("Pink", Color.pink));
theColors.addElement(new NamedColor("Light Grey", Color.lightGray));
theColors.addElement(new NamedColor("Grey", Color.gray));
theColors.addElement(new NamedColor("Dark Grey", Color.darkGray));
theColors.addElement(new NamedColor("White", Color.white));
theColors.addElement(new NamedColor("Black", Color.black));
theColors.addElement(new NamedColor("Red", DebriefColors.RED));
theColors.addElement(new NamedColor("Blue", DebriefColors.BLUE));
theColors.addElement(new NamedColor("Green", DebriefColors.GREEN));

theColors.addElement(new NamedColor("Yellow", DebriefColors.YELLOW));
theColors.addElement(new NamedColor("Magenta", DebriefColors.MAGENTA));
theColors.addElement(new NamedColor("Purple", DebriefColors.PURPLE));
theColors.addElement(new NamedColor("Orange", DebriefColors.ORANGE));
theColors.addElement(new NamedColor("Brown", DebriefColors.BROWN));
theColors.addElement(new NamedColor("Cyan", DebriefColors.CYAN));
theColors.addElement(new NamedColor("Light Green", DebriefColors.LIGHT_GREEN));
theColors.addElement(new NamedColor("Gold", DebriefColors.GOLD));
theColors.addElement(new NamedColor("Pink", DebriefColors.PINK));
theColors.addElement(new NamedColor("Light Grey", DebriefColors.LIGHT_GRAY));
theColors.addElement(new NamedColor("Grey", DebriefColors.GRAY));
theColors.addElement(new NamedColor("Dark Grey", DebriefColors.DARK_GRAY));
theColors.addElement(new NamedColor("White", DebriefColors.WHITE));
theColors.addElement(new NamedColor("Black", DebriefColors.BLACK));
theColors.addElement(new NamedColor("Medium Blue", DebriefColors.MEDIUM_BLUE));
theColors.addElement(new NamedColor("Dark Blue", DebriefColors.DARK_BLUE));

return theColors;
}
Expand Down
31 changes: 31 additions & 0 deletions org.mwc.cmap.legacy/src/MWC/GUI/Properties/DebriefColors.java
View file
@@ -0,0 +1,31 @@
package MWC.GUI.Properties;

import java.awt.Color;

public interface DebriefColors
{

public static Color BLACK = new Color(26, 26, 26);
public static Color DARK_BLUE = new Color(101, 149, 204);
public static Color DARK_GRAY = new Color(192, 192, 192);
public static Color MEDIUM_BLUE = new Color(165, 191, 221);
public static Color LIGHT_GRAY = new Color(237, 237, 237);
public static Color WHITE = new Color(255, 255, 254);

public static Color RED = new Color(204, 0, 51);
public static Color GREEN = new Color(0, 128, 11);
public static Color BLUE = new Color(0, 100, 189);

public static Color LIGHT_GREEN = new Color(88, 255, 0);
public static Color YELLOW = new Color(255, 215, 0);
public static Color ORANGE = new Color(255, 150, 0);
public static Color BROWN = new Color(153, 102, 0);
public static Color CYAN = new Color(0, 255, 255);
public static Color PINK = new Color(255, 77, 255);
public static Color PURPLE = new Color(161, 0, 230);

// old colors
public static Color MAGENTA = Color.magenta;
public static Color GOLD = new Color(230, 200, 20);
public static Color GRAY = Color.gray;
}
32 changes: 21 additions & 11 deletions org.mwc.debrief.legacy/src/Debrief/ReaderWriter/Replay/ImportReplay.java
View file
Expand Up @@ -289,6 +289,7 @@
import MWC.GUI.PlainWrapper;
import MWC.GUI.Plottable;
import MWC.GUI.ToolParent;
import MWC.GUI.Properties.DebriefColors;
import MWC.GUI.Shapes.PlainShape;
import MWC.GUI.Shapes.Symbols.SymbolFactory;
import MWC.GUI.Tools.Action;
Expand Down Expand Up @@ -388,17 +389,26 @@ private synchronized static void initialiseColours()
{
colors = new Vector<doublet>(0, 1);
colors.addElement(new doublet("@", Color.white));
colors.addElement(new doublet("A", Color.blue));
colors.addElement(new doublet("B", Color.green));
colors.addElement(new doublet("C", Color.red));
colors.addElement(new doublet("D", Color.yellow));
colors.addElement(new doublet("E", new Color(169, 1, 132)));
colors.addElement(new doublet("F", Color.orange));
colors.addElement(new doublet("G", new Color(188, 93, 6)));
colors.addElement(new doublet("H", Color.cyan));
colors.addElement(new doublet("I", new Color(100, 240, 100)));
colors.addElement(new doublet("J", new Color(230, 200, 20)));
colors.addElement(new doublet("K", Color.pink));
colors.addElement(new doublet("A", DebriefColors.BLUE));
colors.addElement(new doublet("B", DebriefColors.GREEN));
colors.addElement(new doublet("C", DebriefColors.RED));

colors.addElement(new doublet("D", DebriefColors.YELLOW));
colors.addElement(new doublet("E", DebriefColors.MAGENTA));
colors.addElement(new doublet("F", DebriefColors.ORANGE));
colors.addElement(new doublet("G", DebriefColors.PURPLE));
colors.addElement(new doublet("H", DebriefColors.CYAN));
colors.addElement(new doublet("I", DebriefColors.BROWN));
colors.addElement(new doublet("J", DebriefColors.LIGHT_GREEN));
colors.addElement(new doublet("K", DebriefColors.PINK));
colors.addElement(new doublet("L", DebriefColors.GOLD));
colors.addElement(new doublet("M", DebriefColors.LIGHT_GRAY));
colors.addElement(new doublet("N", DebriefColors.GRAY));
colors.addElement(new doublet("O", DebriefColors.DARK_GRAY));
colors.addElement(new doublet("P", DebriefColors.WHITE));
colors.addElement(new doublet("Q", DebriefColors.BLACK));
colors.addElement(new doublet("R", DebriefColors.MEDIUM_BLUE));
colors.addElement(new doublet("S", DebriefColors.DARK_BLUE));
}
}

Expand Down

0 comments on commit 53250e9

Please sign in to comment.