rename

celeron533 · Aug 4, 2024 · 4be2ea3 · 4be2ea3
1 parent 531632a
commit 4be2ea3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/DicomGrep/ViewModels/MainViewModel.cs b/DicomGrep/ViewModels/MainViewModel.cs
@@ -349,7 +349,7 @@ public MainViewModel()
 
             this.searchService.OnCompletDicomFile += SearchService_OnCompletDicomFile;
 
-            this.searchService.OnSearchComplete += SearchService_OnSearchComplete;
+            this.searchService.OnAllSearchComplete += SearchService_OnSearchComplete;
 
         }
 
@@ -388,7 +388,7 @@ private void SearchService_OnCompletDicomFile(object sender, DicomGrepCore.Servi
             }
         }
 
-        private void SearchService_OnSearchComplete(object sender, DicomGrepCore.Services.EventArgs.OnSearchCompleteEventArgs e)
+        private void SearchService_OnSearchComplete(object sender, DicomGrepCore.Services.EventArgs.OnAllSearchCompleteEventArgs e)
         {
             this.MainStatus = MainStatusEnum.Complete;
             InvalidateRequerySuggested();

diff --git a/DicomGrepCli/Program.cs b/DicomGrepCli/Program.cs
@@ -178,7 +178,7 @@ private static void DoSearch(SearchCriteria criteria)
                     Console.WriteLine(e.Filename);
                 }
             };
-            searchService.OnSearchComplete += (sender, e) =>
+            searchService.OnAllSearchComplete += (sender, e) =>
             {
                 Console.WriteLine($"> Search completed.");
             };

diff --git a/...es/EventArgs/OnSearchCompleteEventArgs.cs → ...EventArgs/OnAllSearchCompleteEventArgs.cs b/...es/EventArgs/OnSearchCompleteEventArgs.cs → ...EventArgs/OnAllSearchCompleteEventArgs.cs
@@ -5,7 +5,7 @@
 
 namespace DicomGrepCore.Services.EventArgs
 {
-    public class OnSearchCompleteEventArgs : System.EventArgs
+    public class OnAllSearchCompleteEventArgs : System.EventArgs
     {
         public CompleteReasonEnum Reason { get; set; }
     }

diff --git a/DicomGrepCore/Services/Interfaces/ISearchService.cs b/DicomGrepCore/Services/Interfaces/ISearchService.cs
@@ -4,10 +4,25 @@ namespace DicomGrepCore.Services.Interfaces
 {
     public interface ISearchService
     {
+        /// <summary>
+        /// Generate the file list to be searched based on the search criteria.
+        /// </summary>
         event SearchService.ListFileCompletedDelegate FileListCompleted;
-        event SearchService.OnCompletDicomFileDelegate OnCompletDicomFile;
+
+        /// <summary>
+        /// Load a DICOM file and search for the search criteria.
+        /// </summary>
         event SearchService.OnLoadDicomFileDelegate OnLoadDicomFile;
-        event SearchService.OnSearchCompleteDelegate OnSearchComplete;
+
+        /// <summary>
+        /// Finish searching a DICOM file.
+        /// </summary>
+        event SearchService.OnCompletDicomFileDelegate OnCompletDicomFile;
+
+        /// <summary>
+        /// Finish searching all DICOM files.
+        /// </summary>
+        event SearchService.OnAllSearchCompleteDelegate OnAllSearchComplete;
 
         void Search(SearchCriteria criteria, CancellationTokenSource tokenSource);
     }

diff --git a/DicomGrepCore/Services/SearchService.cs b/DicomGrepCore/Services/SearchService.cs
@@ -32,14 +32,15 @@ public class SearchService : ISearchService
         public delegate void OnCompletDicomFileDelegate(object sender, OnCompleteDicomFileEventArgs e);
         public event OnCompletDicomFileDelegate OnCompletDicomFile;
 
-        public delegate void OnSearchCompleteDelegate(object sender, OnSearchCompleteEventArgs e);
-        public event OnSearchCompleteDelegate OnSearchComplete;
+        public delegate void OnAllSearchCompleteDelegate(object sender, OnAllSearchCompleteEventArgs e);
+        public event OnAllSearchCompleteDelegate OnAllSearchComplete;
 
         private SearchCriteria criteria;
         private List<string> filenameList = new List<string>();
         private List<string> matchFilenameList = new List<string>();
         private CancellationToken token;
 
+        // the search service itself maintains a simple search result
         private int searchedFileCount = 0;
         private int matchFileCount = 0;
 
@@ -83,11 +84,11 @@ public void Search(SearchCriteria criteria, CancellationTokenSource tokenSource)
                      options.CancellationToken.ThrowIfCancellationRequested();
                      SearchInDicomFile(filename);
                  });
-                OnSearchComplete?.Invoke(this, new OnSearchCompleteEventArgs { Reason = Enums.CompleteReasonEnum.Normal });
+                OnAllSearchComplete?.Invoke(this, new OnAllSearchCompleteEventArgs { Reason = Enums.CompleteReasonEnum.Normal });
             }
             catch (OperationCanceledException)
             {
-                OnSearchComplete?.Invoke(this, new OnSearchCompleteEventArgs { Reason = Enums.CompleteReasonEnum.UserCancelled });
+                OnAllSearchComplete?.Invoke(this, new OnAllSearchCompleteEventArgs { Reason = Enums.CompleteReasonEnum.UserCancelled });
                 logger.Info("User cancelled the search.");
             }
             finally
@@ -157,10 +158,9 @@ private void SearchInDicomFile(string filePath)
 
                 string patientName = string.Empty;
                 string sopClassName = string.Empty;
-                DicomUID sopClassUID = null;
 
 
-                if (dicomFile.Dataset.TryGetSingleValue<DicomUID>(DicomTag.SOPClassUID, out sopClassUID))
+                if (dicomFile.Dataset.TryGetSingleValue<DicomUID>(DicomTag.SOPClassUID, out DicomUID sopClassUID))
                 {
                     // compare the sop class uid
                     if (!string.IsNullOrWhiteSpace(criteria.SearchSopClassUid) && sopClassUID.UID != criteria.SearchSopClassUid)