Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka

1 files changed, 22 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/RmlModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/RmlModel.cs
index b1be35a38..dce3432e2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/RmlModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Models/RmlModel.cs
@@ -11,10 +11,16 @@ namespace Tango.MachineStudio.RML.Models
 {
     public class RmlModel : ExtendedObject
     {
+        public class LiquidTypeColorValue
+        {
+            public int Color { get; set; }
+
+            public double LiquidTypeValue { get; set; }
+        }
         public String Guid { get; set; }
 
         public String Name { get; set; }
-
+       
         public String DisplayName { get; set; }
 
         public String CCT { get; set; }
@@ -27,8 +33,23 @@ namespace Tango.MachineStudio.RML.Models
 
         public String Btsr { get; set; }
 
+        public String DyeingSpeed { get; set; }
+
+        public String Zone1InkUptake { get; set; }
+
+        public String Zone2InkUptake { get; set; }
+
         public DateTime LastUpdated { get; set; }
 
         public List<int> LiquidTypes { get; set; }
+
+        public List<LiquidTypeColorValue> LiquidTypesR { get; set; }
+
+        public RmlModel()
+        {
+            DyeingSpeed = "-";
+            Zone1InkUptake = "-";
+            Zone2InkUptake = "-";
+        }
     }
 }