Merged eureka_ppc.

1 files changed, 20 insertions, 7 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
index 80d3afdba..23aee0366 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Rml.cs
@@ -24,6 +24,7 @@ namespace Tango.BL.Entities
             WhitePointL = 92.1815;
             WhitePointA = 2.2555;
             WhitePointB = -10.9325;
+            PliesPerThread = 1;
         }
 
         protected override void OnWhitePointLChanged(double whitepointl)
@@ -234,6 +235,15 @@ namespace Tango.BL.Entities
         {
             base.OnPliesPerFiberChanged(pliesperfiber);
             UpdateFiberCount();
+           
+        }
+
+        protected override void OnPliesPerThreadChanged(Int32 pliesperthread)
+        {
+            base.OnPliesPerThreadChanged(pliesperthread);
+            UpdateDencityCount();
+            UpdateFiberCount();
+            RaisePropertyChanged(nameof(RMLPlies));
         }
 
         private void UpdateDencityCount()
@@ -252,20 +262,21 @@ namespace Tango.BL.Entities
         {
             get
             {
+                var count = 0;
                 if (LinearMassDensityUnit == null || FiberSize==0)
-                    return 0;
+                    return count;
                 if (LinearMassDensityUnit.Name== "Tex")
-                    return Convert.ToInt32(FiberSize) * 9;
+                   count = Convert.ToInt32(FiberSize) * 9;
                 if (LinearMassDensityUnit.Name == "DTEX")
-                    return (int)(Convert.ToInt32(FiberSize) * 0.9);
+                    count = (int)(Convert.ToInt32(FiberSize) * 0.9);
                 if (LinearMassDensityUnit.Name == "Ne")
-                    return (int)(5315 / Convert.ToInt32(FiberSize));
+                    count = (int)(5315 / Convert.ToInt32(FiberSize));
                 if (LinearMassDensityUnit.Name == "Nm")
-                    return (int)(9000 / Convert.ToInt32(FiberSize));
+                    count = (int)(9000 / Convert.ToInt32(FiberSize));
                 if (LinearMassDensityUnit.Name == "Denier")
-                    return (int)FiberSize;
+                    count = (int)FiberSize;
 
-                return 0;
+                return PliesPerThread == 0 ? count : count * PliesPerThread;
             }
         }
 
@@ -326,6 +337,8 @@ namespace Tango.BL.Entities
             {
                 base.PliesPerThread = value.ToInt32();
                 RaisePropertyChangedAuto();
+                UpdateDencityCount();
+                UpdateFiberCount();
             }
         }