#if STABLE_MASS_EXTRAS removed, it is enabled always now.

TBF/Rig/MettlerToledo/Standard/ReadStableMassOp.cs

@@ -158,7 +158,6 @@ namespace TBF.Rig.MettlerToledo.Standard
                 Array.Copy(massReadings, sortedMassReadings, totalReadingsCount);
                 Array.Sort(sortedMassReadings);
 
-#if STABLE_MASS_EXTRAS
 				if (method == Config.Entities.MassMethod.Spread)
 				{
 					/// Immediate mass measurement, end condition calculated below
@@ -194,7 +193,6 @@ namespace TBF.Rig.MettlerToledo.Standard
 					}
 				}
 				else
-#endif
 				{
 					/// Stable mass measurement
 

TBF/UI/Procedures/ProcedureDlg.cs

@@ -1599,10 +1599,8 @@ namespace TBF.UI.Procedures
 			Part,
 			PumpPower,
             MassRepeats,
-#if STABLE_MASS_EXTRAS
 			MassSpread,
             MassMethod,
-#endif
 			Time_Pump2StartV,
 			Time_BeforeFlow,
 			Time_Flow2Mass,
@@ -1619,10 +1617,8 @@ namespace TBF.UI.Procedures
 			lv.Columns.Add(new ColumnHeader { Text = Strings.Part, Width = 40 });
 			lv.Columns.Add(new ColumnHeader { Text = Strings.Pump_power_pct, Width = 90 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_repeats, Width = 90 });
-#if STABLE_MASS_EXTRAS
 			lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_spread_kg, Width = 110 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Mass_method, Width = 90 });
-#endif
             lv.Columns.Add(new ColumnHeader { Text = Strings.TimePump2StartV_chdr, Width = 70 });
 			lv.Columns.Add(new ColumnHeader { Text = Strings.TimeBeforeSettingFlow, Width = 70 });
 			lv.Columns.Add(new ColumnHeader { Text = Strings.TimeFlow2Start_chdr, Width = 70 });
@@ -1634,10 +1630,8 @@ namespace TBF.UI.Procedures
 					new TextBox(),      /// Part
 					new ComboBox(),     /// PumpPower
 					new TextBox(),		/// MassRepeats
-#if STABLE_MASS_EXTRAS										
 					new TextBox(),		/// MassSpread
 					new ComboBox(),		/// MassMethod
-#endif
 					new TextBox(),		/// Time_Pump2StartV
 					new TextBox(),		/// Time_BeforeFlow
 					new TextBox(),		/// Time_Flow2Mass
@@ -1659,12 +1653,10 @@ namespace TBF.UI.Procedures
 			((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("96");
 			((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("98");
 			((ComboBox)parametersEditors[(int)ParametersClmn.PumpPower]).Items.Add("100");
-#if STABLE_MASS_EXTRAS
 			for (MassMethod mm = 0; mm < MassMethod.Count; mm++)
 			{
 				((ComboBox)parametersEditors[(int)ParametersClmn.MassMethod]).Items.Add(mm.ToDescription());
 			}
-#endif
 			foreach (var ctrl in parametersEditors)
 			{
 				parametersTabPage.Controls.Add(ctrl);
@@ -1692,10 +1684,8 @@ namespace TBF.UI.Procedures
             lvi.SubItems.Add((test.Part == 0) ? "-" : test.Part.ToString());  ///
 			lvi.SubItems.Add(test.PumpPower.ToString("F1"));
             lvi.SubItems.Add((test.MassRepeats < 4 ? 5 : test.MassRepeats).ToString());
-#if STABLE_MASS_EXTRAS
 			lvi.SubItems.Add(test.MassSpread.ToString("F4"));
 			lvi.SubItems.Add(test.MassMethod.ToDescription());
-#endif
 			lvi.SubItems.Add(test.TimePump2StartV.ToString());
 			lvi.SubItems.Add(test.TimeBeforeFlow.ToString());
 			lvi.SubItems.Add(test.TimeFlow2Mass.ToString());
@@ -1732,7 +1722,6 @@ namespace TBF.UI.Procedures
 
 				entity.MassRepeats = int.Parse(lvi.SubItems[(int)ParametersClmn.MassRepeats].Text);
 
-#if STABLE_MASS_EXTRAS
 				float massSpread;
                 if (Utils.TryParseUFloat(lvi.SubItems[(int)ParametersClmn.MassSpread].Text, out massSpread) && massSpread >= 0)
                 {
@@ -1743,8 +1732,8 @@ namespace TBF.UI.Procedures
 				{
 					if (mm.ToDescription().Equals(lvi.SubItems[(int)ParametersClmn.MassMethod].Text)) entity.MassMethod = mm;
 				}
-#endif
+
-				int itmp;
+                int itmp;
 				if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Pump2StartV].Text, out itmp)) entity.TimePump2StartV = itmp;
 				if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_BeforeFlow].Text, out itmp)) entity.TimeBeforeFlow = itmp;
 				if (int.TryParse(lvi.SubItems[(int)ParametersClmn.Time_Flow2Mass].Text, out itmp)) entity.TimeFlow2Mass = itmp;
@@ -1858,7 +1847,6 @@ namespace TBF.UI.Procedures
                 e.Cancel = true;
             }
 
-#if STABLE_MASS_EXTRAS
 			if ((e.SubItem == (int)ParametersClmn.MassSpread) && !Utils.TryParseUFloat(e.DisplayText, out powerPct))
 			{
 				e.DisplayText = e.Item.SubItems[e.SubItem].Text;
@@ -1882,7 +1870,6 @@ namespace TBF.UI.Procedures
 					e.Cancel = true;
 				}
 			}
-#endif
         }
 
         #endregion