default level color fix. refactoring

cadon · Jul 6, 2024 · d6f2211 · d6f2211
1 parent 56e5cb8
commit d6f2211
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 30 deletions.
diff --git a/ARKBreedingStats/ARKBreedingStats.csproj b/ARKBreedingStats/ARKBreedingStats.csproj
@@ -145,10 +145,10 @@
     <Compile Include="uiControls\Hatching.Designer.cs">
       <DependentUpon>Hatching.cs</DependentUpon>
     </Compile>
-    <Compile Include="uiControls\HueControl.cs">
+    <Compile Include="StatsOptions\HueControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="uiControls\HueControl.Designer.cs">
+    <Compile Include="StatsOptions\HueControl.Designer.cs">
       <DependentUpon>HueControl.cs</DependentUpon>
     </Compile>
     <Compile Include="uiControls\LibraryFilterTemplates.cs">
@@ -173,11 +173,11 @@
     <Compile Include="uiControls\ScrollForm.Designer.cs">
       <DependentUpon>ScrollForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="StatsOptions\StatOptionsControl.cs">
+    <Compile Include="StatsOptions\StatLevelGraphOptionsControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="StatsOptions\StatOptionsControl.Designer.cs">
-      <DependentUpon>StatOptionsControl.cs</DependentUpon>
+    <Compile Include="StatsOptions\StatLevelGraphOptionsControl.Designer.cs">
+      <DependentUpon>StatLevelGraphOptionsControl.cs</DependentUpon>
     </Compile>
     <Compile Include="StatsOptions\LevelGraphOptionsControl.cs">
       <SubType>Component</SubType>
@@ -765,7 +765,7 @@
     <EmbeddedResource Include="uiControls\Hatching.resx">
       <DependentUpon>Hatching.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="uiControls\HueControl.resx">
+    <EmbeddedResource Include="StatsOptions\HueControl.resx">
       <DependentUpon>HueControl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="uiControls\LibraryFilterTemplates.resx">
@@ -777,8 +777,8 @@
     <EmbeddedResource Include="uiControls\ScrollForm.resx">
       <DependentUpon>ScrollForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="StatsOptions\StatOptionsControl.resx">
-      <DependentUpon>StatOptionsControl.cs</DependentUpon>
+    <EmbeddedResource Include="StatsOptions\StatLevelGraphOptionsControl.resx">
+      <DependentUpon>StatLevelGraphOptionsControl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="uiControls\StatSelector.resx">
       <DependentUpon>StatSelector.cs</DependentUpon>

diff --git a/ARKBreedingStats/App.config b/ARKBreedingStats/App.config
@@ -409,10 +409,10 @@
                 <value>False</value>
             </setting>
             <setting name="ChartHueEvenMin" serializeAs="String">
-                <value>120</value>
+                <value>0</value>
             </setting>
             <setting name="ChartHueEvenMax" serializeAs="String">
-                <value>200</value>
+                <value>120</value>
             </setting>
             <setting name="ChartHueOddMin" serializeAs="String">
                 <value>240</value>

diff --git a/ARKBreedingStats/Properties/Settings.Designer.cs b/ARKBreedingStats/Properties/Settings.Designer.cs
diff --git a/ARKBreedingStats/Properties/Settings.settings b/ARKBreedingStats/Properties/Settings.settings
@@ -462,10 +462,10 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="ChartHueEvenMin" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">120</Value>
+      <Value Profile="(Default)">0</Value>
     </Setting>
     <Setting Name="ChartHueEvenMax" Type="System.Int32" Scope="User">
-      <Value Profile="(Default)">200</Value>
+      <Value Profile="(Default)">120</Value>
     </Setting>
     <Setting Name="ChartHueOddMin" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">240</Value>

