IoC is working

celeron533 · Jul 18, 2024 · e5a4725 · e5a4725
1 parent 892f5c6
commit e5a4725
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 28 deletions.
diff --git a/DicomGrep/App.xaml.cs b/DicomGrep/App.xaml.cs
@@ -20,20 +20,17 @@ public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
         {
-
-            var services = new ServiceCollection();
-            ConfigServices(services);
-            ServiceProvider = services.BuildServiceProvider();
-
-            var mainWindow = ServiceProvider.GetRequiredService<MainWindow>();
-            mainWindow.Show();
+            Services = ConfigureServices();
 
             base.OnStartup(e);
         }
 
-        private void ConfigServices(IServiceCollection services)
+        /// <summary>
+        /// Configures the services for the application.
+        /// </summary>
+        private static IServiceProvider ConfigureServices()
         {
-
+            var services = new ServiceCollection();
             services.AddSingleton<IConfigurationService, ConfigurationService>();
             services.AddSingleton<IDialogService, DialogService>();
             services.AddSingleton<IDicomDictionaryLookupService, DicomDictionaryLookupService>();
@@ -45,9 +42,17 @@ private void ConfigServices(IServiceCollection services)
             services.AddSingleton<ISearchService, SearchService>();
             services.AddSingleton<IDictionaryService, DictionaryService>();
 
-            services.AddTransient<MainWindow>();
+            return services.BuildServiceProvider();
         }
 
-        public IServiceProvider ServiceProvider { get; private set; }
+        /// <summary>
+        /// Gets the <see cref="IServiceProvider"/> instance to resolve application services.
+        /// </summary>
+        public IServiceProvider Services { get; private set; }
+
+        /// <summary>
+        /// Gets the current <see cref="App"/> instance in use
+        /// </summary>
+        public new static App Current => (App)Application.Current;
     }
 }
diff --git a/DicomGrep/ViewModels/DicomDictionaryLookupViewModel.cs b/DicomGrep/ViewModels/DicomDictionaryLookupViewModel.cs
@@ -36,8 +36,9 @@ public string DefaultFilterString
             set => SetProperty(ref _defaultFilterString, value);
         }
 
-        public DicomDictionaryLookupViewModel(IDictionaryService dictionaryService) : base()
+        public DicomDictionaryLookupViewModel() : base()
         {
+            var dictionaryService = GetService<IDictionaryService>();
             if (DicomDictionaryEntries == null || DicomDictionaryEntries.Count == 0)
             {
                 DicomDictionaryEntries = new ObservableCollection<DicomDictionaryEntry>(

diff --git a/DicomGrep/ViewModels/MainViewModel.cs b/DicomGrep/ViewModels/MainViewModel.cs
@@ -285,21 +285,18 @@ public ResultDicomFile SelectedMatchFile
             set => SetProperty(ref _selectedMatchFile, value);
         }
 
-
-        public MainViewModel(IConfigurationService _configurationService, IFolderPickupService _folderPickupService,
-            ISopClassLookupService _sopClassLookupService, IDicomDictionaryLookupService _dicomDictionaryLookupService,
-            IExportService _exportService, ITagValueDetailService _tagValueDetailService,
-            IFileOperationService _fileOperationService, ISearchService _searchService, IDictionaryService _dictionaryService)
-        {
-            configurationService = _configurationService;
-            folderPickupService = _folderPickupService;
-            sopClassLookupService = _sopClassLookupService;
-            dicomDictionaryLookupService = _dicomDictionaryLookupService;
-            exportService = _exportService;
-            tagValueDetailService = _tagValueDetailService;
-            fileOperationService = _fileOperationService;
-            searchService = _searchService;
-            dictionaryService = _dictionaryService; ;
+        public MainViewModel()
+        {
+            // viewModel here cannot inject the dependencies as the constructor parameters
+            configurationService = GetService<IConfigurationService>();
+            folderPickupService = GetService<IFolderPickupService>();
+            sopClassLookupService = GetService<ISopClassLookupService>();
+            dicomDictionaryLookupService = GetService<IDicomDictionaryLookupService>();
+            exportService = GetService<IExportService>();
+            tagValueDetailService = GetService<ITagValueDetailService>();
+            fileOperationService = GetService<IFileOperationService>();
+            searchService = GetService<ISearchService>();
+            dictionaryService = GetService<IDictionaryService>();
 
             // dummy data for designer preview
             if (DesignerProperties.GetIsInDesignMode(new DependencyObject()))

diff --git a/DicomGrep/ViewModels/SopClassLookupViewModel.cs b/DicomGrep/ViewModels/SopClassLookupViewModel.cs
@@ -35,8 +35,9 @@ public string DefaultFilterString
             set => SetProperty(ref _defaultFilterString, value);
         }
 
-        public SopClassLookupViewModel(IDictionaryService dictionaryService) : base()
+        public SopClassLookupViewModel() : base()
         {
+            var dictionaryService = GetService<IDictionaryService>();
             if (SOPClassUIDs == null || SOPClassUIDs.Count == 0)
             {
                 SOPClassUIDs = new ObservableCollection<DicomUID>(dictionaryService.GetAllDicomUIDDefs().Where(u => u.Type == DicomUidType.SOPClass || u.Type == DicomUidType.MetaSOPClass));

diff --git a/DicomGrep/ViewModels/ViewModelBase.cs b/DicomGrep/ViewModels/ViewModelBase.cs
@@ -32,5 +32,11 @@ protected virtual void InvalidateRequerySuggested()
         {
             Application.Current?.Dispatcher.BeginInvoke((Action)CommandManager.InvalidateRequerySuggested);
         }
+
+        // service helper
+        protected static T GetService<T>() where T : class
+        {
+            return (T)App.Current.Services.GetService(typeof(T));
+        }
     }
 }