MERGE

1 files changed, 37 insertions, 18 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 3079f8e5f..46223d9f4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -36,10 +36,9 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<HardwareVersionsViewVM>();
 
             SimpleIoc.Default.Register<IdsPacksViewVM>();
-            SimpleIoc.Default.Register<DispensersViewVM>();
+            SimpleIoc.Default.Register<IdsPackFormulasViewVM>();
             SimpleIoc.Default.Register<DispenserTypesViewVM>();
             SimpleIoc.Default.Register<LiquidTypesViewVM>();
-            SimpleIoc.Default.Register<CartridgesViewVM>();
             SimpleIoc.Default.Register<CartridgeTypesViewVM>();
             SimpleIoc.Default.Register<MidTankTypesViewVM>();
 
@@ -56,9 +55,13 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<FiberShapesViewVM>();
             SimpleIoc.Default.Register<FiberSynthsViewVM>();
             SimpleIoc.Default.Register<RmlsViewVM>();
+            SimpleIoc.Default.Register<LiquidTypesRmlsViewVM>();
 
             SimpleIoc.Default.Register<CctsViewVM>();
             SimpleIoc.Default.Register<CatsViewVM>();
+
+            SimpleIoc.Default.Register<ProcessParametersTablesViewVM>();
+            SimpleIoc.Default.Register<ProcessParametersTablesGroupsViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -197,14 +200,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static DispensersViewVM DispensersViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<DispensersViewVM>();
-            }
-        }
-
         public static DispenserTypesViewVM DispenserTypesViewVM
         {
             get
@@ -221,14 +216,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static CartridgesViewVM CartridgesViewVM
-        {
-            get
-            {
-                return ServiceLocator.Current.GetInstance<CartridgesViewVM>();
-            }
-        }
-
         public static CartridgeTypesViewVM CartridgeTypesViewVM
         {
             get
@@ -348,5 +335,37 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<MidTankTypesViewVM>();
             }
         }
+
+        public static LiquidTypesRmlsViewVM LiquidTypesRmlViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LiquidTypesRmlsViewVM>();
+            }
+        }
+
+        public static ProcessParametersTablesViewVM ProcessParametersTablesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ProcessParametersTablesViewVM>();
+            }
+        }
+
+        public static ProcessParametersTablesGroupsViewVM ProcessParametersTablesGroupsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ProcessParametersTablesGroupsViewVM>();
+            }
+        }
+
+        public static IdsPackFormulasViewVM IdsPackFormulasViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<IdsPackFormulasViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file