From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 08 十一月 2025 17:55:47 +0800
Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃，而各设备的 initSlots() 都是从 1 开始编号（例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等）。槽位 0 永远不存在，所以 pGlass 始终是 nullptr，pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据，GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas，导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug：虽然判断了 channel - 1 < bonderTypes.size()，但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位，最后一个通道甚至可能越界。即使修正了槽位，这里也需要同步改成 bonderTypes[channel - 1]（另外两处 vacuumbakeTypes、coolingTypes 也一样）。
---
SourceCode/Bond/Servo/Servo.vcxproj | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index a80c7ab..2e09825 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -200,6 +200,19 @@
<Text Include="ReadMe.txt" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\DAQBridge\buffer\BufferManager.h" />
+ <ClInclude Include="..\DAQBridge\buffer\BufferRegistry.h" />
+ <ClInclude Include="..\DAQBridge\buffer\SampleBuffer.h" />
+ <ClInclude Include="..\DAQBridge\core\Collector.h" />
+ <ClInclude Include="..\DAQBridge\core\CommBase.h" />
+ <ClInclude Include="..\DAQBridge\core\ConnEvents.h" />
+ <ClInclude Include="..\DAQBridge\core\DataTypes.h" />
+ <ClInclude Include="..\DAQBridge\core\Display.h" />
+ <ClInclude Include="..\DAQBridge\DAQConfig.h" />
+ <ClInclude Include="..\DAQBridge\net\FrameAssembler.h" />
+ <ClInclude Include="..\DAQBridge\net\SocketComm.h" />
+ <ClInclude Include="..\DAQBridge\proto\Protocol.h" />
+ <ClInclude Include="..\DAQBridge\proto\ProtocolCodec.h" />
<ClInclude Include="..\jsoncpp\include\json\autolink.h" />
<ClInclude Include="..\jsoncpp\include\json\config.h" />
<ClInclude Include="..\jsoncpp\include\json\features.h" />
@@ -210,6 +223,7 @@
<ClInclude Include="..\jsoncpp\include\json\writer.h" />
<ClInclude Include="..\jsoncpp\lib_json\json_batchallocator.h" />
<ClInclude Include="CBaseDlg.h" />
+ <ClInclude Include="CCarrierSlotGrid.h" />
<ClInclude Include="CCarrierSlotSelector.h" />
<ClInclude Include="CCjPage2.h" />
<ClInclude Include="CCjPage3.h" />
@@ -223,6 +237,7 @@
<ClInclude Include="CExpandableListCtrl.h" />
<ClInclude Include="CGlassPool.h" />
<ClInclude Include="ChangePasswordDlg.h" />
+ <ClInclude Include="ClientListDlg.h" />
<ClInclude Include="CMyStatusbar.h" />
<ClInclude Include="CPageCollectionEvent.h" />
<ClInclude Include="CPageGlassList.h" />
@@ -380,6 +395,34 @@
<ClInclude Include="VerticalLine.h" />
</ItemGroup>
<ItemGroup>
+ <ClCompile Include="..\DAQBridge\buffer\BufferManager.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\buffer\BufferRegistry.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\buffer\SampleBuffer.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\core\Collector.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\core\Display.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\net\SocketComm.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="..\DAQBridge\proto\ProtocolCodec.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+ </ClCompile>
<ClCompile Include="..\jsoncpp\lib_json\json_reader.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
@@ -393,6 +436,7 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="CBaseDlg.cpp" />
+ <ClCompile Include="CCarrierSlotGrid.cpp" />
<ClCompile Include="CCarrierSlotSelector.cpp" />
<ClCompile Include="CCjPage2.cpp" />
<ClCompile Include="CCjPage3.cpp" />
@@ -406,6 +450,7 @@
<ClCompile Include="CExpandableListCtrl.cpp" />
<ClCompile Include="CGlassPool.cpp" />
<ClCompile Include="ChangePasswordDlg.cpp" />
+ <ClCompile Include="ClientListDlg.cpp" />
<ClCompile Include="CMyStatusbar.cpp" />
<ClCompile Include="CPageCollectionEvent.cpp" />
<ClCompile Include="CPageGlassList.cpp" />
--
Gitblit v1.9.3