|
@@ -207,7 +207,7 @@ namespace Tps_LQ_Transmitter.models
|
|
leftFreqOffsetPrint.TestVal = double.Parse(Data.leftFreqOffset[parameters.PointIndex]);
|
|
leftFreqOffsetPrint.TestVal = double.Parse(Data.leftFreqOffset[parameters.PointIndex]);
|
|
rightFreqOffsetPrint.TestVal = double.Parse(Data.rightFreqOffset[parameters.PointIndex]);
|
|
rightFreqOffsetPrint.TestVal = double.Parse(Data.rightFreqOffset[parameters.PointIndex]);
|
|
|
|
|
|
- if (ModulationIndexPrint.TestVal >= ModulationIndexPrint.Lower && ModulationIndexPrint.TestVal <= ModulationIndexPrint.Upper)
|
|
|
|
|
|
+ if ((ModulationIndexPrint.TestVal >= ModulationIndexPrint.Lower) &&( ModulationIndexPrint.TestVal <= ModulationIndexPrint.Upper))
|
|
{
|
|
{
|
|
ModulationIndexPrint.Result = "是";
|
|
ModulationIndexPrint.Result = "是";
|
|
MaxFreqOffsetPrint.Result = "是";
|
|
MaxFreqOffsetPrint.Result = "是";
|
|
@@ -221,7 +221,7 @@ namespace Tps_LQ_Transmitter.models
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- if (leftModulationIndexPrint.TestVal >= ModulationIndexPrint.Lower && leftModulationIndexPrint.TestVal <= ModulationIndexPrint.Upper)
|
|
|
|
|
|
+ if ((leftModulationIndexPrint.TestVal >= ModulationIndexPrint.Lower) && (leftModulationIndexPrint.TestVal <= ModulationIndexPrint.Upper))
|
|
{
|
|
{
|
|
|
|
|
|
leftModulationIndexPrint.Result = "是";
|
|
leftModulationIndexPrint.Result = "是";
|
|
@@ -234,7 +234,7 @@ namespace Tps_LQ_Transmitter.models
|
|
leftFreqOffsetPrint.Result = "否";
|
|
leftFreqOffsetPrint.Result = "否";
|
|
}
|
|
}
|
|
|
|
|
|
- if (rightModulationIndexPrint.TestVal >= ModulationIndexPrint.Lower && rightModulationIndexPrint.TestVal <= ModulationIndexPrint.Upper)
|
|
|
|
|
|
+ if ((rightModulationIndexPrint.TestVal >= ModulationIndexPrint.Lower) && (rightModulationIndexPrint.TestVal <= ModulationIndexPrint.Upper))
|
|
{
|
|
{
|
|
|
|
|
|
rightModulationIndexPrint.Result = "是";
|
|
rightModulationIndexPrint.Result = "是";
|
|
@@ -246,9 +246,9 @@ namespace Tps_LQ_Transmitter.models
|
|
rightModulationIndexPrint.Result = "否";
|
|
rightModulationIndexPrint.Result = "否";
|
|
rightFreqOffsetPrint.Result = "否";
|
|
rightFreqOffsetPrint.Result = "否";
|
|
}
|
|
}
|
|
- tps.TestTableAddCell(MaxFreqOffsetPrint.Test_name, leftFreqOffsetPrint.Lower.ToString(), leftFreqOffsetPrint.Upper.ToString(), MaxFreqOffsetPrint.TestVal.ToString(), MaxFreqOffsetPrint.Result);
|
|
|
|
- tps.TestTableAddCell(leftFreqOffsetPrint.Test_name, leftFreqOffsetPrint.Lower.ToString(), leftFreqOffsetPrint.Upper.ToString(), leftFreqOffsetPrint.TestVal.ToString(), leftFreqOffsetPrint.Result);
|
|
|
|
- tps.TestTableAddCell(rightFreqOffsetPrint.Test_name, rightFreqOffsetPrint.Lower.ToString(), rightFreqOffsetPrint.Upper.ToString(), rightFreqOffsetPrint.TestVal.ToString(), rightFreqOffsetPrint.Result);
|
|
|
|
|
|
+ tps.TestTableAddCell(MaxFreqOffsetPrint.Test_name, "/", "/", MaxFreqOffsetPrint.TestVal.ToString(), MaxFreqOffsetPrint.Result);
|
|
|
|
+ tps.TestTableAddCell(leftFreqOffsetPrint.Test_name, "/", "/", leftFreqOffsetPrint.TestVal.ToString(), leftFreqOffsetPrint.Result);
|
|
|
|
+ tps.TestTableAddCell(rightFreqOffsetPrint.Test_name, "/", "/", rightFreqOffsetPrint.TestVal.ToString(), rightFreqOffsetPrint.Result);
|
|
|
|
|
|
tps.TestTableAddCell(ModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), ModulationIndexPrint.TestVal.ToString(), ModulationIndexPrint.Result);
|
|
tps.TestTableAddCell(ModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), ModulationIndexPrint.TestVal.ToString(), ModulationIndexPrint.Result);
|
|
tps.TestTableAddCell(leftModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), leftModulationIndexPrint.TestVal.ToString(), leftModulationIndexPrint.Result);
|
|
tps.TestTableAddCell(leftModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), leftModulationIndexPrint.TestVal.ToString(), leftModulationIndexPrint.Result);
|
|
@@ -261,9 +261,9 @@ namespace Tps_LQ_Transmitter.models
|
|
WriteExcelData(sheet, parameters.PointIndex, 1, ModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), ModulationIndexPrint.TestVal.ToString(), ModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 1, ModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), ModulationIndexPrint.TestVal.ToString(), ModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 5, leftModulationIndexPrint.Test_name, leftModulationIndexPrint.Lower.ToString(), leftModulationIndexPrint.Upper.ToString(), leftModulationIndexPrint.TestVal.ToString(), leftModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 5, leftModulationIndexPrint.Test_name, leftModulationIndexPrint.Lower.ToString(), leftModulationIndexPrint.Upper.ToString(), leftModulationIndexPrint.TestVal.ToString(), leftModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 9, rightModulationIndexPrint.Test_name, rightModulationIndexPrint.Lower.ToString(), rightModulationIndexPrint.Upper.ToString(), rightModulationIndexPrint.TestVal.ToString(), rightModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 9, rightModulationIndexPrint.Test_name, rightModulationIndexPrint.Lower.ToString(), rightModulationIndexPrint.Upper.ToString(), rightModulationIndexPrint.TestVal.ToString(), rightModulationIndexPrint.Result);
|
|
- WriteExcelData(sheet, parameters.PointIndex, 3, MaxFreqOffsetPrint.Test_name, MaxFreqOffsetPrint.Lower.ToString(), MaxFreqOffsetPrint.Upper.ToString(), MaxFreqOffsetPrint.TestVal.ToString(), MaxFreqOffsetPrint.Result);
|
|
|
|
- WriteExcelData(sheet, parameters.PointIndex, 7, leftFreqOffsetPrint.Test_name, leftFreqOffsetPrint.Lower.ToString(), leftFreqOffsetPrint.Upper.ToString(), leftFreqOffsetPrint.TestVal.ToString(), leftFreqOffsetPrint.Result);
|
|
|
|
- WriteExcelData(sheet, parameters.PointIndex, 11, rightFreqOffsetPrint.Test_name, rightFreqOffsetPrint.Lower.ToString(), rightFreqOffsetPrint.Upper.ToString(), rightFreqOffsetPrint.TestVal.ToString(), rightFreqOffsetPrint.Result);
|
|
|
|
|
|
+ WriteExcelData(sheet, parameters.PointIndex, 3, MaxFreqOffsetPrint.Test_name, "/", "/", MaxFreqOffsetPrint.TestVal.ToString(), MaxFreqOffsetPrint.Result);
|
|
|
|
+ WriteExcelData(sheet, parameters.PointIndex, 7, leftFreqOffsetPrint.Test_name, "/", "/", leftFreqOffsetPrint.TestVal.ToString(), leftFreqOffsetPrint.Result);
|
|
|
|
+ WriteExcelData(sheet, parameters.PointIndex, 11, rightFreqOffsetPrint.Test_name, "/", "/", rightFreqOffsetPrint.TestVal.ToString(), rightFreqOffsetPrint.Result);
|
|
// tps.SetTestTableCellValue(point, 6, Data.MaxFreqOffset[point]);
|
|
// tps.SetTestTableCellValue(point, 6, Data.MaxFreqOffset[point]);
|
|
}
|
|
}
|
|
else if (parameters.Channel == "通道2")
|
|
else if (parameters.Channel == "通道2")
|
|
@@ -272,9 +272,9 @@ namespace Tps_LQ_Transmitter.models
|
|
WriteExcelData(sheet, parameters.PointIndex, 2, ModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), ModulationIndexPrint.TestVal.ToString(), ModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 2, ModulationIndexPrint.Test_name, ModulationIndexPrint.Lower.ToString(), ModulationIndexPrint.Upper.ToString(), ModulationIndexPrint.TestVal.ToString(), ModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 6, leftModulationIndexPrint.Test_name, leftModulationIndexPrint.Lower.ToString(), leftModulationIndexPrint.Upper.ToString(), leftModulationIndexPrint.TestVal.ToString(), leftModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 6, leftModulationIndexPrint.Test_name, leftModulationIndexPrint.Lower.ToString(), leftModulationIndexPrint.Upper.ToString(), leftModulationIndexPrint.TestVal.ToString(), leftModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 10, rightModulationIndexPrint.Test_name, rightModulationIndexPrint.Lower.ToString(), rightModulationIndexPrint.Upper.ToString(), rightModulationIndexPrint.TestVal.ToString(), rightModulationIndexPrint.Result);
|
|
WriteExcelData(sheet, parameters.PointIndex, 10, rightModulationIndexPrint.Test_name, rightModulationIndexPrint.Lower.ToString(), rightModulationIndexPrint.Upper.ToString(), rightModulationIndexPrint.TestVal.ToString(), rightModulationIndexPrint.Result);
|
|
- WriteExcelData(sheet, parameters.PointIndex, 4, MaxFreqOffsetPrint.Test_name, MaxFreqOffsetPrint.Lower.ToString(), MaxFreqOffsetPrint.Upper.ToString(), MaxFreqOffsetPrint.TestVal.ToString(), MaxFreqOffsetPrint.Result);
|
|
|
|
- WriteExcelData(sheet, parameters.PointIndex, 8, leftFreqOffsetPrint.Test_name, leftFreqOffsetPrint.Lower.ToString(), leftFreqOffsetPrint.Upper.ToString(), leftFreqOffsetPrint.TestVal.ToString(), leftFreqOffsetPrint.Result);
|
|
|
|
- WriteExcelData(sheet, parameters.PointIndex, 11, rightFreqOffsetPrint.Test_name, rightFreqOffsetPrint.Lower.ToString(), rightFreqOffsetPrint.Upper.ToString(), rightFreqOffsetPrint.TestVal.ToString(), rightFreqOffsetPrint.Result);
|
|
|
|
|
|
+ WriteExcelData(sheet, parameters.PointIndex, 4, MaxFreqOffsetPrint.Test_name, "/", "/", MaxFreqOffsetPrint.TestVal.ToString(), MaxFreqOffsetPrint.Result);
|
|
|
|
+ WriteExcelData(sheet, parameters.PointIndex, 8, leftFreqOffsetPrint.Test_name, "/", "/", leftFreqOffsetPrint.TestVal.ToString(), leftFreqOffsetPrint.Result);
|
|
|
|
+ WriteExcelData(sheet, parameters.PointIndex, 11, rightFreqOffsetPrint.Test_name, "/", "/", rightFreqOffsetPrint.TestVal.ToString(), rightFreqOffsetPrint.Result);
|
|
//tps.SetTestTableCellValue(point + 15, 9, ModulationIndexPrint.Result, Data.ModulationIndex[point]);
|
|
//tps.SetTestTableCellValue(point + 15, 9, ModulationIndexPrint.Result, Data.ModulationIndex[point]);
|
|
//tps.SetTestTableCellValue(point + 15, 6, Data.MaxFreqOffset[point]);
|
|
//tps.SetTestTableCellValue(point + 15, 6, Data.MaxFreqOffset[point]);
|
|
}
|
|
}
|