latest

kauffman12 · May 14, 2024 · 000fe90 · 000fe90
1 parent cd9281f
commit 000fe90
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/EQLogParser/Properties/AssemblyInfo.cs b/EQLogParser/Properties/AssemblyInfo.cs
@@ -53,7 +53,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.17")]
-[assembly: AssemblyFileVersion("2.2.17")]
+[assembly: AssemblyVersion("2.2.18")]
+[assembly: AssemblyFileVersion("2.2.18")]
 [assembly: XmlConfigurator(Watch = true)]
 [assembly: SupportedOSPlatform("windows10.0")]
diff --git a/EQLogParser/data/releasenotes.rtf b/EQLogParser/data/releasenotes.rtf
@@ -1,6 +1,16 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat{\fonttbl{\f0\fnil\fcharset0 Segoe UI;}{\f1\fnil\fcharset2 Symbol;}}
 {\*\generator Riched20 10.0.22621}\viewkind4\uc1 
-\pard\ul\f0\fs20\lang1033 Updates in Version 2.2.17\ulnone\par
+\pard\ul\f0\fs20\lang1033 Updates in Version 2.2.18\ulnone\par
+
+\pard\par
+
+\pard 
+{\pntext\f0 1.\tab}{\*\pn\pnlvlbody\pnf0\pnindent0\pnstart1\pndec{\pntxta.}}
+\fi-360\li720 Changed how the Fight list is updated during loading when new pets are added to speed things up a bit.\par
+{\pntext\f0 2.\tab}Fix for incorrect total time displayed on the Healing Summary when lots of fights are selected.\par
+
+\pard\par
+\ul Updated in Version 2.2.17\ulnone\par
 \par
 
 \pard 

diff --git a/EQLogParser/src/ui/common/FightTable.xaml.cs b/EQLogParser/src/ui/common/FightTable.xaml.cs
@@ -63,9 +63,12 @@ public FightTable()
           var selected = dataGrid.SelectedItems?.Cast<Fight>().ToList();
           if (selected != null)
           {
-            foreach (var fight in selected)
+            foreach (var fight in selected.OrderBy(sel => sel.Id))
             {
-              _allRanges.Add(new TimeSegment(fight.BeginTime, fight.LastTime));
+              if (!fight.IsInactivity)
+              {
+                _allRanges.Add(new TimeSegment(fight.BeginTime, fight.LastTime));
+              }
             }
           }
 

diff --git a/EQLogParser/src/ui/main/MainWindow.xaml.cs b/EQLogParser/src/ui/main/MainWindow.xaml.cs
@@ -55,6 +55,7 @@ public partial class MainWindow : ChromelessWindow
     private readonly List<bool> _logWindows = [];
     private readonly List<string> _recentFiles = [];
     private bool _resetWindowState;
+    private bool _isLoading;
 
     public MainWindow()
     {
@@ -217,8 +218,11 @@ public MainWindow()
         _computeStatsTimer = new DispatcherTimer(DispatcherPriority.Render) { Interval = new TimeSpan(0, 0, 0, 0, 500) };
         _computeStatsTimer.Tick += (_, _) =>
         {
-          ComputeStats();
-          _computeStatsTimer.Stop();
+          if (!_isLoading)
+          {
+            ComputeStats();
+            _computeStatsTimer.Stop();
+          }
         };
 
         SystemEvents.PowerModeChanged += SystemEventsPowerModeChanged;
@@ -790,6 +794,7 @@ private void UpdateLoadingProgress()
       {
         if (_eqLogReader != null)
         {
+          _isLoading = true;
           var seconds = Math.Round((DateTime.Now - _startLoadTime).TotalSeconds);
           var filePercent = Math.Round(_eqLogReader.GetProgress());
           statusText.Text = filePercent < 100.0 ? $"Reading Log.. {filePercent}% in {seconds} seconds" : $"Additional Processing... {seconds} seconds";
@@ -806,6 +811,7 @@ private void UpdateLoadingProgress()
             Task.Delay(1000).ContinueWith(_ => Dispatcher.InvokeAsync(() =>
             {
               MainActions.FireLoadingEvent(CurrentLogFile);
+              _isLoading = false;
               Dispatcher.InvokeAsync(() =>
               {
                 DataManager.Instance.ResetOverlayFights(true);

diff --git a/EQLogParserInstall/EQLogParserInstall.iss b/EQLogParserInstall/EQLogParserInstall.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "EQLogParser"
-#define MyAppVersion "2.2.17"
+#define MyAppVersion "2.2.18"
 #define MyAppPublisher "Kizant"
 #define MyAppURL "https://github.com/kauffman12/EQLogParser"
 #define MyAppExeName "EQLogParser.exe"

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 Everquest Log Parser for Live/TLP servers with basic support for P99.
 
 Link to DOWNLOAD the latest Installer:</br>
-https://github.com/kauffman12/EQLogParser/raw/master/Release/EQLogParser-install-2.2.17.exe
+https://github.com/kauffman12/EQLogParser/raw/master/Release/EQLogParser-install-2.2.18.exe
 
 ### IMPORTANT --- If after install the Log Search feature crashes and you're missing Syncfusion.Edit.WPF.dll and Syncfusion.GridCommon.WPF.dll from where you installed  EQLogParser.. try running the installer again and choosing Repair to fix the problem.
 

diff --git a/Release/EQLogParser-install-2.2.17.exe → Release/EQLogParser-install-2.2.18.exe b/Release/EQLogParser-install-2.2.17.exe → Release/EQLogParser-install-2.2.18.exe