Add races filter, fix ocr not regconize properly

Author: akarindt

Data/RaceData.cs

@@ -10,20 +10,28 @@ namespace UmatoMusume.Data
 {
     public static class RaceData
     {
-        public static List<Race> GetRaces(this List<Race> _races, string _dateTime, List<string> _grades)
+        public static List<Race> GetRaces(this List<Race> _races, string _dateTime, List<string> _grades, List<string> _distanceTypes, List<string> _terrainTypes)
         {
+
+            var result = _races.DistinctBy(x => x.RaceName)
+                .Where(x => x.Schedule.Equals(_dateTime) || Helper.CheckRatio(x.Schedule, _dateTime));
+
             if (_grades.Any())
             {
-                return _races.DistinctBy(x => x.RaceName)
-                    .Where(x => x.Schedule.Equals(_dateTime) || Helper.CheckRatio(x.Schedule, _dateTime))
-                    .Where(x => _grades.Contains(x.Grade))
-                    .ToList();
+                result = result.Where(x => _grades.Contains(x.Grade));
             }
 
-            return _races
-                .DistinctBy(x => x.RaceName)
-                .Where(x => x.Schedule.Equals(_dateTime) || Helper.CheckRatio(x.Schedule, _dateTime))
-                .ToList();
+            if (_distanceTypes.Any())
+            {
+                result = result.Where(x => _distanceTypes.Contains(x.DistanceType));
+            }
+
+            if (_terrainTypes.Any())
+            {
+                result = result.Where(x => _terrainTypes.Contains(x.Terrain));
+            }
+
+            return result.ToList();
         }
 
         public static List<string> GetRaceGrades(this List<Race> _races)

FrmMain.Designer.cs

@@ -29,7 +29,7 @@ public partial class FrmMain : Form
         protected Hook.WinEventDelegate _winEventDelegate;
         static GCHandle _gcSafetyHandle;
 
-        private const string TARGET_PROCESS_NAME = "Photos";
+        private const string TARGET_PROCESS_NAME = "UmamusumePrettyDerby";
         private const string FORM_TITLE = "UmatoMusume - Process Window Capture";
         private const int ATTACH_INTERVAL = 500;
         private const int CAPTURE_INTERVAL = 1000;
@@ -85,7 +85,6 @@ public FrmMain()
             }
 
             _appWidth = Width;
-
             InitFilter();
         }
 
@@ -96,17 +95,9 @@ private void InitFilter()
             _raceTerrains = _raceList.GetRaceTerrains();
 
             pGradeCheckboxes.FlowDirection = FlowDirection.LeftToRight;
-            pGradeCheckboxes.WrapContents = false;
+            pGradeCheckboxes.WrapContents = true;
             pGradeCheckboxes.AutoScroll = true;
 
-            pDistantTypeCheckboxes.FlowDirection = FlowDirection.LeftToRight;
-            pDistantTypeCheckboxes.WrapContents = false;
-            pDistantTypeCheckboxes.AutoScroll = true;
-
-            pTerrainCheckboxes.FlowDirection = FlowDirection.LeftToRight;
-            pTerrainCheckboxes.WrapContents = false;
-            pTerrainCheckboxes.AutoScroll = true;
-
             foreach (var grade in _raceGrades)
             {
                 var checkbox = new CheckBox
@@ -126,7 +117,7 @@ private void InitFilter()
                     {
                         _filterGrades.Remove(checkbox.Text);
                     }
-                    SetRaceData(_filterGrades);
+                    SetRaceData(_filterGrades, _filterDistanceTypes, _filterTerrainTypes);
                 };
 
                 pGradeCheckboxes.Controls.Add(checkbox);
@@ -150,9 +141,9 @@ private void InitFilter()
                     {
                         _filterDistanceTypes.Remove(checkbox.Text);
                     }
-                    SetRaceData(_filterGrades);
+                    SetRaceData(_filterGrades, _filterDistanceTypes, _filterTerrainTypes);
                 };
-                pDistantTypeCheckboxes.Controls.Add(checkbox);
+                pGradeCheckboxes.Controls.Add(checkbox);
             }
 
             foreach (var terrain in _raceTerrains)
@@ -173,9 +164,9 @@ private void InitFilter()
                     {
                         _filterTerrainTypes.Remove(checkbox.Text);
                     }
-                    SetRaceData(_filterGrades);
+                    SetRaceData(_filterGrades, _filterDistanceTypes, _filterTerrainTypes);
                 };
-                pTerrainCheckboxes.Controls.Add(checkbox);
+                pGradeCheckboxes.Controls.Add(checkbox);
             }
         }
 
@@ -471,12 +462,12 @@ private void SetData()
             }
         }
 
-        private void SetRaceData(List<string> _grades)
+        private void SetRaceData(List<string> _grades, List<string> _distanceTypes, List<string> _terrainTypes)
         {
             rtbRaces.Clear();
             if (!string.IsNullOrEmpty(lblDate.Text))
             {
-                var races = _raceList.GetRaces(lblDate.Text, _grades);
+                var races = _raceList.GetRaces(lblDate.Text, _grades, _distanceTypes, _terrainTypes);
                 if (races.Any())
                 {
                     foreach (var race in races)
@@ -532,7 +523,7 @@ await _rectConfigData.Upsert(new RectConfig
             return;
         }
 
-        private void lblDate_TextChanged(object sender, EventArgs e) => SetRaceData(_filterGrades);
+        private void lblDate_TextChanged(object sender, EventArgs e) => SetRaceData(_filterGrades, _filterDistanceTypes, _filterTerrainTypes);
 
         private async void FrmMain_ResizeEnd(object sender, EventArgs e)
         {