This commit is contained in:
xyy
2026-01-22 16:06:24 +08:00
parent b0d77b4292
commit e88d0aed75
6 changed files with 864 additions and 501 deletions

View File

@@ -906,8 +906,8 @@ namespace 口罩泄露定制款
experData.O2NongDu = dc.UshortToFloat(data_D300_D320[7], data_D300_D320[6]);
experData.HuanJingWenDu = dc.UshortToFloat(data_D300_D320[9], data_D300_D320[8]);
experData.HuanJingShiDu = dc.UshortToFloat(data_D300_D320[11], data_D300_D320[10]);
experData.InDoor_TSINongDu = Tsi.Indoor_Data.ToFloat();
experData.Mask_TSINongDu = Tsi.Outdoor_Data.ToFloat();
experData.InDoor_TSINongDu = Tsi.Indoor_Data;//modified by xyy
experData.Mask_TSINongDu = Tsi.Outdoor_Data;//modified by xyy
//experData.BenDiNongDu = Tsi.sp_bendiData.ToFloat();
@@ -942,46 +942,6 @@ namespace 口罩泄露定制款
_Motor.ShowDialog();
}
/// <summary>
/// 原先的方法
/// </summary>
//private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
//{
// switch (comboBox1.SelectedIndex)
// {
// case 0:
// lb_status.Text = "头部静止,不说话";
// //experData.TestStatus = "头部静止,不说话";
// // form2.uiLabel1.Text = "头部静止,不说话";
// _logger.Log(loginData.UserName, "切换了实验状态为【头部静止,不说话】", loginData.UserPower.ToString());
// break;
// case 1:
// lb_status.Text = "左右转动头部看检测仓左右墙壁大约15次";
// // experData.TestStatus = "左右转动头部看检测仓左右墙壁大约15次";
// //form2.uiLabel1.Text = "左右转动头部看检测仓左右墙壁大约15次";
// _logger.Log(loginData.UserName, "切换了实验状态为【左右转动头部看检测仓左右墙壁大约15次】", loginData.UserPower.ToString());
// break;
// case 2:
// lb_status.Text = "抬头和低头看检测仓和地面大约15次";
// // experData.TestStatus = "抬头和低头看检测仓和地面大约15次";
// // form2.uiLabel1.Text = "抬头和低头看检测仓和地面大约15次";
// _logger.Log(loginData.UserName, "切换了实验状态为【抬头和低头看检测仓和地面大约15次】", loginData.UserPower.ToString());
// break;
// case 3:
// lb_status.Text = "大声阅读一段文字或大声说话";
// // experData.TestStatus = "大声阅读一段文字或大声说话";
// // form2.uiLabel1.Text = "大声阅读一段文字或大声说话";
// _logger.Log(loginData.UserName, "切换了实验状态为【大声阅读一段文字或大声说话】", loginData.UserPower.ToString());
// break;
// case 4:
// lb_status.Text = "头部静止,不说话";
// // experData.TestStatus = "头部静止,不说话";
// // form2.uiLabel1.Text = "头部静止,不说话";
// _logger.Log(loginData.UserName, "切换了实验状态为【头部静止,不说话】", loginData.UserPower.ToString());
// break;
// }
//}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -2209,7 +2169,7 @@ namespace 口罩泄露定制款
list_Tsi_Outdoor_Data.Clear();
//experData.XieLouLv = experData.CumulativeLeakageRate(list_Tsi_Indoor_Data, list_Tsi_Outdoor_Data, experData.BenDiNongDu, 1.0f);
lsit_XieLoulv.Clear();
list_CO2_Indoor_Data.Clear();
list_CO2_Indoor_Data.Clear();
list_CO2_Outdoor_Data.Clear();
list_O2_Data.Clear();
list_HuanJingWenDu_Data.Clear();