Changes for Xylem Nanjing, ver. 3.1.1676

TBF/Rig/MettlerToledo/Standard/ReadStableMassOp.cs

@@ -3,6 +3,7 @@
 ///
 using System;
 using log4net;
+using Common;
 using Config.Entities;
 using TBF.Boxes;
 
@@ -57,7 +58,7 @@ namespace TBF.Rig.MettlerToledo.Standard
             sortedMassReadings = new double[totalReadingsCount];
             currentReadingsCount = 0;
             measurementCompleted = false;
-            timeout = (method == Config.Entities.MassMethod.Scale) ? 60 : 2;
+            timeout = (method == MassMethod.Scale) ? 60 : 2;
 
 			log.Debug(this.ToString());
         }
@@ -76,7 +77,7 @@ namespace TBF.Rig.MettlerToledo.Standard
         /// </summary>
         void StartMeasurement()
         {
-            if (method == Config.Entities.MassMethod.Scale)
+            if (method == MassMethod.Scale)
                 scale.SendStableMeasurementCmd();
             else
                 scale.SendImmediateMeasurementCmd();
@@ -158,7 +159,7 @@ namespace TBF.Rig.MettlerToledo.Standard
                 Array.Copy(massReadings, sortedMassReadings, totalReadingsCount);
                 Array.Sort(sortedMassReadings);
 
-				if (method == Config.Entities.MassMethod.Spread)
+				if (method == MassMethod.Spread)
 				{
 					/// Immediate mass measurement, end condition calculated below
 
@@ -173,7 +174,7 @@ namespace TBF.Rig.MettlerToledo.Standard
 						return Event.ScaleDone;       /// Mass has just been calculated
 					}
 				}
-				else if (method == Config.Entities.MassMethod.StdDev)
+				else if (method == MassMethod.StdDev)
 				{
 					/// Immediate mass measurement, end condition calculated below