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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/Uni/Diverter/Diverter.cs
+3 -1
View File
@@ -4,6 +4,8 @@
using System;
using System.Collections.Generic;
using log4net;
using Common;
using Config.Entities;
using Dirichlet.Numerics;
using SchematicDrawing;
using TBF.Rig.ControlBoard.Uni;
@@ -60,7 +62,7 @@ namespace TBF.Rig.Uni.Diverter
/// </summary>
public double TestTimeCorrection(double flow)
{
return Config.Formulas.GetCorrection(flow, Corrections);
return MeasurementCorrection.GetCorrection(flow, Corrections);
}
TBF/Rig/Uni/Diverter/DiverterCfgCtrl.cs
+1
View File
@@ -5,6 +5,7 @@ using System;
using System.Linq;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
TBF/Rig/Uni/FlowMeter/FlowMeter.cs
+4 -2
View File
@@ -4,6 +4,8 @@
using System;
using System.Collections.Generic;
using log4net;
using Common;
using Config.Entities;
using SchematicDrawing;
using TBF.Rig.ControlBoard.Uni;
using TBF.Boxes;
@@ -80,12 +82,12 @@ namespace TBF.Rig.Uni.FlowMeter
public double LtrPerPulseCorrected(double flow, int rangeIx)
{
/// Apply correction
var rangeCorrections = new List<Config.Entities.MeasurementCorrection>();
var rangeCorrections = new List<MeasurementCorrection>();
foreach (var corr in Corrections)
{
if (corr.RangeIx == rangeIx) rangeCorrections.Add(corr);
}
double correctedFlow = Config.Formulas.CorrectedValue(flow, rangeCorrections);
double correctedFlow = MeasurementCorrection.CorrectedValue(flow, rangeCorrections);
return (LtrPerPulse * correctedFlow / flow);
}
TBF/Rig/Uni/FlowMeter/FlowMeterCfg.cs
+2 -2
View File
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Common;
using Config.Entities;
using SchematicDrawing;
using TBF.Rig.Generic;
@@ -586,7 +586,7 @@ namespace TBF.Rig.Uni.FlowMeter
prms.Press5Hi = Press5Hi;
}
public Config.Entities.IParamsProvider Clone()
public IParamsProvider Clone()
{
FlowMeterCfg pars = new FlowMeterCfg();
CopyContentTo(pars);
TBF/Rig/Uni/FlowMetersInParallel/FlowMeterCfg.cs
+3 -3
View File
@@ -5,14 +5,14 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Common;
using Config.Entities;
using SchematicDrawing;
using TBF.Rig.Generic;
namespace TBF.Rig.Uni.FlowMetersInParallel
{
public class FlowMeterCfg : ComponentCfgBase, IChildComponentCfg, Config.Entities.IParamsProvider
public class FlowMeterCfg : ComponentCfgBase, IChildComponentCfg, IParamsProvider
{
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
@@ -185,7 +185,7 @@ namespace TBF.Rig.Uni.FlowMetersInParallel
prms.MsrdValLimHi = this.MsrdValLimHi;
}
public Config.Entities.IParamsProvider Clone()
public IParamsProvider Clone()
{
FlowMeterCfg pars = new FlowMeterCfg();
CopyContentTo(pars);
TBF/Rig/Uni/RegValve/RegValveCfg.cs
+2 -2
View File
@@ -32,7 +32,7 @@ namespace TBF.Rig.Uni.RegValve
public int FlowStableSec; /// 0..60 sec
public bool StoredPositionReuse; /// true = store and re-use previous regulation valve positions
public string SetpFormat { get; set; }
public Config.Unit SetpUnit { get; set; }
public Common.Unit SetpUnit { get; set; }
/// Schematic drawing info
public Shape Shape { get; set; }
@@ -68,7 +68,7 @@ namespace TBF.Rig.Uni.RegValve
Shape = Shape.RegV;
Sz = Sz.M;
SetpFormat = "{0:F0} %";
SetpUnit = Config.Unit.Pct;
SetpUnit = Common.Unit.Pct;
Name = name;
Factory = factory;
TBF/Rig/Uni/RegValve/RegValveCfgCtrl.cs
+5 -4
View File
@@ -5,6 +5,7 @@ using System;
using System.Linq;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
@@ -59,9 +60,9 @@ namespace TBF.Rig.Uni.RegValve
pct2 = 100;
}
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
for (Common.Unit units = 0; units < global::Common.Unit.Count; units++)
{
if (global::Config.Units.IsQuantity(units, global::Config.Quantity.Error))
if (global::Common.Units.IsQuantity(units, Quantity.Error))
{
unitsComboBox.Items.Add(units.ToString());
}
@@ -248,8 +249,8 @@ namespace TBF.Rig.Uni.RegValve
}
config.SetpFormat = formatTextBox.Text;
config.SetpUnit = global::Config.Unit.None;
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
config.SetpUnit = global::Common.Unit.None;
for (Common.Unit units = 0; units < global::Common.Unit.Count; units++)
{
if (unitsComboBox.Text == units.ToString())
{
TBF/Rig/Uni/RegValveAnalog/RegValveCfg.cs
+2 -2
View File
@@ -42,7 +42,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
public int SetpY { get; set; }
public Orient SetpOrient { get; set; }
public string SetpFormat { get; set; }
public Config.Unit SetpUnit { get; set; }
public Common.Unit SetpUnit { get; set; }
[XmlIgnore]
public IList<GNode> GNodes { get; set; }
@@ -64,7 +64,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
Shape = Shape.RegV;
Sz = Sz.M;
SetpFormat = "{0:F0} %";
SetpUnit = Config.Unit.Pct;
SetpUnit = Common.Unit.Pct;
Name = name;
Factory = factory;
TBF/Rig/Uni/RegValveAnalog/RegValveCfgCtrl.cs
+5 -4
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;
@@ -50,9 +51,9 @@ namespace TBF.Rig.Uni.RegValveAnalog
categoryComboBox.Items.Add(ValveCategory.Feeding.ToString());
categoryComboBox.Items.Add(ValveCategory.Output.ToString());
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
for (Common.Unit units = 0; units < global::Common.Unit.Count; units++)
{
if (global::Config.Units.IsQuantity(units, global::Config.Quantity.Error))
if (global::Common.Units.IsQuantity(units, Quantity.Error))
{
unitsComboBox.Items.Add(units.ToString());
}
@@ -199,8 +200,8 @@ namespace TBF.Rig.Uni.RegValveAnalog
config.ReTryCommands = btmp;
flags |= CfgUpdateFlags.RestartRqrd;
}
config.SetpUnit = global::Config.Unit.None;
for (Config.Unit units = 0; units < global::Config.Unit.Count; units++)
config.SetpUnit = global::Common.Unit.None;
for (Common.Unit units = 0; units < global::Common.Unit.Count; units++)
{
if (unitsComboBox.Text == units.ToString())
{
TBF/Rig/Uni/RegValveTandem/RegValveTandemCfgCtrl.cs
+1
View File
@@ -3,6 +3,7 @@
///
using System;
using System.Windows.Forms;
using Common;
using Config.Entities;
using TBF.Rig.Generic;
using TBF.UI.Bench.Components;