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

Initial values: CalibDate = Constants.MinDate, CalibValidDate = Constants.MaxDate, MaxDate = new DateTime(2039, 12, 31);

Browse Source
This commit is contained in:
Milan Hanajik
2021-08-18 10:40:51 +02:00
parent 5905d0850b
commit 848f9dff9d
17 changed files with 204 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/Diverter/DiverterCfg.cs
+18 -32
View File
@@ -30,45 +30,31 @@ namespace TBF.BenchControl.Elde.Diverter
public int DfltSwithTimeEndMs; /// Default diverter transition time 'end' or 'to sink' in ms
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
DiverterCfg()
{
Name = "Div";
ParentName = "CB";
BitPosition = 0;
AdcNr = 5; /// Div1: AdcNr=5 , Div2: AdcNr=6
AdcValueToSink = 100;
AdcValueToTank = 500;
StartingLevel = 50;
ThresholdLo = 10;
ThresholdHi = 90;
calibCertificateNr = string.Empty;
}
DiverterCfg() { }
public DiverterCfg(IComponentFactory factory)
: this()
{
this.Factory = factory;
Factory = factory;
Name = "Div";
ParentName = "CB";
BitPosition = 0;
AdcNr = 5; /// Div1: AdcNr=5 , Div2: AdcNr=6
AdcValueToSink = 100;
AdcValueToTank = 500;
StartingLevel = 50;
ThresholdLo = 10;
ThresholdHi = 90;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}
public string ToString(int i)
TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs
+31 -9
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -224,18 +224,40 @@ namespace TBF.BenchControl.Elde.FlowMeter
/// Private parameterless constructor invoked by all other (public) constructors
FlowMeterCfg()
{
Name = "FlowMeter";
FlowMeterCfg() { }
public FlowMeterCfg(string name, IComponentFactory factory)
: this()
{
Factory = factory;
Name = name;
Initialize();
}
void Initialize()
{
ParentName = "CB";
Idx1 = 1;
NominalFlow = 1;
}
public FlowMeterCfg(IComponentFactory factory)
: this()
{
this.Factory = factory;
CalibCertificateNr = string.Empty;
CalibCertificate1 = string.Empty;
CalibCertificate2 = string.Empty;
CalibCertificate3 = string.Empty;
CalibCertificate4 = string.Empty;
CalibCertificate5 = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibDate1 = TBF.UI.Constants.MinDate;
CalibDate2 = TBF.UI.Constants.MinDate;
CalibDate3 = TBF.UI.Constants.MinDate;
CalibDate4 = TBF.UI.Constants.MinDate;
CalibDate5 = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
CalibValidDate1 = TBF.UI.Constants.MaxDate;
CalibValidDate2 = TBF.UI.Constants.MaxDate;
CalibValidDate3 = TBF.UI.Constants.MaxDate;
CalibValidDate4 = TBF.UI.Constants.MaxDate;
CalibValidDate5 = TBF.UI.Constants.MaxDate;
}
public string ToString(int i)
TBF/BenchControl/Elde/FlowMeter/FlowMeterFactory.cs
+2 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
/// Copyright (c) 2013-2021 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
@@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde.FlowMeter
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new FlowMeter(cfg, components); }
public IComponentCfg DefaultConfig() { return new FlowMeterCfg(this); }
public IComponentCfg DefaultConfig() { return new FlowMeterCfg("I", this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
{
TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs
+14 -26
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -25,39 +25,27 @@ namespace TBF.BenchControl.Elde.PressureMeter
public byte RS485Address; /// 0..255
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
PressureMeterCfg()
{
PressureMeterCfg() { }
public PressureMeterCfg(IComponentFactory factory)
: this()
{
Factory = factory;
Name = "Pr";
ParentName = "CB";
Idx0 = 0;
Protocol = MeretProtocol.Modbus;
RS485Address = 99;
}
public PressureMeterCfg(IComponentFactory factory)
: this()
{
this.Factory = factory;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}
public string ToString(int i)
TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs
+20 -32
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015-2016 Sensus Metering Systems
/// Copyright (c) 2015-2021 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
@@ -28,43 +28,31 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal
public float A5;
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
PressureMeterCfg()
{
Name = "Pr";
ParentName = "CB";
Idx0 = 0;
CoefsIdx0 = 0;
A1 = 0;
A2 = 0;
A3 = 0;
A4 = 0;
A5 = 0;
}
PressureMeterCfg() { }
public PressureMeterCfg(IComponentFactory factory)
: this()
{
this.Factory = factory;
Factory = factory;
Name = "Pr";
ParentName = "CB";
Idx0 = 0;
CoefsIdx0 = 0;
A1 = 0;
A2 = 0;
A3 = 0;
A4 = 0;
A5 = 0;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}
public string ToString(int i)
TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs
+15 -27
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -28,28 +28,18 @@ namespace TBF.BenchControl.Elde.TempMeter
public double DefaultTemperature;
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
TempMeterCfg()
{
TempMeterCfg() { }
public TempMeterCfg(IComponentFactory factory)
: this()
{
Factory = factory;
Name = "T";
ParentName = "CB";
Idx0 = 0;
@@ -58,13 +48,11 @@ namespace TBF.BenchControl.Elde.TempMeter
A3 = 0;
A4 = 0;
A5 = 0;
DefaultTemperature = 20.0;
}
DefaultTemperature = 20.0;
public TempMeterCfg(IComponentFactory factory)
: this()
{
this.Factory = factory;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}
public string ToString(int i)
TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs
+19 -33
View File
@@ -1,6 +1,5 @@
///
/// Copyright (c) 2015-2016 Sensus Metering Systems
/// Author: Milan Hanajik
/// Copyright (c) 2015-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -29,44 +28,31 @@ namespace TBF.BenchControl.Elde.TempMeterInternal
public float A5;
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
TempMeterCfg()
{
Name = "T";
ParentName = "CB";
Idx0 = 0;
CoefsIdx0 = 2;
A1 = 0;
A2 = 0;
A3 = 0;
A4 = 0;
A5 = 0;
}
TempMeterCfg() { }
public TempMeterCfg(IComponentFactory factory)
: this()
{
this.Factory = factory;
Factory = factory;
Name = "T";
ParentName = "CB";
Idx0 = 0;
CoefsIdx0 = 2;
A1 = 0;
A2 = 0;
A3 = 0;
A4 = 0;
A5 = 0;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}
public string ToString(int i)
TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs
+9 -24
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
/// Copyright (c) 2018-2021 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -42,32 +42,13 @@ namespace TBF.BenchControl.Elde.TempMeterMeret
public int MeretIdx0; /// Meter pressure meters count .. (Meter pressure meters count + Meter temperature meters count - 1)
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;
DateTime calibDate;
DateTime calibValidDate;
public string CalibCertificateNr
{
get { return calibCertificateNr; }
set { calibCertificateNr = value; }
}
public DateTime CalibDate
{
get { return calibDate; }
set { calibDate = value; }
}
public DateTime CalibValidDate
{
get { return calibValidDate; }
set { calibValidDate = value; }
}
public string CalibCertificateNr { get; set; }
public DateTime CalibDate { get; set; }
public DateTime CalibValidDate { get; set; }
/// Private parameterless constructor invoked by all other (public) constructors
TempMeterCfg()
{
Name = "T";
ParentName = "CB";
}
TempMeterCfg() { }
public TempMeterCfg(IComponentFactory factory)
: this()
@@ -85,6 +66,10 @@ namespace TBF.BenchControl.Elde.TempMeterMeret
TempIdx0 = 8;
ModbusAddress = 1;
MeretIdx0 = 4;
CalibCertificateNr = string.Empty;
CalibDate = TBF.UI.Constants.MinDate;
CalibValidDate = TBF.UI.Constants.MaxDate;
}