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

BenchControl.Uni.Diverter/FlowMeter/RegReader added, etc. (many changes and refactorization).

Browse Source
This commit is contained in:
Milan Hanajik
2021-02-24 14:15:10 +01:00
parent 5325d7f6ee
commit 4cf4192ebb
163 changed files with 6766 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Bench/Components/ComponentsManagerDlg.cs
+17 -17
View File
@@ -725,42 +725,42 @@ namespace TBF.UI.Bench.Components
return true;
}
}
else if (cfg is BenchControl.Elde.FlowMeter.FlowMeterCfg)
else if (cfg is BenchControl.Uni.FlowMeter.FlowMeterCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
(cfg as BenchControl.Elde.FlowMeter.FlowMeterCfg).Idx1 = zeroBasedIdx + 1;
(cfg as IChildComponentCfg).ParentName = "UniCB";
(cfg as BenchControl.Uni.FlowMeter.FlowMeterCfg).Idx1 = zeroBasedIdx + 1;
return true;
}
else if (cfg is BenchControl.Elde.TempMeter.TempMeterCfg)
else if (cfg is BenchControl.Uni.RegValve.RegValveCfg)
{
(cfg as IChildComponentCfg).ParentName = "UniCB";
(cfg as BenchControl.Uni.RegValve.RegValveCfg).Idx1 = zeroBasedIdx + 1;
return true;
}
else if (cfg is BenchControl.Modbus.TempMeter.Groch.TempMeterCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
(cfg as BenchControl.Elde.TempMeter.TempMeterCfg).Idx0 = zeroBasedIdx;
return true;
}
else if (cfg is BenchControl.Elde.PressureMeter.PressureMeterCfg)
else if (cfg is BenchControl.Modbus.PressureMeter.Meret.PressureMeterCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
(cfg as BenchControl.Elde.PressureMeter.PressureMeterCfg).Idx0 = zeroBasedIdx;
return true;
}
else if (cfg is BenchControl.Elde.RegulValve.RegulValveCfg)
else if (cfg is BenchControl.RegisterReaders.PulsesFromUniCB.RRCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
(cfg as BenchControl.Elde.RegulValve.RegulValveCfg).Idx1 = zeroBasedIdx + 1;
(cfg as IChildComponentCfg).ParentName = "UniCB";
(cfg as BenchControl.RegisterReaders.PulsesFromUniCB.RRCfg).Position = zeroBasedIdx + 1;
return true;
}
else if (cfg is BenchControl.RegisterReaders.PulsesFromEldeCB.RegisterReaderCfg)
else if (cfg is BenchControl.RegisterReaders.StandingStartStop.RRCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
(cfg as BenchControl.RegisterReaders.PulsesFromEldeCB.RegisterReaderCfg).Position = zeroBasedIdx + 1;
(cfg as IChildComponentCfg).ParentName = "UniCB";
return true;
}
else if (cfg is BenchControl.RegisterReaders.StandingStartStop.RegisterReaderCfg)
{
(cfg as IChildComponentCfg).ParentName = "CB";
return true;
}
else if (cfg is BenchControl.RegisterReaders.KPackE.RegisterReader.RegisterReaderCfg)
else if (cfg is BenchControl.RegisterReaders.KPackE.RegisterReader.RRCfg)
{
(cfg as IChildComponentCfg).ParentName = "KPackE.Radio";
return true;
TBF/UI/Bench/Metrology/MetrologyDlg.cs
+3 -2
View File
@@ -141,7 +141,7 @@ namespace TBF.UI.Bench.Metrology
/// Tab-pages for pressure meters
if (factory is BenchControl.Elde.PressureMeter.PressureMeterFactory ||
factory is BenchControl.Elde.PressureMeterInternal.PressureMeterFactory ||
factory is BenchControl.Modbus.Meret.PressureMeter.Factory)
factory is BenchControl.Modbus.PressureMeter.Meret.Factory)
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
@@ -158,7 +158,8 @@ namespace TBF.UI.Bench.Metrology
if (factory is BenchControl.Elde.TempMeter.TempMeterFactory ||
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory ||
factory is BenchControl.Keithley.TempMeter.Factory ||
factory is BenchControl.Modbus.Meret.TempMeter.Factory)
factory is BenchControl.Modbus.TempMeter.Groch.Factory ||
factory is BenchControl.Modbus.TempMeter.Meret.Factory)
{
tempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+3 -2
View File
@@ -119,7 +119,7 @@ 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.Meret.PressureMeter.Factory)
factory is BenchControl.Modbus.PressureMeter.Meret.Factory)
{
pressMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");
@@ -135,7 +135,8 @@ namespace TBF.UI.Bench.Uncertainties
if (factory is BenchControl.Elde.TempMeter.TempMeterFactory ||
factory is BenchControl.Elde.TempMeterInternal.TempMeterFactory ||
factory is BenchControl.Keithley.TempMeter.Factory ||
factory is BenchControl.Modbus.Meret.TempMeter.Factory)
factory is BenchControl.Modbus.TempMeter.Groch.Factory ||
factory is BenchControl.Modbus.TempMeter.Meret.Factory)
{
tempMetersCount++;
TabPage tabPage = new TabPage(" " + cmpnt.Name + " ");