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

Various.TankWithLevelMsrmnt can use a calibration table loaded from a CSV file.

Browse Source
This commit is contained in:
Milan Hanajik
2018-10-25 15:34:46 +02:00
parent ac2ac82187
commit 3725e238fc
4 changed files with 158 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfg.cs
+6 -4
View File
@@ -32,8 +32,9 @@ namespace TBF.BenchControl.Various.TankWithLevelMsrmnt
private int drainTimeSec;
public int DrainTimeSec { get { return drainTimeSec; } set { drainTimeSec = value; } }
public string LevelMeasurement;
public string LevelMeasurement; /// Name of a level measurement component, 'Various.ManualLevelMsrmnt' is used when left empty.
public string CalibrationTable; /// Path name of a calibration table in CSV format (column1 = height[mm], column2 = volume[l])
/// Volume calculation using formulas for std. tanks in Level2Volume() is used when left empty.
/// Private parameterless constructor invoked by all other (public) constructors
TankCfg()
@@ -58,12 +59,13 @@ namespace TBF.BenchControl.Various.TankWithLevelMsrmnt
DrainValve = "VB1";
DrainTimeSec = 180;
LevelMeasurement = string.Empty;
CalibrationTable = string.Empty;
}
public string ToString(int i)
{
return string.Format("Name={0}, {1}l, empty={2}l, drainVlv={3}, drainTm={4}s",
Name, Capacity, Empty, DrainValve, DrainTimeSec);
return string.Format("Capacity={0}l, empty={1}l, drainValve={2}, drainTime={3}s, levelMsrmnt={4}, cal.table={5}",
Capacity, Empty, DrainValve, DrainTimeSec, LevelMeasurement, CalibrationTable);
}
}
}