Fixed issue on remote db with IDS_Pack FK.

Added:
Cartridges,
Cartridges Types,
Dispensers,
Dispensers Types,
IDS Packs,
Liquids,

To DB Module.

Added stripped out version of WPF Extended Tools Color Picker as Tango.ColorPicker.

Implemented ColorHelper in Tango.Core with Integer to Color conversion for database storage of colors.

1 files changed, 55 insertions, 0 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 aecfde992..48175ed17 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -34,6 +34,13 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<EmbeddedFirmwareVersionsViewVM>();
             SimpleIoc.Default.Register<EmbeddedSoftwareVersionsViewVM>();
             SimpleIoc.Default.Register<HardwareVersionsViewVM>();
+
+            SimpleIoc.Default.Register<IdsPacksViewVM>();
+            SimpleIoc.Default.Register<DispensersViewVM>();
+            SimpleIoc.Default.Register<DispenserTypesViewVM>();
+            SimpleIoc.Default.Register<LiquidsViewVM>();
+            SimpleIoc.Default.Register<CartridgesViewVM>();
+            SimpleIoc.Default.Register<CartridgeTypesViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -163,5 +170,53 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<HardwareVersionsViewVM>();
             }
         }
+
+        public static IdsPacksViewVM IdsPacksViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<IdsPacksViewVM>();
+            }
+        }
+
+        public static DispensersViewVM DispensersViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<DispensersViewVM>();
+            }
+        }
+
+        public static DispenserTypesViewVM DispenserTypesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<DispenserTypesViewVM>();
+            }
+        }
+
+        public static LiquidsViewVM LiquidsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<LiquidsViewVM>();
+            }
+        }
+
+        public static CartridgesViewVM CartridgesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CartridgesViewVM>();
+            }
+        }
+
+        public static CartridgeTypesViewVM CartridgeTypesViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CartridgeTypesViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file