Improved implicit affix detection.

Added launch minimized option.
josdemmers · Feb 8, 2025 · 4e386bf · 4e386bf
1 parent c7e8767
commit 4e386bf
Show file tree

Hide file tree

Showing 9 changed files with 110 additions and 6 deletions.
diff --git a/D4Companion.Entities/SettingsD4.cs b/D4Companion.Entities/SettingsD4.cs
@@ -49,6 +49,7 @@ public class SettingsD4
         public bool IsTradeOverlayEnabled { get; set; } = true;
         public bool IsUniqueDetectionEnabled { get; set; } = true;
         public int ItemPowerLimit { get; set; } = 800;
+        public bool LaunchMinimized { get; set; } = false;
         public int MinimalOcrMatchType { get; set; } = 80;
         public bool MinimizeToTray { get; set; } = false;
         public List<MultiBuild> MultiBuildList { get; set; } = new List<MultiBuild>();

diff --git a/D4Companion.Interfaces/IReleaseManager.cs b/D4Companion.Interfaces/IReleaseManager.cs
@@ -6,6 +6,7 @@ public interface IReleaseManager
     {
         List<Release> Releases { get; }
         string Repository { get; }
+        bool UpdateAvailable { get; set; }
 
         void DownloadRelease(string url);
         void ExtractRelease(string fileName);

diff --git a/D4Companion.Localization/Resources.Designer.cs b/D4Companion.Localization/Resources.Designer.cs
diff --git a/D4Companion.Localization/Resources.resx b/D4Companion.Localization/Resources.resx
@@ -776,7 +776,7 @@
     <value>Time in ms between overlay updates. Default 5ms.</value>
   </data>
   <data name="rsTooltipRenamePreset" xml:space="preserve">
-    <value>Rename</value>
+    <value>Rename.</value>
   </data>
   <data name="rsCapRenamePreset" xml:space="preserve">
     <value>Rename</value>
@@ -785,6 +785,12 @@
     <value>Minimize to Tray</value>
   </data>
   <data name="rsTooltipMinimizeToTray" xml:space="preserve">
-    <value>Minimize to Tray</value>
+    <value>Minimize to Tray.</value>
+  </data>
+  <data name="rsLaunchMinimized" xml:space="preserve">
+    <value>Launch Minimized</value>
+  </data>
+  <data name="rsTooltipLaunchMinimized" xml:space="preserve">
+    <value>Launch Minimized.</value>
   </data>
 </root>
diff --git a/D4Companion.Services/ReleaseManager.cs b/D4Companion.Services/ReleaseManager.cs
@@ -18,6 +18,7 @@ public class ReleaseManager : IReleaseManager
         private readonly ISettingsManager _settingsManager;
 
         private List<Release> _releases = new List<Release>();
+        private bool _updateAvailable = false;
 
         // Start of Constructors region
 
@@ -56,6 +57,7 @@ public ReleaseManager(IEventAggregator eventAggregator, ILogger<ReleaseManager>
 
         public List<Release> Releases { get => _releases; set => _releases = value; }
         public string Repository { get; } = "https://api.github.com/repos/josdemmers/diablo4Companion/releases";
+        public bool UpdateAvailable { get => _updateAvailable; set => _updateAvailable = value; }
 
         #endregion
 

diff --git a/D4Companion.Services/ScreenProcessHandler.cs b/D4Companion.Services/ScreenProcessHandler.cs
@@ -871,9 +871,10 @@ private void FindItemAffixAreas()
         /// Update affix areas with extra information.
         /// - Implicit affixes.
         /// </summary>
-        /// <exception cref="NotImplementedException"></exception>
         private void UpdateItemAffixAreas()
         {
+            //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}");
+
             // Check if there are any areas with implicit affixes.
             // - Types with implicit affixes: Amulet, Boots, Offhand, Ranged, Ring, Weapon.
             // - Implicit area is between a top splitter and the first normal splitter.
@@ -884,19 +885,29 @@ private void UpdateItemAffixAreas()
                 _currentTooltip.ItemType.Equals(ItemTypeConstants.Ring) ||
                 _currentTooltip.ItemType.Equals(ItemTypeConstants.Weapon))
             {
+                //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: ItemType: {_currentTooltip.ItemType}");
+                //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: HasTooltipTopSplitter: {_currentTooltip.HasTooltipTopSplitter}");
+
                 // Skip if top splitter icon is missing
                 if (!_currentTooltip.HasTooltipTopSplitter) return;
 
                 // List splitter variants
                 var splittersTop = _currentTooltip.ItemSplitterLocations.FindAll(s => s.Name.Contains("dot-splitter_top"));
                 var splitters = _currentTooltip.ItemSplitterLocations.FindAll(s => !s.Name.Contains("dot-splitter_top"));
+
+                //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: Count splittersTop: {splittersTop.Count}");
+                //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: Count splitters: {splitters.Count}");
+
                 // Skip if splitters are missing
                 if (splittersTop.Count == 0) return;
                 if (splitters.Count == 0) return;
 
                 int implicitBeginY = splittersTop[0].Location.Y;
                 int implicitEndY = splitters[0].Location.Y;
 
+                //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: implicitBeginY: {implicitBeginY}");
+                //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: implicitEndY: {implicitEndY}");
+
                 // Validate implicit area
                 // - No greater affixes
                 // - No tempered affixes
@@ -907,6 +918,8 @@ private void UpdateItemAffixAreas()
                         if (itemAffixArea.AffixType.Equals(AffixTypeConstants.Greater) ||
                             itemAffixArea.AffixType.Equals(AffixTypeConstants.Tempered))
                         {
+                            //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: Invalid implicit area. Type {itemAffixArea.AffixType} found.");
+
                             // Skip implicit affixes for this item. Implicit area is invalid.
                             // Probably caused because one of the splitter icons was not detected.
                             return;
@@ -920,6 +933,8 @@ private void UpdateItemAffixAreas()
                 {
                     if (implicitBeginY <= _currentTooltip.ItemAspectLocation.Location.Y && _currentTooltip.ItemAspectLocation.Location.Y <= implicitEndY)
                     {
+                        //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: Invalid implicit area. Contains aspect.");
+
                         // Skip implicit affixes for this item. Implicit area is invalid.
                         // Probably caused because one of the splitter icons was not detected.
                         return;
@@ -931,10 +946,14 @@ private void UpdateItemAffixAreas()
                 {
                     if (implicitBeginY <= itemAffixArea.Location.Y && itemAffixArea.Location.Y <= implicitEndY)
                     {
+                        //_logger.LogDebug($"{MethodBase.GetCurrentMethod()?.Name}: Implicit affix found.");
+
                         itemAffixArea.AffixType = AffixTypeConstants.Implicit;
                     }
                 }
             }
+
+            //_logger.LogDebug($"~{MethodBase.GetCurrentMethod()?.Name}");
         }
 
         private void UpdateItemAffixAreasWithOcrResults()
@@ -1471,6 +1490,15 @@ private bool FindItemSplitterLocations()
                 return x.Location.Top < y.Location.Top ? -1 : x.Location.Top > y.Location.Top ? 1 : 0;
             });
 
+            // Clean item splitter locations
+            // This removes dot-splitter locations that matched at the same location as the first dot-splitter_top
+            var splittersTop = itemSplitterLocations.FindAll(s => s.Name.Contains("dot-splitter_top"));
+            if (splittersTop.Count > 0)
+            {
+                int splitterTopY = splittersTop[0].Location.Y;
+                itemSplitterLocations.RemoveAll(s => !s.Name.Contains("dot-splitter_top") && s.Location.Y - 2 <= splitterTopY && splitterTopY <= s.Location.Y + 2);
+            }
+
             foreach (var itemSplitterLocation in itemSplitterLocations)
             {
                 _currentTooltip.ItemSplitterLocations.Add(itemSplitterLocation);

diff --git a/D4Companion/ViewModels/MainWindowViewModel.cs b/D4Companion/ViewModels/MainWindowViewModel.cs
@@ -121,6 +121,11 @@ private void ApplicationLoadedExecute()
         {
             _logger.LogInformation(WindowTitle);
 
+            if (_settingsManager.Settings.LaunchMinimized && !_releaseManager.UpdateAvailable)
+            {
+                Application.Current.MainWindow.WindowState = WindowState.Minimized;
+            }
+
             _eventAggregator.GetEvent<ApplicationLoadedEvent>().Publish();
         }
 
@@ -139,6 +144,7 @@ private void HandleReleaseInfoUpdatedEvent()
 
                 if (latest > current)
                 {
+                    _releaseManager.UpdateAvailable = true;
                     WindowTitle = $"Diablo IV Companion v{Assembly.GetExecutingAssembly().GetName().Version} ({release.Version} available)";
                     _eventAggregator.GetEvent<InfoOccurredEvent>().Publish(new InfoOccurredEventParams
                     {
@@ -148,6 +154,17 @@ private void HandleReleaseInfoUpdatedEvent()
                     // Open update dialog
                     if (File.Exists("D4Companion.Updater.exe"))
                     {
+                        // Restore GUI when hidden.
+                        Application.Current?.Dispatcher?.Invoke(() =>
+                        {
+                            if (Application.Current.MainWindow.Visibility == Visibility.Collapsed)
+                            {
+                                Application.Current.MainWindow.Show();
+                                Application.Current.MainWindow.WindowState = WindowState.Normal;
+                                Application.Current.MainWindow.Topmost = true;
+                            }
+                        });
+
                         _dialogCoordinator.ShowMessageAsync(this, $"Update", $"New version available, do you want to download {release.Version}?", MessageDialogStyle.AffirmativeAndNegative).ContinueWith(t =>
                         {
                             if (t.Result == MessageDialogResult.Affirmative)
@@ -311,7 +328,14 @@ private void WindowStateChangedExecute()
                 {
                     case WindowState.Minimized:
                         {
-                            Application.Current.MainWindow.Visibility = Visibility.Collapsed;
+                            if (_releaseManager.UpdateAvailable)
+                            {
+                                Application.Current.MainWindow.WindowState = WindowState.Normal;
+                            }
+                            else
+                            {
+                                Application.Current.MainWindow.Visibility = Visibility.Collapsed;
+                            }
                             break;
                         }
                 }

diff --git a/D4Companion/ViewModels/SettingsViewModel.cs b/D4Companion/ViewModels/SettingsViewModel.cs
@@ -150,6 +150,18 @@ public bool IsDevModeEnabled
             }
         }
 
+        public bool IsLaunchMinimizedEnabled
+        {
+            get => _settingsManager.Settings.LaunchMinimized;
+            set
+            {
+                _settingsManager.Settings.LaunchMinimized = value;
+                RaisePropertyChanged(nameof(IsLaunchMinimizedEnabled));
+
+                _settingsManager.SaveSettings();
+            }
+        }
+
         public bool IsMinimizeToTrayEnabled
         {
             get => _settingsManager.Settings.MinimizeToTray;

diff --git a/D4Companion/Views/SettingsView.xaml b/D4Companion/Views/SettingsView.xaml
@@ -86,6 +86,18 @@
                     </Label>
                 </Grid>
 
+                <Grid>
+                    <mah:ToggleSwitch 
+                        Margin="0 0 0 0"
+                        IsOn="{Binding IsLaunchMinimizedEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                        OffContent="{loc:LocExtension rsLaunchMinimized}"
+                        OnContent="{loc:LocExtension rsLaunchMinimized}"
+                        ToolTip="{loc:LocExtension rsTooltipLaunchMinimized}"/>
+                    <Label Margin="0 0 5 0" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="{loc:LocExtension rsTooltipLaunchMinimized}">
+                        <iconPacks:PackIconMaterial Kind="InformationOutline" Width="16" Height="16"/>
+                    </Label>
+                </Grid>
+
                 <Grid>
                     <mah:ToggleSwitch 
                         Margin="0 0 0 0"