From 770eb87a74e7c949f5fe4cd9db2221c151ecd7f3 Mon Sep 17 00:00:00 2001 From: Bane Stojkovic Date: Tue, 11 Oct 2022 16:00:09 +0200 Subject: [PATCH] Standardize dark phenolic color --- .../src/org/diylc/components/AbstractComponent.java | 1 + .../diylc/components/boards/MarshallPerfBoard.java | 2 +- .../src/org/diylc/components/boards/TagStrip.java | 2 +- .../org/diylc/components/boards/TerminalStrip.java | 2 +- .../components/electromechanical/OpenJack1_4.java | 2 +- .../components/electromechanical/OpenJack1_8.java | 2 +- .../components/electromechanical/PilotLampHolder.java | 2 +- .../components/electromechanical/PlasticDCJack.java | 11 +++++------ .../electromechanical/RotarySelectorSwitch.java | 2 +- .../electromechanical/RotarySwitchSealed.java | 10 +++++----- ...arySwitchType.java => RotarySwitchSealedType.java} | 4 ++-- .../components/electromechanical/SlideSwitch.java | 2 +- .../src/org/diylc/components/guitar/LPSwitch.java | 2 +- .../test/org/diylc/netlist/RotarySwitchTests.java | 10 +++++----- 14 files changed, 27 insertions(+), 27 deletions(-) rename diylc/diylc-library/src/org/diylc/components/electromechanical/{RotarySwitchType.java => RotarySwitchSealedType.java} (91%) diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java index 68605a1c..2b1bbaa6 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java @@ -62,6 +62,7 @@ public abstract class AbstractComponent implements IDIYComponent { public static Color FR4_COLOR = Color.decode("#6B9B6B"); public static Color FR4_LIGHT_COLOR = Color.decode("#BABE71"); public static Color PHENOLIC_COLOR = Color.decode("#F8EBB3"); + public static Color PHENOLIC_DARK_COLOR = Color.decode("#CD8500"); @EditableProperty(defaultable = false) @Override diff --git a/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java b/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java index 76724ae1..c8777e2e 100644 --- a/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java +++ b/diylc/diylc-library/src/org/diylc/components/boards/MarshallPerfBoard.java @@ -49,7 +49,7 @@ public class MarshallPerfBoard extends AbstractBoard { private static final long serialVersionUID = 1L; - public static Color BOARD_COLOR = Color.decode("#CD8500"); + public static Color BOARD_COLOR = PHENOLIC_DARK_COLOR; public static Color BORDER_COLOR = BOARD_COLOR.darker(); public static Size SPACING = new Size(3 / 8d, SizeUnit.in); public static Size HOLE_SIZE = new Size(1 / 8d, SizeUnit.in); diff --git a/diylc/diylc-library/src/org/diylc/components/boards/TagStrip.java b/diylc/diylc-library/src/org/diylc/components/boards/TagStrip.java index 44a17102..7d4f54d1 100644 --- a/diylc/diylc-library/src/org/diylc/components/boards/TagStrip.java +++ b/diylc/diylc-library/src/org/diylc/components/boards/TagStrip.java @@ -57,7 +57,7 @@ public class TagStrip extends AbstractTransparentComponent implements IC private static final long serialVersionUID = 1L; - public static Color BOARD_COLOR = Color.decode("#CD8500"); + public static Color BOARD_COLOR = PHENOLIC_DARK_COLOR; public static Color TERMINAL_COLOR = Color.lightGray; public static Color TERMINAL_BORDER_COLOR = TERMINAL_COLOR.darker(); public static int EDGE_RADIUS = 2; diff --git a/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java b/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java index 16dbfee9..713a2814 100644 --- a/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java +++ b/diylc/diylc-library/src/org/diylc/components/boards/TerminalStrip.java @@ -57,7 +57,7 @@ public class TerminalStrip extends AbstractTransparentComponent implemen private static final long serialVersionUID = 1L; - public static Color BOARD_COLOR = Color.decode("#CD8500"); + public static Color BOARD_COLOR = PHENOLIC_DARK_COLOR; public static Color TERMINAL_COLOR = Color.lightGray; public static Color TERMINAL_BORDER_COLOR = TERMINAL_COLOR.darker(); public static int EDGE_RADIUS = 2; diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java index 66f4f84b..e3daae3e 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java @@ -66,7 +66,7 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { private static final long serialVersionUID = 1L; private static Color BASE_COLOR = Color.lightGray; - private static Color WAFER_COLOR = Color.decode("#CD8500"); + private static Color WAFER_COLOR = PHENOLIC_DARK_COLOR; private static Size OUTER_DIAMETER = new Size(0.75d, SizeUnit.in); private static Size INNER_DIAMETER = new Size(0.25d, SizeUnit.in); diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java index f458ae16..e7b08966 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java @@ -66,7 +66,7 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { private static final long serialVersionUID = 1L; private static Color BASE_COLOR = Color.lightGray; - private static Color WAFER_COLOR = Color.decode("#CD8500"); + private static Color WAFER_COLOR = PHENOLIC_DARK_COLOR; private static Size OUTER_DIAMETER = new Size(0.375d, SizeUnit.in); private static Size INNER_DIAMETER = new Size(0.125d, SizeUnit.in); diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java index 8496407d..7633bb65 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/PilotLampHolder.java @@ -58,7 +58,7 @@ public class PilotLampHolder extends AbstractMultiPartComponent { private static final long serialVersionUID = 1L; private static Color BASE_COLOR = Color.lightGray; - private static Color WAFER_COLOR = Color.decode("#CD8500"); + private static Color WAFER_COLOR = PHENOLIC_DARK_COLOR; private static final double SLEEVE_THETA = Math.PI * 0.29444444444; diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java index 876465df..b628c52c 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/PlasticDCJack.java @@ -61,7 +61,6 @@ public class PlasticDCJack extends AbstractMultiPartComponent { private static Size SPACING = new Size(0.1d, SizeUnit.in); private static Size DIAMETER = new Size(0.5d, SizeUnit.in); private static Color BODY_COLOR = Color.decode("#666666"); - private static Color PHENOLIC_COLOR = Color.decode("#CD8500"); private static Color BORDER_COLOR = Color.black; private static Color MARKING_COLOR = Color.lightGray; @@ -142,7 +141,7 @@ public class PlasticDCJack extends AbstractMultiPartComponent { g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR); g2d.fill(body[0]); if (!outlineMode) { - g2d.setColor(PHENOLIC_COLOR); + g2d.setColor(PHENOLIC_DARK_COLOR); g2d.fill(body[1]); } g2d.setComposite(oldComposite); @@ -163,7 +162,7 @@ public class PlasticDCJack extends AbstractMultiPartComponent { g2d.setColor(finalBorderColor); g2d.draw(body[0]); if (!outlineMode) { - g2d.setColor(PHENOLIC_COLOR.darker()); + g2d.setColor(PHENOLIC_DARK_COLOR.darker()); g2d.draw(body[1]); g2d.setColor(METAL_COLOR); @@ -200,9 +199,9 @@ public class PlasticDCJack extends AbstractMultiPartComponent { g2d.setColor(BORDER_COLOR); g2d.drawOval((width - diameter) / 2, (height - diameter) / 2, diameter, diameter); int rectWidth = getClosestOdd(((width - 2 * margin) / Math.sqrt(2)) - margin / 2); - g2d.setColor(PHENOLIC_COLOR); + g2d.setColor(PHENOLIC_DARK_COLOR); g2d.fillRect((width - rectWidth) / 2, (height - rectWidth) / 2, rectWidth, rectWidth); - g2d.setColor(PHENOLIC_COLOR.darker()); + g2d.setColor(PHENOLIC_DARK_COLOR.darker()); g2d.drawRect((width - rectWidth) / 2, (height - rectWidth) / 2, rectWidth, rectWidth); int lugWidth = 4 * 32 / width; g2d.setColor(METAL_COLOR); @@ -210,7 +209,7 @@ public class PlasticDCJack extends AbstractMultiPartComponent { g2d.drawLine(width * 2 / 3, (height - lugWidth) / 2, width * 2 / 3, (height + lugWidth) / 2); g2d.fillOval((width - lugWidth) / 2, height * 2 / 3 - lugWidth / 2, lugWidth, lugWidth); g2d.fillRect(width / 2 - lugWidth * 3 / 2, height * 2 / 3 - lugWidth / 2, lugWidth * 3 / 2, lugWidth); - g2d.setColor(PHENOLIC_COLOR); + g2d.setColor(PHENOLIC_DARK_COLOR); g2d.fillOval((width - margin) / 2, height * 2 / 3 - margin / 2, margin, margin); } diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySelectorSwitch.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySelectorSwitch.java index c0fca3ff..4c1e3990 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySelectorSwitch.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySelectorSwitch.java @@ -78,7 +78,7 @@ public class RotarySelectorSwitch extends AbstractMultiPartComponent { private Orientation orientation = Orientation.DEFAULT; private boolean showLabels = true; private RotaryPositionCount positionCount = RotaryPositionCount.THREE; - private SwitchTiming timing = SwitchTiming.SHORTING; + private SwitchTiming timing; public RotarySelectorSwitch() { super(); diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySwitchSealed.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySwitchSealed.java index 3c1893cd..3881380d 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySwitchSealed.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/RotarySwitchSealed.java @@ -57,7 +57,7 @@ import org.diylc.utils.Constants; instanceNamePrefix = "SW", description = "Sealed plastic rotary switch in several different switching configurations", zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, enableCache = true, transformer = AngledComponentTransformer.class) -public class RotarySwitchSealed extends AbstractAngledComponent implements ISwitch { +public class RotarySwitchSealed extends AbstractAngledComponent implements ISwitch { private static final int OUTER_ANGLE_OFFSET = 15; private static final int INNER_ANGLE_OFFSET = 30; @@ -76,10 +76,10 @@ public class RotarySwitchSealed extends AbstractAngledComponent i private static Size LUG_THICKNESS = new Size(0.1d, SizeUnit.in); private static Size HOLE_DIAMETER = new Size(3d, SizeUnit.mm); - private static Color BODY_COLOR = Color.decode("#CD8500"); + private static Color BODY_COLOR = PHENOLIC_DARK_COLOR; private static Color BORDER_COLOR = Color.gray; public static Color TERMINAL_COLOR = METAL_COLOR; public static Color LABEL_COLOR = Color.white; diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java b/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java index 1a2543c9..63d18a51 100644 --- a/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java +++ b/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java @@ -57,7 +57,7 @@ public class LPSwitch extends AbstractTransparentComponent implements IS private static final long serialVersionUID = 1L; private static Color BASE_COLOR = Color.lightGray; - private static Color WAFER_COLOR = Color.decode("#CD8500"); + private static Color WAFER_COLOR = PHENOLIC_DARK_COLOR; private static Size LENGTH = new Size(1.3d, SizeUnit.in); private static Size BASE_LENGTH = new Size(18d, SizeUnit.mm); diff --git a/diylc/diylc-library/test/org/diylc/netlist/RotarySwitchTests.java b/diylc/diylc-library/test/org/diylc/netlist/RotarySwitchTests.java index a7d04ce5..f43835a3 100644 --- a/diylc/diylc-library/test/org/diylc/netlist/RotarySwitchTests.java +++ b/diylc/diylc-library/test/org/diylc/netlist/RotarySwitchTests.java @@ -1,7 +1,7 @@ package org.diylc.netlist; import org.diylc.components.electromechanical.RotarySwitchSealed; -import org.diylc.components.electromechanical.RotarySwitchType; +import org.diylc.components.electromechanical.RotarySwitchSealedType; import org.junit.Test; public abstract class RotarySwitchTests extends AbstractSwitchTests { @@ -13,7 +13,7 @@ public abstract class RotarySwitchTests extends AbstractSwitchTests { String[] validCombinations = new String[] {"0,1,13", "1,2,13", "2,3,13", "3,4,13", "4,5,13", "5,6,13", "6,7,13", "7,8,13", "8,9,13", "9,10,13", "10,11,13", "11,12,13"}; - sw.setValue(RotarySwitchType._1P12T); + sw.setValue(RotarySwitchSealedType._1P12T); testSwitch(sw, validCombinations); } @@ -25,7 +25,7 @@ public abstract class RotarySwitchTests extends AbstractSwitchTests { "0,1,13", "1,2,13", "2,3,13", "3,4,13", "4,5,13", "5,6,13", "0,7,14", "1,8,14", "2,9,14", "3,10,14", "4,11,14", "5,12,14"}; - sw.setValue(RotarySwitchType.DP6T); + sw.setValue(RotarySwitchSealedType.DP6T); testSwitch(sw, validCombinations); } @@ -38,7 +38,7 @@ public abstract class RotarySwitchTests extends AbstractSwitchTests { "0,5,14", "1,6,14", "2,7,14", "3,8,14", "0,9,15", "1,10,15", "2,11,15", "3,12,15"}; - sw.setValue(RotarySwitchType._3P4T); + sw.setValue(RotarySwitchSealedType._3P4T); testSwitch(sw, validCombinations); } @@ -52,7 +52,7 @@ public abstract class RotarySwitchTests extends AbstractSwitchTests { "0,7,15", "1,8,15", "2,9,15", "0,10,16", "1,11,16", "2,12,16",}; - sw.setValue(RotarySwitchType._4P3T); + sw.setValue(RotarySwitchSealedType._4P3T); testSwitch(sw, validCombinations); } }