Commit 8cc9a3d7 authored by 潘栩锋's avatar 潘栩锋 🚴

修改 边界查找,AD曲线,的默认参数

parent 038603a8
...@@ -257,7 +257,7 @@ namespace FLY.Thick.Base.Server ...@@ -257,7 +257,7 @@ namespace FLY.Thick.Base.Server
} }
void Default() void Default()
{ {
Enable = false; Enable = true;
Valid = new RangeStruct(1200,7400); Valid = new RangeStruct(1200,7400);
TempAD = -1; TempAD = -1;
N = 20; N = 20;
......
...@@ -70,18 +70,6 @@ namespace FLY.Thick.Base.Server ...@@ -70,18 +70,6 @@ namespace FLY.Thick.Base.Server
{ {
CorrectWay = CurveCorrectWay.OnePointIsScale; CorrectWay = CurveCorrectWay.OnePointIsScale;
Flag = CurveType.E; Flag = CurveType.E;
//Curves = new CurveCell[] {
// new CurveCell() { AD = 57564, Value = 0 },
// new CurveCell() { AD = 30850, Value = 88 },
// new CurveCell() { AD = 19000, Value = 176 },
// new CurveCell() { AD = 12528, Value = 264 },
// new CurveCell() { AD = 8409, Value = 352 },
// new CurveCell() { AD = 5650, Value = 440 },
// new CurveCell() { AD = 3779, Value = 528 },
// new CurveCell() { AD = 2513, Value = 616 },
// new CurveCell() { AD = 1660, Value = 704 }
//};
Curves = new CurveCell[] { Curves = new CurveCell[] {
new CurveCell() { Value = 0, AD = 50300 }, new CurveCell() { Value = 0, AD = 50300 },
new CurveCell() { Value = 19, AD = 46505 }, new CurveCell() { Value = 19, AD = 46505 },
...@@ -99,8 +87,7 @@ namespace FLY.Thick.Base.Server ...@@ -99,8 +87,7 @@ namespace FLY.Thick.Base.Server
new CurveCell() { Value = 251, AD = 18606 }, new CurveCell() { Value = 251, AD = 18606 },
new CurveCell() { Value = 271, AD = 17283 }, new CurveCell() { Value = 271, AD = 17283 },
new CurveCell() { Value = 290, AD = 16035 } new CurveCell() { Value = 290, AD = 16035 }
}; };
} }
public void Apply(CurveCorrectWay correctWay, CurveType flag, CurveCell2[] curves) public void Apply(CurveCorrectWay correctWay, CurveType flag, CurveCell2[] curves)
{ {
...@@ -275,8 +262,8 @@ namespace FLY.Thick.Base.Server ...@@ -275,8 +262,8 @@ namespace FLY.Thick.Base.Server
return value; return value;
} }
double AD2Value_Line(int ad, AD2ValueFlag flag) double AD2Value_Line(int ad, AD2ValueFlag flag)
{ {
int i; int i;
...@@ -357,7 +344,7 @@ namespace FLY.Thick.Base.Server ...@@ -357,7 +344,7 @@ namespace FLY.Thick.Base.Server
value = (ad2 - ad0) * u + c0.Value; value = (ad2 - ad0) * u + c0.Value;
return value; return value;
} }
public double AD2Value(int ad, AD2ValueFlag flag) public double AD2Value(int ad, AD2ValueFlag flag)
{ {
...@@ -382,7 +369,8 @@ namespace FLY.Thick.Base.Server ...@@ -382,7 +369,8 @@ namespace FLY.Thick.Base.Server
/// <param name="value"></param> /// <param name="value"></param>
/// <param name="flag"></param> /// <param name="flag"></param>
/// <returns></returns> /// <returns></returns>
public int Value2Ad(double value, AD2ValueFlag flag) { public int Value2Ad(double value, AD2ValueFlag flag)
{
int ad; int ad;
switch (Flag) switch (Flag)
{ {
...@@ -473,7 +461,7 @@ namespace FLY.Thick.Base.Server ...@@ -473,7 +461,7 @@ namespace FLY.Thick.Base.Server
ad = (int)Math.Round(ad2); ad = (int)Math.Round(ad2);
return ad; return ad;
} }
#endregion #endregion
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment