功能优化

exe/logs/202111.log

@@ -3701,3 +3701,56 @@
 2021-11-23 20:55:04.8467 Info:                [source]:runtime,[msg]:插件"资源管理器"停止成功 
 2021-11-23 20:55:04.8467 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"停止成功 
 2021-11-23 20:55:04.8467 Info:                [source]:runtime,[msg]:Runtime 关闭 
+2021-11-24 16:31:33.9217 Info:                [source]:runtime,[msg]:Runtime 启动 
+2021-11-24 16:31:33.9496 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\DataApp\bundle.config" 
+2021-11-24 16:31:34.0074 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\DevicesApp\bundle.config" 
+2021-11-24 16:31:34.0074 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\bundle.config" 
+2021-11-24 16:31:34.0323 Info:                [source]:runtime,[msg]:AppHost 开始启动插件 
+2021-11-24 16:31:34.0323 Info:                [source]:runtime,[msg]:插件"数据管理"启动成功 
+2021-11-24 16:31:34.0323 Info:                [source]:runtime,[msg]:插件"资源管理器"启动成功 
+2021-11-24 16:31:34.0323 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"启动成功 
+2021-11-24 16:31:34.0323 Info:                [source]:runtime,[msg]:Runtime 启动完成 
+2021-11-24 16:31:36.6037 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::34::INSTR。 
+2021-11-24 16:31:36.6217 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：USB0::0x0957::0x0D0B::US49230327::INSTR。 
+2021-11-24 16:31:36.6346 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::13::INSTR。 
+2021-11-24 16:31:36.6346 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::18::INSTR。 
+2021-11-24 16:33:06.6167 Info:                [source]:runtime,[msg]:AppHost 停止插件 
+2021-11-24 16:33:06.6167 Info:                [source]:runtime,[msg]:插件"数据管理"停止成功 
+2021-11-24 16:33:06.6167 Info:                [source]:runtime,[msg]:插件"资源管理器"停止成功 
+2021-11-24 16:33:06.6167 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"停止成功 
+2021-11-24 16:33:06.6167 Info:                [source]:runtime,[msg]:Runtime 关闭 
+2021-11-24 16:35:32.7511 Info:                [source]:runtime,[msg]:Runtime 启动 
+2021-11-24 16:35:32.7730 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\DataApp\bundle.config" 
+2021-11-24 16:35:32.8129 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\DevicesApp\bundle.config" 
+2021-11-24 16:35:32.8218 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\bundle.config" 
+2021-11-24 16:35:32.8218 Info:                [source]:runtime,[msg]:AppHost 开始启动插件 
+2021-11-24 16:35:32.8218 Info:                [source]:runtime,[msg]:插件"数据管理"启动成功 
+2021-11-24 16:35:32.8218 Info:                [source]:runtime,[msg]:插件"资源管理器"启动成功 
+2021-11-24 16:35:32.8348 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"启动成功 
+2021-11-24 16:35:32.8348 Info:                [source]:runtime,[msg]:Runtime 启动完成 
+2021-11-24 16:35:34.6095 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::34::INSTR。 
+2021-11-24 16:35:34.6305 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：USB0::0x0957::0x0D0B::US49230327::INSTR。 
+2021-11-24 16:35:34.6445 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::13::INSTR。 
+2021-11-24 16:35:34.6534 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::18::INSTR。 
+2021-11-24 16:36:20.7263 Info:                [source]:runtime,[msg]:AppHost 停止插件 
+2021-11-24 16:36:20.7263 Info:                [source]:runtime,[msg]:插件"数据管理"停止成功 
+2021-11-24 16:36:20.7263 Info:                [source]:runtime,[msg]:插件"资源管理器"停止成功 
+2021-11-24 16:36:20.7263 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"停止成功 
+2021-11-24 16:36:20.7263 Info:                [source]:runtime,[msg]:Runtime 关闭 
+2021-11-24 16:41:27.5464 Info:                [source]:runtime,[msg]:Runtime 启动 
+2021-11-24 16:41:27.5694 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\DataApp\bundle.config" 
+2021-11-24 16:41:27.6042 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\DevicesApp\bundle.config" 
+2021-11-24 16:41:27.6042 Info:                [source]:runtime,[msg]:加载插件"D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\bundle.config" 
+2021-11-24 16:41:27.6252 Info:                [source]:runtime,[msg]:AppHost 开始启动插件 
+2021-11-24 16:41:27.6252 Info:                [source]:runtime,[msg]:插件"数据管理"启动成功 
+2021-11-24 16:41:27.6252 Info:                [source]:runtime,[msg]:插件"资源管理器"启动成功 
+2021-11-24 16:41:27.6252 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"启动成功 
+2021-11-24 16:41:27.6252 Info:                [source]:runtime,[msg]:Runtime 启动完成 
+2021-11-24 16:41:29.5373 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::34::INSTR。 
+2021-11-24 16:41:29.5552 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：USB0::0x0957::0x0D0B::US49230327::INSTR。 
+2021-11-24 16:41:29.5692 Info:                [source]:资源管理器 LoadDevice,[msg]:初始化设备成功：GPIB0::13::INSTR。 
+2021-11-24 16:58:50.8497 Info:                [source]:runtime,[msg]:AppHost 停止插件 
+2021-11-24 16:58:50.8506 Info:                [source]:runtime,[msg]:插件"数据管理"停止成功 
+2021-11-24 16:58:50.8506 Info:                [source]:runtime,[msg]:插件"资源管理器"停止成功 
+2021-11-24 16:58:50.8506 Info:                [source]:runtime,[msg]:插件"6YX03B-9B"停止成功 
+2021-11-24 16:58:50.8506 Info:                [source]:runtime,[msg]:Runtime 关闭 

