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

Refactorization : BenchControl -> Rig

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-05 16:12:24 +01:00
parent 84c8ec26b6
commit 6cf3bd6160
1461 changed files with 6330 additions and 6330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+26 -26
View File
@@ -7,7 +7,7 @@ using System.Windows.Forms;
using NHibernate;
using log4net;
using Config.Entities;
using TBF.BenchControl;
using TBF.Rig;
using TBF.Resources;
using TBF.UI.Shared;
@@ -61,16 +61,16 @@ namespace TBF.UI.Bench.Uncertainties
foreach (var cmpnt in cmpntEntities)
{
BenchControl.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
Rig.Generic.IComponentFactory factory = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName);
/// Tab-page density
if (factory is BenchControl.DataContainer.Density.Factory)
if (factory is Rig.DataContainer.Density.Factory)
{
fixedCount++;
TabPage tabPage = new TabPage(" " + Strings.Density + " ");
UncertntDlgDensityTab uiControl = new UncertntDlgDensityTab();
uiControl.MeterEntity = cmpnt;
uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.DataContainer.Density.ComponentCfg;
uiControl.DensityCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.DataContainer.Density.ComponentCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
@@ -78,16 +78,16 @@ namespace TBF.UI.Bench.Uncertainties
}
/// Tab-pages for scales
if (factory is BenchControl.MettlerToledo.Standard.BalanceFactory ||
factory is BenchControl.MettlerToledo.Standard.BalanceOldFactory ||
factory is BenchControl.MettlerToledo.Standard.BalanceNewFactory ||
factory is BenchControl.MettlerToledo.Multi.BalanceFactory)
if (factory is Rig.MettlerToledo.Standard.BalanceFactory ||
factory is Rig.MettlerToledo.Standard.BalanceOldFactory ||
factory is Rig.MettlerToledo.Standard.BalanceNewFactory ||
factory is Rig.MettlerToledo.Multi.BalanceFactory)
{
balancesCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
UncertntDlgScaleTab uiControl = new UncertntDlgScaleTab();
uiControl.MeterEntity = cmpnt;
uiControl.ScaleCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.IScaleCfg;
uiControl.ScaleCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.GenericDevices.IScaleCfg;
uiControl.Dock = DockStyle.Fill;
tabPage.Tag = uiControl;
tabPage.Controls.Add(uiControl);
@@ -95,9 +95,9 @@ namespace TBF.UI.Bench.Uncertainties
}
///// Tab-pages for flowmeters
//if (factory is BenchControl.Elde.FlowMeter.FlowMeterFactory)
//if (factory is Rig.Elde.FlowMeter.FlowMeterFactory)
//{
// BenchControl.Elde.FlowMeter.FlowMeterCfg flowMeterCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.Elde.FlowMeter.FlowMeterCfg;
// Rig.Elde.FlowMeter.FlowMeterCfg flowMeterCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.Elde.FlowMeter.FlowMeterCfg;
// for (int r = 0; r <= 5; r++)
// {
@@ -107,7 +107,7 @@ namespace TBF.UI.Bench.Uncertainties
// TabPage tabPage = new TabPage(string.Format(((r == 0) ? " {0} " : " {0} r{1} "), cmpnt.Name, r));
// MetrologyDlgFlowMeterTab uiControl = new MetrologyDlgFlowMeterTab(r);
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibRangesCfg;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.GenericDevices.ICalibRangesCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
@@ -117,9 +117,9 @@ namespace TBF.UI.Bench.Uncertainties
//}
/// Tab-pages for pressure meters
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory ||
factory is BenchControl.Elde.PressureMeterInternal.PressureMeterFactory ||
factory is BenchControl.Modbus.PressureMeter.Meret.Factory)
if (factory is Rig.Elde.PressureMeter.PressureMeterFactory ||
factory is Rig.Elde.PressureMeterInternal.PressureMeterFactory ||
factory is Rig.Modbus.PressureMeter.Meret.Factory)
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
@@ -132,11 +132,11 @@ namespace TBF.UI.Bench.Uncertainties
}
/// Tab-pages for temperature meters (incl. platinum temp. meter with Keithley)
if (factory is BenchControl.Elde.TempMeter.TempMeterFactory ||
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory ||
factory is BenchControl.Keithley.TempMeter.Factory ||
factory is BenchControl.Modbus.TempMeter.Groch.Factory ||
factory is BenchControl.Modbus.TempMeter.Meret.Factory)
if (factory is Rig.Elde.TempMeter.TempMeterFactory ||
factory is Rig.Elde.TempMeterInternal.TempMeterFactory ||
factory is Rig.Keithley.TempMeter.Factory ||
factory is Rig.Modbus.TempMeter.Groch.Factory ||
factory is Rig.Modbus.TempMeter.Meret.Factory)
{
tempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
@@ -149,13 +149,13 @@ namespace TBF.UI.Bench.Uncertainties
}
///// Tab-pages for diverters
//if (factory is BenchControl.Elde.Diverter.DiverterFactory)
//if (factory is Rig.Elde.Diverter.DiverterFactory)
//{
// divertersCount++;
// TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
// MetrologyDlgDiverterTab uiControl = new MetrologyDlgDiverterTab();
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.GenericDevices.ICalibInfoCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
@@ -163,13 +163,13 @@ namespace TBF.UI.Bench.Uncertainties
//}
///// Tab-pages for level meters inside water tanks
//if (factory is BenchControl.Hart.Nivotrack.Factory)
//if (factory is Rig.Hart.Nivotrack.Factory)
//{
// levelMetersCount++;
// TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
// MetrologyDlgLevelMeterTab uiControl = new MetrologyDlgLevelMeterTab();
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.GenericDevices.ICalibInfoCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
@@ -177,13 +177,13 @@ namespace TBF.UI.Bench.Uncertainties
//}
///// Tab-pages for water tank evaporation rates
//if (factory is BenchControl.Various.Evaporation.Factory)
//if (factory is Rig.Various.Evaporation.Factory)
//{
// evaporationsCount++;
// TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
// MetrologyDlgEvaporationTab uiControl = new MetrologyDlgEvaporationTab();
// uiControl.MeterEntity = cmpnt;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as BenchControl.GenericDevices.ICalibInfoCfg;
// uiControl.CalibInfoCfg = factory.CmpntCfgFromCmpntEntity(cmpnt) as Rig.GenericDevices.ICalibInfoCfg;
// uiControl.Dock = DockStyle.Fill;
// tabPage.Tag = uiControl;
// tabPage.Controls.Add(uiControl);
TBF/UI/Bench/Uncertainties/UncertntDlgDensityTab.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace TBF.UI.Bench.Uncertainties
/// <summary>
/// Balance configuration (with buoyancy parameters)
/// </summary>
public BenchControl.DataContainer.Density.ComponentCfg DensityCfg;
public Rig.DataContainer.Density.ComponentCfg DensityCfg;
/// <summary>
/// A list of 'measurement-correction' pairs to be deleted from the database on OK.
TBF/UI/Bench/Uncertainties/UncertntDlgScaleTab.cs
+1 -1
View File
@@ -31,7 +31,7 @@ namespace TBF.UI.Bench.Uncertainties
/// <summary>
/// Balance configuration (with buoyancy parameters)
/// </summary>
public BenchControl.GenericDevices.IScaleCfg ScaleCfg;
public Rig.GenericDevices.IScaleCfg ScaleCfg;
/// <summary>
/// A list of 'measurement-correction' pairs to be deleted from the database on OK.