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

UniCB DrShp, AltStrings, double Press, new Cfg style, Lbl,Setp,Msrd pos != 0, arrow keys, refactorization, ver. 3.1.1597

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-01 15:22:37 +01:00
parent b5f8d06e5b
commit 35815fe78a
147 changed files with 2901 additions and 5315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/PressureMeter/PressureMeter.cs
+4 -5
View File
@@ -91,11 +91,10 @@ namespace TBF.BenchControl.Elde.PressureMeter
/// Returns the water pressure and convert from kPa to default units
/// </summary>
/// <returns>Pressure</returns>
public float ReadPressure()
public double ReadPressure()
{
double rawPressure = Config.Units.ConvertFrom(Config.Unit.kPa, ControlBoard.Pressure(Idx0));
double correctedPressure = Config.Formulas.CorrectedValue(rawPressure, Corrections);
return (float)correctedPressure;
return Config.Formulas.CorrectedValue(rawPressure, Corrections);
}
@@ -104,7 +103,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
/// </summary>
/// <param name="pressure">Reference to a variable for the pressure in Bar</param>
/// <returns>ReadPressureOp instance reference casted to IOperaton</returns>
public IOperation ReadPressureOp(ref FloatBox pressure)
public IOperation ReadPressureOp(ref DoubleBox pressure)
{
return new ReadPressureOp(this, ref pressure);
}
@@ -115,7 +114,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
/// <param name="pressure">Reference to a variable for the pressure in Bar</param>
/// <param name="pressureDone">Event returned when measurement done</param>
/// <returns>ReadPressureOp instance reference casted to IOperaton</returns>
public IOperation ReadPressureOp(ref FloatBox pressure, Event pressureDone)
public IOperation ReadPressureOp(ref DoubleBox pressure, Event pressureDone)
{
return new ReadPressureOp(this, ref pressure, pressureDone);
}
TBF/BenchControl/Elde/PressureMeter/ReadPressureOp.cs
+5 -7
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System;
using log4net;
@@ -17,7 +17,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
readonly Event eventDone;
/// Measured value
FloatBox pressure;
DoubleBox pressure;
/// <summary>
/// Events: PressureInDone, PressureOutDone or Error
@@ -25,7 +25,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
/// <param name="pressureMeter">Pressure meter reference</param>
/// <param name="pressure">Reference to the measured pressure variable, value is in bar</param>
/// <param name="eventDone">Event to be returned by Run() when completed OK</param>
public ReadPressureOp(PressureMeter pressureMeter, ref FloatBox pressure, Event eventDone)
public ReadPressureOp(PressureMeter pressureMeter, ref DoubleBox pressure, Event eventDone)
{
if (pressureMeter == null) throw new ArgumentNullException("pressureMeter");
this.pressureMeter = pressureMeter;
@@ -34,7 +34,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
log.Debug(this.ToString());
}
public ReadPressureOp(PressureMeter pressureMeter, ref FloatBox pressure)
public ReadPressureOp(PressureMeter pressureMeter, ref DoubleBox pressure)
: this(pressureMeter, ref pressure, Event.PressureDone)
{
}
@@ -57,8 +57,6 @@ namespace TBF.BenchControl.Elde.PressureMeter
}
/// <summary>Stop this operation</summary>
public void Stop()
{
}
public void Stop() { }
}
}