tps/TpsLabStudio/TpsLabStudio.csproj

@@ -165,6 +165,9 @@
     <None Include="config\测试#常温测试#9B发射机-N9030A.xlsx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="config\测试#常温测试#YZH16A发射机-N9030A.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="config\测试#常温测试#发射机_FSU-26.xlsx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

tps/TpsLabStudio/TpsLabStudio.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>

tps/TpsLabStudio/models/HarmonicSuppression.cs

@@ -152,13 +152,13 @@ namespace Tps_LQ_Transmitter.models
                         if (parameters.Channel == "通道1")
                         {
 
-                            WriteExcelData(sheet, parameters.PointIndex, 1+2*(harmonic_num+1), HarmonicSuppressionPrint.Test_name, HarmonicSuppressionPrint.Lower.ToString(), HarmonicSuppressionPrint.Upper.ToString(), HarmonicSuppressionPrint.TestVal.ToString(), HarmonicSuppressionPrint.Result);
+                            WriteExcelData(sheet, parameters.PointIndex, 1+2*(harmonic_num+1), HarmonicSuppressionPrint.Test_name, HarmonicSuppressionPrint.Lower.ToString(), HarmonicSuppressionPrint.Upper.ToString(), HarmonicTimeVal[harmonic_num].ToString(), HarmonicSuppressionPrint.Result);
                             // tps.SetTestTableCellValue(point, 15, HarmonicSuppressionPrint.Result, HarmonicSuppressionPrint.TestVal);
                         }
                         else if (parameters.Channel == "通道2")
                         {
 
-                            WriteExcelData(sheet, parameters.PointIndex, 2 + 2 * (harmonic_num + 1), HarmonicSuppressionPrint.Test_name, HarmonicSuppressionPrint.Lower.ToString(), HarmonicSuppressionPrint.Upper.ToString(), HarmonicSuppressionPrint.TestVal.ToString(), HarmonicSuppressionPrint.Result);
+                            WriteExcelData(sheet, parameters.PointIndex, 2 + 2 * (harmonic_num + 1), HarmonicSuppressionPrint.Test_name, HarmonicSuppressionPrint.Lower.ToString(), HarmonicSuppressionPrint.Upper.ToString(), HarmonicTimeVal[harmonic_num].ToString(), HarmonicSuppressionPrint.Result);
                             // tps.SetTestTableCellValue(point + 15, 15, HarmonicSuppressionPrint.Result, HarmonicSuppressionPrint.TestVal);
                         }
                     }

tps/TpsLabStudio/obj/Debug/TpsLabStudio.csproj.FileListAbsolute.txt

@@ -115,3 +115,5 @@ D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\T
 D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStudio.csproj.CoreCompileInputs.cache
 D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.dll
 D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\Tps_LQ_Transmitter.pdb
+D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\exe\apps\Tps_LQ_Transmitter\config\测试#常温测试#YZH16A发射机-N9030A.xlsx
+D:\000Code\0.TpsLabStudio_LTS_1112\TpsLabStudio_LTS\tps\TpsLabStudio\obj\Debug\TpsLabStudio.csproj.AssemblyReference.cache