色覚障害を考慮した配色に変更する

diff --git a/KancolleSniffer.sln.DotSettings b/KancolleSniffer.sln.DotSettings
index 1abdb2e..94ec7ae 100644 (file)
--- a/KancolleSniffer.sln.DotSettings
+++ b/KancolleSniffer.sln.DotSettings
@@ -6,6 +6,7 @@
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_SIZEOF_PARENTHESES/@EntryValue">False</s:Boolean>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_BEFORE_TYPEOF_PARENTHESES/@EntryValue">False</s:Boolean>
        <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=API/@EntryIndexedValue">API</s:String>
+       <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CUD/@EntryIndexedValue">CUD</s:String>
        <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FLASHWINFO/@EntryIndexedValue">FLASHWINFO</s:String>
        <s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IO/@EntryIndexedValue">IO</s:String>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>

diff --git a/KancolleSniffer/AirBattleResultPanel.cs b/KancolleSniffer/AirBattleResultPanel.cs
index 0c1ee56..0b4bbb5 100644 (file)
--- a/KancolleSniffer/AirBattleResultPanel.cs
+++ b/KancolleSniffer/AirBattleResultPanel.cs
@@ -138,7 +138,7 @@ namespace KancolleSniffer
                 return;\r
             var result = _resultList[_resultIndex];\r
             _phaseName.Text = result.PhaseName;\r
-            var color = new[] {DefaultForeColor, Color.Blue, Color.Green, Color.Orange, Color.Red};\r
+            var color = new[] {DefaultForeColor, CUDColor.Blue, CUDColor.Green, CUDColor.Orange, CUDColor.Red};\r
             _stage1.ForeColor = color[result.AirControlLevel];\r
             var stages = new[] {result.Stage1, result.Stage2};\r
             for (var i = 0; i < 2; i++)\r

diff --git a/KancolleSniffer/CUDColor.cs b/KancolleSniffer/CUDColor.cs
new file mode 100644 (file)
index 0000000..34e76c6
--- /dev/null
+++ b/KancolleSniffer/CUDColor.cs
@@ -0,0 +1,17 @@
+using System.Drawing;\r
+\r
+namespace KancolleSniffer\r
+{\r
+    /// <summary>\r
+    /// カラーユニバーサルデザイン推奨配色セットの色を定義する。\r
+    /// http://jfly.iam.u-tokyo.ac.jp/colorset/CUD_color_set_ver3_panel_2013.pdf\r
+    /// </summary>\r
+    public class CUDColor\r
+    {\r
+        public static Color Red => Color.FromArgb(255, 40, 0);\r
+        public static Color Orange => Color.FromArgb(255, 153, 0);\r
+        public static Color Yellow => Color.FromArgb(250, 245, 0);\r
+        public static Color Green => Color.FromArgb(53, 161, 107);\r
+        public static Color Blue => Color.FromArgb(0, 65, 255);\r
+    }\r
+}
\ No newline at end of file

diff --git a/KancolleSniffer/KancolleSniffer.csproj b/KancolleSniffer/KancolleSniffer.csproj
index 07d2577..3b0638f 100644 (file)
--- a/KancolleSniffer/KancolleSniffer.csproj
+++ b/KancolleSniffer/KancolleSniffer.csproj
@@ -67,6 +67,7 @@
     <Compile Include="ConfigDialog.Designer.cs">\r
       <DependentUpon>ConfigDialog.cs</DependentUpon>\r
     </Compile>\r
+    <Compile Include="CUDColor.cs" />\r
     <Compile Include="DbTreeView.cs">\r
       <SubType>Component</SubType>\r
     </Compile>\r

