cgx/WindowsFormsApp6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
GukSang.Jin
2026-01-05 18:31:26 +08:00
parent f9f66b7a94
commit 75504b6870
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
WindowsFormsApp6/Form1.cs
View File

@@ -459,12 +459,14 @@ namespace WindowsFormsApp6
double avg1 = count1 > 0 ? sum1 / count1 : 0; double avg1 = count1 > 0 ? sum1 / count1 : 0;
// 添加试样1-5平均值行 // 添加试样1-5平均值行 - 只在第一列显示平均值
DataRow avgRow1 = sampleDataTable.NewRow(); DataRow avgRow1 = sampleDataTable.NewRow();
avgRow1["序号"] = "平均时间(s)试样1-5"; avgRow1["序号"] = "平均时间(s)试样1-5";
// 只在试样1列显示平均值
avgRow1["试样1"] = avg1; avgRow1["试样1"] = avg1;
// 其他列设置为空 // 其他列设置为DBNull（不显示）
for (int i = 2; i <= currentSampleCount; i++) for (int i = 2; i <= currentSampleCount; i++)
{ {
avgRow1[$"试样{i}"] = DBNull.Value; avgRow1[$"试样{i}"] = DBNull.Value;
@@ -491,20 +493,20 @@ namespace WindowsFormsApp6
double avg2 = count2 > 0 ? sum2 / count2 : 0; double avg2 = count2 > 0 ? sum2 / count2 : 0;
// 添加试样6-10平均值行 // 添加试样6-10平均值行 - 只在第6列显示平均值
DataRow avgRow2 = sampleDataTable.NewRow(); DataRow avgRow2 = sampleDataTable.NewRow();
avgRow2["序号"] = "平均时间(s)试样6-10"; avgRow2["序号"] = "平均时间(s)试样6-10";
// 前5列为空 // 前5列为DBNull（不显示）
for (int i = 1; i <= 5; i++) for (int i = 1; i <= 5; i++)
{ {
avgRow2[$"试样{i}"] = DBNull.Value; avgRow2[$"试样{i}"] = DBNull.Value;
} }
// 第6列显示平均值 // 只在试样6列显示平均值
avgRow2["试样6"] = avg2; avgRow2["试样6"] = avg2;
// 其他列为空 // 其他列为DBNull（不显示）
for (int i = 7; i <= currentSampleCount; i++) for (int i = 7; i <= currentSampleCount; i++)
{ {
avgRow2[$"试样{i}"] = DBNull.Value; avgRow2[$"试样{i}"] = DBNull.Value;

31
WindowsFormsApp6/Form2.cs
View File

@@ -465,8 +465,15 @@ namespace WindowsFormsApp6
avgRow1["试样1"] = avgAbsorption1; avgRow1["试样1"] = avgAbsorption1;
} }
// 其他列为空 // 试样2-5列为空（只设置到第5列或count，取较小值）
for (int i = 2; i <= count; i++) int maxCol1 = Math.Min(5, count);
for (int i = 2; i <= maxCol1; i++)
{
avgRow1[$"试样{i}"] = DBNull.Value;
}
// 如果有试样6-10，这些列也设置为空
for (int i = 6; i <= count; i++)
{ {
avgRow1[$"试样{i}"] = DBNull.Value; avgRow1[$"试样{i}"] = DBNull.Value;
} }
@@ -509,8 +516,14 @@ namespace WindowsFormsApp6
maxRow1["试样1"] = maxAbsorption1; maxRow1["试样1"] = maxAbsorption1;
} }
// 其他列为空 // 试样2-5列为空
for (int i = 2; i <= count; i++) for (int i = 2; i <= maxCol1; i++)
{
maxRow1[$"试样{i}"] = DBNull.Value;
}
// 如果有试样6-10，这些列也设置为空
for (int i = 6; i <= count; i++)
{ {
maxRow1[$"试样{i}"] = DBNull.Value; maxRow1[$"试样{i}"] = DBNull.Value;
} }
@@ -553,8 +566,14 @@ namespace WindowsFormsApp6
stdDevRow1["试样1"] = stdDev1; stdDevRow1["试样1"] = stdDev1;
} }
// 其他列为空 // 试样2-5列为空
for (int i = 2; i <= count; i++) for (int i = 2; i <= maxCol1; i++)
{
stdDevRow1[$"试样{i}"] = DBNull.Value;
}
// 如果有试样6-10，这些列也设置为空
for (int i = 6; i <= count; i++)
{ {
stdDevRow1[$"试样{i}"] = DBNull.Value; stdDevRow1[$"试样{i}"] = DBNull.Value;
} }