diff --git a/...ngStats/uiControls/HueControl.Designer.cs → ...Stats/StatsOptions/HueControl.Designer.cs b/...ngStats/uiControls/HueControl.Designer.cs → ...Stats/StatsOptions/HueControl.Designer.cs
diff --git a/ARKBreedingStats/uiControls/HueControl.cs → ARKBreedingStats/StatsOptions/HueControl.cs b/ARKBreedingStats/uiControls/HueControl.cs → ARKBreedingStats/StatsOptions/HueControl.cs
@@ -1,12 +1,11 @@
-using ARKBreedingStats.library;
-using ARKBreedingStats.utils;
-using System;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using ARKBreedingStats.StatsOptions;
+using ARKBreedingStats.uiControls;
+using ARKBreedingStats.utils;
 using Newtonsoft.Json;
 
-namespace ARKBreedingStats.uiControls
+namespace ARKBreedingStats.StatsOptions
 {
     public partial class HueControl : UserControl
     {

diff --git a/ARKBreedingStats/uiControls/HueControl.resx → ...reedingStats/StatsOptions/HueControl.resx b/ARKBreedingStats/uiControls/HueControl.resx → ...reedingStats/StatsOptions/HueControl.resx
diff --git a/ARKBreedingStats/StatsOptions/LevelGraphOptionsControl.cs b/ARKBreedingStats/StatsOptions/LevelGraphOptionsControl.cs
@@ -11,7 +11,7 @@ namespace ARKBreedingStats.uiControls
 {
     internal class LevelGraphOptionsControl : TableLayoutPanel
     {
-        private StatOptionsControl[] _statOptionsControls;
+        private StatLevelGraphOptionsControl[] _statOptionsControls;
         private readonly ToolTip _tt = new ToolTip();
         private StatsOptions<StatLevelColors> _selectedStatsOptions;
         private readonly StatsOptionsSettings<StatLevelColors> _statsOptionsSettings;
@@ -103,10 +103,10 @@ private void InitializeControls()
 
         private void InitializeStatControls(FlowLayoutPanel flpStatControls)
         {
-            _statOptionsControls = new StatOptionsControl[Stats.StatsCount];
+            _statOptionsControls = new StatLevelGraphOptionsControl[Stats.StatsCount];
             foreach (var si in Stats.DisplayOrder)
             {
-                var c = new StatOptionsControl($"[{si}] {Utils.StatName(si, true)}", si, _tt);
+                var c = new StatLevelGraphOptionsControl($"[{si}] {Utils.StatName(si, true)}", si, _tt);
                 _statOptionsControls[si] = c;
                 flpStatControls.Controls.Add(c);
                 flpStatControls.SetFlowBreak(c, true);

diff --git a/...atsOptions/StatOptionsControl.Designer.cs → .../StatLevelGraphOptionsControl.Designer.cs b/...atsOptions/StatOptionsControl.Designer.cs → .../StatLevelGraphOptionsControl.Designer.cs
diff --git a/...gStats/StatsOptions/StatOptionsControl.cs → ...tsOptions/StatLevelGraphOptionsControl.cs b/...gStats/StatsOptions/StatOptionsControl.cs → ...tsOptions/StatLevelGraphOptionsControl.cs
@@ -3,18 +3,18 @@
 
 namespace ARKBreedingStats.StatsOptions
 {
-    public partial class StatOptionsControl : UserControl
+    public partial class StatLevelGraphOptionsControl : UserControl
     {
         private StatLevelColors _statLevelColors;
         private readonly int _statIndex;
         private StatsOptions<StatLevelColors> _parent;
 
-        public StatOptionsControl()
+        public StatLevelGraphOptionsControl()
         {
             InitializeComponent();
         }
 
-        public StatOptionsControl(string name, int statIndex, ToolTip tt) : this()
+        public StatLevelGraphOptionsControl(string name, int statIndex, ToolTip tt) : this()
         {
             LbStatName.Text = name;
             _statIndex = statIndex;

diff --git a/...tats/StatsOptions/StatOptionsControl.resx → ...Options/StatLevelGraphOptionsControl.resx b/...tats/StatsOptions/StatOptionsControl.resx → ...Options/StatLevelGraphOptionsControl.resx