diff --git a/DicomGrep/MainWindow.xaml b/DicomGrep/MainWindow.xaml
index 650e000..535293e 100644
--- a/DicomGrep/MainWindow.xaml
+++ b/DicomGrep/MainWindow.xaml
@@ -7,11 +7,21 @@
xmlns:vm="clr-namespace:DicomGrep.ViewModels"
xmlns:enums="clr-namespace:DicomGrep.Enums"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+ xmlns:coreEnum="clr-namespace:DicomGrepCore.Enums;assembly=DicomGrepCore"
mc:Ignorable="d"
Title="{Binding Version, StringFormat='Dicom Grep v{0}'}" Height="640" Width="960" MinWidth="300" MinHeight="200">
+
+
+
+
+
+
+
@@ -95,6 +105,7 @@
+
diff --git a/DicomGrep/Services/ConfigurationService.cs b/DicomGrep/Services/ConfigurationService.cs
index 0dccf92..2c6f910 100644
--- a/DicomGrep/Services/ConfigurationService.cs
+++ b/DicomGrep/Services/ConfigurationService.cs
@@ -6,6 +6,7 @@
using System.Text;
using System.Text.Json;
using DicomGrepCore.Entities;
+using DicomGrepCore.Enums;
namespace DicomGrep.Services
{
@@ -84,6 +85,7 @@ private static Configuration DefaultConfiguration()
SearchTag = "",
SearchText = "TREATMENT",
IncludeSubfolders = true,
+ MatchPattern = MatchPatternEnum.Normal,
SearchInResults = false,
SearchThreads = 1
};
diff --git a/DicomGrep/ViewModels/MainViewModel.cs b/DicomGrep/ViewModels/MainViewModel.cs
index 9b32124..d18c565 100644
--- a/DicomGrep/ViewModels/MainViewModel.cs
+++ b/DicomGrep/ViewModels/MainViewModel.cs
@@ -17,6 +17,7 @@
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Input;
+using DicomGrepCore.Enums;
namespace DicomGrep.ViewModels
{
@@ -107,6 +108,14 @@ public bool WholeWord
set { SetProperty(ref _wholeWord, value); }
}
+ private MatchPatternEnum _matchPattern;
+
+ public MatchPatternEnum MatchPattern
+ {
+ get { return _matchPattern; }
+ set { SetProperty(ref _matchPattern, value); }
+ }
+
private bool _includeSubfolders;
public bool IncludeSubfolders
{
@@ -227,7 +236,7 @@ public ICommand SopClassLookupCommand
{
get
{
- return _sopClassLookupCommand ?? (_sopClassLookupCommand = new RelayCommand