After Virus

4 files changed, 93 insertions, 14 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs
index 32f568f5f..0cb2679fd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/FactorTarget.cs
@@ -3,18 +3,19 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.ThreadExtensions.Models
 {
     public static class FactorTarget
     {
-        public static Dictionary<string, double> FACTOR100 = new Dictionary<string, double>() {
-            { "CYAN", 51.95}, {"MAGENTA", 47.47}, { "YELLOW", 94.05}, {"BLACK", 26.58}};
+        public static Dictionary<FactorColors, double> FACTOR100 = new Dictionary<FactorColors, double>() {
+            { FactorColors.CYAN, 51.95}, {FactorColors.MAGENTA, 47.47}, { FactorColors.YELLOW, 94.05}, {FactorColors.BLACK, 26.58}};
 
-        public static Dictionary<string, double> FACTOR200 = new Dictionary<string, double>() {
-            { "CYAN", 46.3}, {"MAGENTA", 41.04}, { "YELLOW", 97.78}, {"BLACK", 21.01}};
+        public static Dictionary<FactorColors, double> FACTOR200 = new Dictionary<FactorColors, double>() {
+            { FactorColors.CYAN, 46.3}, {FactorColors.MAGENTA, 41.04}, { FactorColors.YELLOW, 97.78}, {FactorColors.BLACK, 21.01}};
 
-        public static double GetFactor100(string color)
+        public static double GetFactor100(FactorColors color)
         {
             double result;
 
@@ -24,7 +25,7 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
             }
             return 0.0;
         }
-        public static double GetFactor200(string color)
+        public static double GetFactor200(FactorColors color)
         {
             double result;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs
new file mode 100644
index 000000000..e41a6a220
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/MachineModel.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+
+namespace Tango.MachineStudio.ThreadExtensions.Models
+{
+    public class MachineModel : ExtendedObject
+    {
+        public String Guid { get; set; }
+        
+        public string Name { get; set; }
+
+        protected String _serialnumber;
+        
+        public String SerialNumber
+        {
+            get{ return _serialnumber; }
+            set
+            {
+                _serialnumber = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private bool _hasRMLTest;
+
+        public bool HasRMLTest
+        {
+            get { return _hasRMLTest; }
+            set { _hasRMLTest = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        public MachineModel()
+        {
+            HasRMLTest = false;
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs
index 47632d3aa..ee882ad4b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/PlotProperties.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Tango.BL.Entities;
+using Tango.BL.Enumerations;
 using Tango.Core;
 using Tango.MachineStudio.ThreadExtensions.ViewModels;
 
@@ -15,12 +16,12 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
         public Plot PlotControl { get; set; }
         private IList<DataPoint> _points;
 
-        private string _colorName;
+        private FactorColors _color;
 
-        public string ColorName
+        public FactorColors Color
         {
-            get { return _colorName; }
-            set { _colorName = value; }
+            get { return _color; }
+            set { _color = value; }
         }
 
         /// <summary>
@@ -94,12 +95,12 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
             }
         }
 
-        public PlotProperties(string colorName)
+        public PlotProperties(FactorColors color)
         {
             this.Points = new List<DataPoint>();
             Target100Points = new List<DataPoint>();
             Target200Points = new List<DataPoint>();
-            ColorName = colorName;
+            Color = color;
 
         }
 
@@ -121,8 +122,8 @@ namespace Tango.MachineStudio.ThreadExtensions.Models
             ClearResults();
             PlotControl.InvalidatePlot(true);
 
-            double target100Y = FactorTarget.GetFactor100(ColorName);
-            double target200Y = FactorTarget.GetFactor200(ColorName);
+            double target100Y = FactorTarget.GetFactor100(Color);
+            double target200Y = FactorTarget.GetFactor200(Color);
 
             _to = target100Y > target200Y? target100Y + 10: target200Y + 10;
             _from = target100Y < target200Y ? target100Y - 10 : target200Y - 10;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/RmlExtensionModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/RmlExtensionModel.cs
new file mode 100644
index 000000000..9b5d9d8ce
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Models/RmlExtensionModel.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Enumerations;
+using Tango.Core;
+
+namespace Tango.MachineStudio.ThreadExtensions.Models
+{
+    public class RmlExtensionModel : ExtendedObject
+    {
+        public String Guid { get; set; }
+
+        public String RMLGuid { get; set; }
+
+        public string Name { get; set; }
+
+        public String Manufacturer { get; set; }
+
+        public String Brand { get; set; }
+
+        public int LinearDensity { get; set; }
+
+        public String CreatedBy { get; set;}
+
+        public DateTime Created { get; set; }
+
+        public DateTime LastUpdated { get; set; }
+
+        public RMLExtensionStatus Status{ get; set; }
+    }
+}