Changes for Xylem Nanjing, ver. 3.1.1676

This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
@@ -4,6 +4,7 @@
using System;
using System.Windows.Forms;
using System.IO.Ports;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
@@ -121,9 +122,9 @@ namespace TBF.Rig.MettlerToledo.Standard
}
}
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
for (Common.Unit units = 0; units < global::Common.Unit.Count; units++)
{
if (global::Config.Units.IsQuantity(units, global::Config.Quantity.Mass))
if (global::Common.Units.IsQuantity(units, Quantity.Mass))
{
unitsComboBox.Items.Add(units.ToString());
}
@@ -279,8 +280,8 @@ namespace TBF.Rig.MettlerToledo.Standard
config.Handshake = GetHandshake(handshakeComboBox.SelectedItem.ToString());
config.MsrdFormat = formatTextBox.Text;
config.MsrdUnit = global::Config.Unit.None;
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
config.MsrdUnit = global::Common.Unit.None;
for (Common.Unit units = 0; units < global::Common.Unit.Count; units++)
{
if (unitsComboBox.Text == units.ToString())
{