New conversion complete

This commit is contained in:
2015-12-07 12:38:58 -05:00
parent 5b85662bdb
commit 50ae6cb52c
25 changed files with 815 additions and 281 deletions
+10 -26
View File
@@ -1,37 +1,21 @@
using System.IO;
using System.ComponentModel;
namespace LeafWeb.Core.Charter
{
public class CurveData
{
private readonly string _curveId;
public string CurveId { get; set; }
public string CurveId => _curveId;
[DisplayName("Internal conductance fixed, compensation point and M-M constants fixed")]
public CurveParamSet FixedCndFixedCmp { get; set; }
// 1
public CurveParamSet FixedCndFixedCmp { get; }
// 2
public CurveParamSet FixedCndEstimatedCmp { get; }
[DisplayName("Internal conductance fixed, compensation point and M-M constants estimated")]
public CurveParamSet FixedCndEstimatedCmp { get; set; }
// 3
public CurveParamSet EstimatedCndFixedCmp { get; }
[DisplayName("Internal conductance estimated, compensation point and M-M constants fixed")]
public CurveParamSet EstimatedCndFixedCmp { get; set; }
// 4
public CurveParamSet EstimatedCndEstimatedCmp { get; }
public CurveData(TextReader sr, ref int lineNbr)
{
// For each curve in the output file there are four sets of data.
FixedCndFixedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
FixedCndEstimatedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
EstimatedCndFixedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
EstimatedCndEstimatedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
}
[DisplayName("Internal conductance estimated, compensation point and M-M constants estimated")]
public CurveParamSet EstimatedCndEstimatedCmp { get; set; }
}
}