Initialized ViewModel

imagecatalog/DataModel.cs

@@ -1,4 +1,5 @@
-using System;
+using ImageCatalog_2.Services;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -9,6 +10,11 @@ namespace ImageCatalog_2
 {
     public class DataModel : ViewModelBase
     {
+        private readonly ITestService _service;
+        public DataModel(ITestService testService)
+        {
+            _service = testService;
+        }
 
         private string _sourcePath;
 

imagecatalog/MainForm.cs

@@ -33,11 +33,9 @@ namespace ImageCatalog
         {
             _service = testService;
             
-            Model = new DataModel();
-            
             InitializeComponent();
 
-            bindingSource1.DataSource = Model;
+            
 
             BindControls();
             
@@ -199,6 +197,7 @@ namespace ImageCatalog
 
         private void Form1_Load(object sender, EventArgs e)
         {
+            bindingSource1.DataSource = Model;
             Application.EnableVisualStyles();
             setDefaults();
             /* TODO ERROR: Skipped IfDirectiveTrivia */

imagecatalog/Program.cs

@@ -19,7 +19,12 @@ namespace ImageCatalog_2
 
             ServiceProvider = serviceCollection.BuildServiceProvider();
 
-            Application.Run(ServiceProvider.GetRequiredService<MainForm>());
+            var mainForm = ServiceProvider.GetRequiredService<MainForm>();
+            var mainViewModel = ServiceProvider.GetRequiredService<DataModel>();
+
+            mainForm.Model = mainViewModel;          
+
+            Application.Run(mainForm);
         }
 
         private static void ConfigureServices(ServiceCollection services)
@@ -27,6 +32,8 @@ namespace ImageCatalog_2
             // Register your services here
             services.AddTransient<ITestService, TestService>();
 
+            services.AddTransient<DataModel>();
+
             // Register your forms
             services.AddTransient<MainForm>();
         }