Merge pull request #85 from celeron533/bugfix

Bugfix for Sequence Tag
celeron533 · Jul 3, 2024 · 5e97033 · 5e97033
2 parents 2c2cf29 + 0b7a9d6
commit 5e97033
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/DicomGrep/Views/AboutView.xaml b/DicomGrep/Views/AboutView.xaml
@@ -48,11 +48,6 @@
                     https://github.com/Microsoft/XamlBehaviorsWpf
                 </Hyperlink>
             </TextBlock>
-            <TextBlock TextWrapping="Wrap">WinCopies.WindowsAPICodePack.Shell
-                <Hyperlink NavigateUri="https://wincopies.com/windows-api-codepack" RequestNavigate="Hyperlink_RequestNavigate">
-                    https://wincopies.com/windows-api-codepack
-                </Hyperlink>
-            </TextBlock>
             <TextBlock TextWrapping="Wrap">NLog
                 <Hyperlink NavigateUri="https://nlog-project.org/" RequestNavigate="Hyperlink_RequestNavigate">
                     https://nlog-project.org/

diff --git a/DicomGrepCore/Services/SearchService.cs b/DicomGrepCore/Services/SearchService.cs
@@ -213,12 +213,14 @@ private IList<ResultDicomItem> CompareDicomTagAndValue(DicomDataset dataset, ref
                 {
                     DicomSequence sequenceItem = (DicomSequence)dicomItem;
 
-                    if (string.IsNullOrWhiteSpace(criteria.SearchTag) ||
-                         CompareDicomTag(dicomItem.Tag, criteria.DicomSearchTag))
+                    if (string.IsNullOrEmpty(criteria.SearchText) &&
+                        (string.IsNullOrWhiteSpace(criteria.SearchTag) ||
+                         CompareDicomTag(dicomItem.Tag, criteria.DicomSearchTag)))
                     {
                         resultDicomItems ??= new List<ResultDicomItem>();
                         resultDicomItems.Add(new ResultDicomItem(dicomItem.Tag, $"Count = {sequenceItem.Items.Count}", []));
                     }
+
                     foreach (DicomDataset innerDataset in sequenceItem.Items)
                     {
                         CompareDicomTagAndValue(innerDataset, ref resultDicomItems);