MettlerToledo scales moved one level down in the directory and namespace structure.

This commit is contained in:
Milan Hanajik
2015-05-07 16:11:07 +02:00
parent 724537bd93
commit 21d0adb089
19 changed files with 38 additions and 38 deletions
@@ -130,9 +130,9 @@ namespace TBF.BenchControl.Elde
public void UpdateWeights()
{
for (int i = 0; i < MettlerToledo.BalanceDev.BalancesCount; i++)
for (int i = 0; i < MettlerToledo.Standard.BalanceDev.BalancesCount; i++)
{
controlCom.SetWeight(i, MettlerToledo.BalanceDev.Masses[i]);
controlCom.SetWeight(i, MettlerToledo.Standard.BalanceDev.Masses[i]);
}
}
@@ -7,7 +7,7 @@ using System.IO.Ports;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class BalanceCfg : ComponentCfgBase, Generic.IComponentCfg
{
@@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
partial class BalanceCfgCtrl
{
@@ -8,7 +8,7 @@ using System.IO.Ports;
using log4net;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public partial class BalanceCfgCtrl : UserControl, IComponentCfgCtrl
{
@@ -10,7 +10,7 @@ using log4net;
using TBF.BenchControl.Generic;
using TBF.Boxes;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
/// <summary>
/// Mettler Toledo ICS4_5 Weighting terminal connected via serial interface (RS232)
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class BalanceFactory : IComponentFactory
{
@@ -9,7 +9,7 @@ using System.IO.Ports;
using log4net;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
/// <summary>
/// Mettler Toledo ICS4_5 Weighting terminal connected via serial interface (RS232)
@@ -4,7 +4,7 @@
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class BalanceNewFactory : IComponentFactory
{
@@ -4,7 +4,7 @@
using System;
using log4net;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class GetBalanceSNOp : IOperation
{
@@ -5,7 +5,7 @@ using System;
using log4net;
using TBF.Boxes;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class ReadMassOp : IOperation
{
@@ -4,7 +4,7 @@
using System;
using log4net;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class ReadMassesOp : IOperation
{
@@ -5,7 +5,7 @@ using System;
using log4net;
using TBF.Boxes;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
/// <summary>
/// Operation to read more mass values and average them to obtain a more accurate result.
@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using log4net;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class SetUnitsOp : IOperation
{
@@ -5,7 +5,7 @@ using System;
using log4net;
using TBF.Boxes;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class TaringOp : IOperation
{
@@ -148,7 +148,7 @@ namespace TBF.BenchControl.Sequences
Bridge.OnActivity(this, Strings.Measuring_the_weight);
State.Create("MainSeq : Mesuring the weight for the 1st time")
.AddOperation(checkUiOp)
.AddOperation(new MettlerToledo.ReadMassesOp())
.AddOperation(new MettlerToledo.Standard.ReadMassesOp())
.EnterState();
do
{
@@ -38,8 +38,8 @@ namespace TBF.BenchControl
Factories.Add(new Ambient.Greco.Factory());
Factories.Add(new Cameras.IdcCamera.IdcCameraFactory());
Factories.Add(new TestMethods.LeakTest.TestMethodFactory());
Factories.Add(new MettlerToledo.BalanceFactory());
Factories.Add(new MettlerToledo.BalanceNewFactory());
Factories.Add(new MettlerToledo.Standard.BalanceFactory());
Factories.Add(new MettlerToledo.Standard.BalanceNewFactory());
Factories.Add(new TestMethods.PMaxTest.TestMethodFactory());
Factories.Add(new Elde.PressureMeter.PressureMeterFactory());
Factories.Add(new Elde.Pump.PumpFactory());