diff --git a/KancolleSniffer/MainForm.cs b/KancolleSniffer/MainForm.cs
index a69ec1c..8d2d137 100644 (file)
--- a/KancolleSniffer/MainForm.cs
+++ b/KancolleSniffer/MainForm.cs
@@ -430,7 +430,7 @@ namespace KancolleSniffer
         {\r
             var item = _sniffer.Item;\r
             labelNumOfShips.Text = $"{item.NowShips:D}/{item.MaxShips:D}";\r
-            labelNumOfShips.ForeColor = item.TooManyShips ? Color.Red : Color.Black;\r
+            labelNumOfShips.ForeColor = item.TooManyShips ? CUDColor.Red : Color.Black;\r
             if (item.RingShips)\r
             {\r
                 var message = $"残り{_sniffer.Item.MaxShips - _sniffer.Item.NowShips:D}隻";\r
@@ -443,7 +443,7 @@ namespace KancolleSniffer
         {\r
             var item = _sniffer.Item;\r
             labelNumOfEquips.Text = $"{item.NowEquips:D}/{item.MaxEquips:D}";\r
-            labelNumOfEquips.ForeColor = item.TooManyEquips ? Color.Red : Color.Black;\r
+            labelNumOfEquips.ForeColor = item.TooManyEquips ? CUDColor.Red : Color.Black;\r
             if (item.RingEquips)\r
             {\r
                 var message = $"残り{_sniffer.Item.MaxEquips - _sniffer.Item.NowEquips:D}個";\r
@@ -604,9 +604,9 @@ namespace KancolleSniffer
                 toolTipFighterPower.SetToolTip(labelEnemyFighterPowerCaption, text);\r
             }\r
             UpdateFighterPower(_sniffer.CombinedFleetType > 0 && battle.EnemyIsCombined);\r
-            var color = new[]\r
-                {DefaultForeColor, DefaultForeColor, Color.FromArgb(0, 90, 255), Color.Green, Color.Orange, Color.Red};\r
-            labelFighterPower.ForeColor = color[battle.AirControlLevel + 1];\r
+            labelFighterPower.ForeColor = new[]\r
+                {DefaultForeColor, DefaultForeColor, CUDColor.Blue, CUDColor.Green, CUDColor.Orange, CUDColor.Red}[\r
+                battle.AirControlLevel + 1];\r
         }\r
 \r
         private void ShowResultRank()\r
@@ -702,7 +702,7 @@ namespace KancolleSniffer
 \r
         private void SetTimerColor(Label label, RingTimer timer)\r
         {\r
-            label.ForeColor = timer.IsFinished ? Color.Red : Color.Black;\r
+            label.ForeColor = timer.IsFinished ? CUDColor.Red : Color.Black;\r
         }\r
 \r
         private void UpdateCondTimers()\r
@@ -761,7 +761,7 @@ namespace KancolleSniffer
         {\r
             var akashi = _sniffer.AkashiTimer;\r
             var span = akashi.PresetDeckTimer;\r
-            var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? Color.Red : DefaultForeColor;\r
+            var color = span == TimeSpan.Zero && akashi.CheckPresetReparing() ? CUDColor.Red : DefaultForeColor;\r
             var text = span == TimeSpan.MinValue ? "" : span.ToString(@"mm\:ss");\r
             labelAkashiRepairTimer.ForeColor = color;\r
             labelAkashiRepairTimer.Text = text;\r

diff --git a/KancolleSniffer/ShipLabels.cs b/KancolleSniffer/ShipLabels.cs
index d1a8d90..4e7347b 100644 (file)
--- a/KancolleSniffer/ShipLabels.cs
+++ b/KancolleSniffer/ShipLabels.cs
@@ -262,7 +262,7 @@ namespace KancolleSniffer
                     continue;\r
                 }\r
                 if (i == shortest)\r
-                    label.ForeColor = Color.Red;\r
+                    label.ForeColor = CUDColor.Red;\r
                 labelHp.ForeColor = Color.DimGray;\r
                 labelHp.SetHp(stat.NowHp + timer.Diff, stat.MaxHp);\r
             }\r
@@ -354,7 +354,7 @@ namespace KancolleSniffer
         public void SetNDockTimer(int dock, RingTimer timer, bool finishTime)\r
         {\r
             var label = _ndockLabels[dock][0];\r
-            label.ForeColor = timer.IsFinished ? Color.Red : Color.Black;\r
+            label.ForeColor = timer.IsFinished ? CUDColor.Red : Color.Black;\r
             label.Text = timer.ToString(finishTime);\r
         }\r
     }\r
@@ -463,9 +463,9 @@ namespace KancolleSniffer
                 case ShipStatus.Damage.Sunk:\r
                     return Color.CornflowerBlue;\r
                 case ShipStatus.Damage.Badly:\r
-                    return Color.Red;\r
+                    return CUDColor.Red;\r
                 case ShipStatus.Damage.Half:\r
-                    return Color.Orange;\r
+                    return CUDColor.Orange;\r
                 case ShipStatus.Damage.Small:\r
                     return Color.FromArgb(240, 240, 0);\r
                 default:\r
@@ -478,10 +478,10 @@ namespace KancolleSniffer
             var cond = status.Cond;\r
             Text = cond.ToString("D");\r
             BackColor = cond >= 50\r
-                ? Color.Yellow\r
+                ? CUDColor.Yellow\r
                 : cond >= 30\r
                     ? PresetColor\r
-                    : cond >= 20 ? Color.Orange : Color.Red;\r
+                    : cond >= 20 ? CUDColor.Orange : CUDColor.Red;\r
         }\r
 \r
         public void SetLevel(ShipStatus status)\r