michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs
View File

@ -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]);
}
}

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceCfg.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfg.cs
View File

@ -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
{

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.Designer.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.Designer.cs generated
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
partial class BalanceCfgCtrl
{

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs
View File

@ -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
{

0
TestBenchFramework/BenchControl/MettlerToledo/BalanceCfgCtrl.resx → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.resx
View File

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceDev.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceDev.cs
View File

@ -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)

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceFactory.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceFactory.cs
View File

@ -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
{

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceNewDev.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewDev.cs
View File

@ -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)

2
TestBenchFramework/BenchControl/MettlerToledo/BalanceNewFactory.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/BalanceNewFactory.cs
View File

@ -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
{

2
TestBenchFramework/BenchControl/MettlerToledo/GetBalanceSNOp.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/GetBalanceSNOp.cs
View File

@ -4,7 +4,7 @@
using System;
using log4net;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class GetBalanceSNOp : IOperation
{

2
TestBenchFramework/BenchControl/MettlerToledo/ReadMassOp.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassOp.cs
View File

@ -5,7 +5,7 @@ using System;
using log4net;
using TBF.Boxes;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class ReadMassOp : IOperation
{

2
TestBenchFramework/BenchControl/MettlerToledo/ReadMassesOp.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadMassesOp.cs
View File

@ -4,7 +4,7 @@
using System;
using log4net;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class ReadMassesOp : IOperation
{

2
TestBenchFramework/BenchControl/MettlerToledo/ReadStableMassOp.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/ReadStableMassOp.cs
View File

@ -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.

2
TestBenchFramework/BenchControl/MettlerToledo/SetUnitsOp.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/SetUnitsOp.cs
View File

@ -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
{

2
TestBenchFramework/BenchControl/MettlerToledo/TaringOp.cs → TestBenchFramework/BenchControl/MettlerToledo/Standard/TaringOp.cs
View File

@ -5,7 +5,7 @@ using System;
using log4net;
using TBF.Boxes;
namespace TBF.BenchControl.MettlerToledo
namespace TBF.BenchControl.MettlerToledo.Standard
{
public class TaringOp : IOperation
{

2
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
View File

@ -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
{

4
TestBenchFramework/BenchControl/TbfComponents.cs
View File

@ -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());

4
TestBenchFramework/MetrologyDlg.cs
View File

@ -56,8 +56,8 @@ namespace TBF
{
BenchControl.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
if (factory is BenchControl.MettlerToledo.BalanceFactory ||
factory is BenchControl.MettlerToledo.BalanceNewFactory)
if (factory is BenchControl.MettlerToledo.Standard.BalanceFactory ||
factory is BenchControl.MettlerToledo.Standard.BalanceNewFactory)
{
balancesCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");

36
TestBenchFramework/TBF.csproj
View File

@ -157,6 +157,23 @@
<DependentUpon>TestStartEndForm.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\Elde\Diverter\Handlers.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceCfg.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.designer.cs">
<DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceDev.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceFactory.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceNewDev.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\BalanceNewFactory.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\GetBalanceSNOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\ReadMassesOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\ReadMassOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\ReadStableMassOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\SetUnitsOp.cs" />
<Compile Include="BenchControl\MettlerToledo\Standard\TaringOp.cs" />
<Compile Include="PrintOrderDocument.cs">
<SubType>Component</SubType>
</Compile>
@ -466,14 +483,6 @@
<Compile Include="BenchControl\Elde\Valve\ValveCfgCtrl.Designer.cs">
<DependentUpon>ValveCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\MettlerToledo\BalanceCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BenchControl\MettlerToledo\BalanceCfgCtrl.Designer.cs">
<DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="BenchControl\MettlerToledo\BalanceNewFactory.cs" />
<Compile Include="BenchControl\MettlerToledo\ReadMassesOp.cs" />
<Compile Include="BenchControl\Operations\AskYesNoOp.cs" />
<Compile Include="BenchControl\Operations\AskYesNoForm.cs">
<SubType>Form</SubType>
@ -762,15 +771,6 @@
<Compile Include="BenchControl\Generic\IComponent.cs" />
<Compile Include="BenchControl\Generic\IComponentFactory.cs" />
<Compile Include="BenchControl\Generic\IComponentCfg.cs" />
<Compile Include="BenchControl\MettlerToledo\BalanceCfg.cs" />
<Compile Include="BenchControl\MettlerToledo\BalanceDev.cs" />
<Compile Include="BenchControl\MettlerToledo\BalanceNewDev.cs" />
<Compile Include="BenchControl\MettlerToledo\BalanceFactory.cs" />
<Compile Include="BenchControl\MettlerToledo\GetBalanceSNOp.cs" />
<Compile Include="BenchControl\MettlerToledo\ReadMassOp.cs" />
<Compile Include="BenchControl\MettlerToledo\ReadStableMassOp.cs" />
<Compile Include="BenchControl\MettlerToledo\SetUnitsOp.cs" />
<Compile Include="BenchControl\MettlerToledo\TaringOp.cs" />
<Compile Include="BenchControl\TbfComponents.cs" />
<Compile Include="ComponentParametersDlg.cs">
<SubType>Form</SubType>
@ -1215,7 +1215,7 @@
<EmbeddedResource Include="BenchControl\Elde\Valve\ValveCfgCtrl.resx">
<DependentUpon>ValveCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\MettlerToledo\BalanceCfgCtrl.resx">
<EmbeddedResource Include="BenchControl\MettlerToledo\Standard\BalanceCfgCtrl.resx">
<DependentUpon>BalanceCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BenchControl\Operations\AskYesNoForm.resx">