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/EAPSimulator/Resource.h | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) diff --git a/SourceCode/Bond/EAPSimulator/Resource.h b/SourceCode/Bond/EAPSimulator/Resource.h index f8b9864..96c191e 100644 --- a/SourceCode/Bond/EAPSimulator/Resource.h +++ b/SourceCode/Bond/EAPSimulator/Resource.h @@ -13,6 +13,7 @@ #define IDD_DIALOG_ADD_IDS 135 #define IDD_DIALOG_LINK_REPORT 137 #define IDD_DIALOG_LINK_REPORT_DETAIL 139 +#define IDD_DIALOG_PJS 141 #define IDC_EDIT_LOG 1000 #define IDC_EDIT_IP 1001 #define IDC_EDIT_PORT 1002 @@ -22,39 +23,48 @@ #define IDC_BUTTON_DATETIME_SYNC 1006 #define IDC_BUTTON_TERMINAL_DISPLAY 1007 #define IDC_COMBO_TID 1008 -#define IDC_BUTTON_ED_EVENT_REPORT 1008 #define IDC_EDIT_TEXT 1009 -#define IDC_BUTTON_ED_ALARM_REPORT 1009 #define IDC_BUTTON_SEND 1010 -#define IDC_BUTTON_DEFINE_REPORT 1010 #define IDC_BUTTON_LINE_REPORT 1011 #define IDC_RADIO_ENABLE 1012 -#define IDC_BUTTON_LINE_REPORT2 1012 -#define IDC_BUTTON_CONFIGURE_SPOOLING 1012 #define IDC_RADIO_DISABLE 1013 -#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1013 #define IDC_EDIT_CEID 1014 -#define IDC_BUTTON_PURGE_SPOOLED_DATA 1014 #define IDC_LIST1 1015 -#define IDC_EDIT_CE_NAME 1015 #define IDC_LIST2 1016 -#define IDC_EDIT_CE_DESCRIPTIONS 1016 #define IDC_BUTTON_ADD_RPTID 1017 -#define IDC_EDIT_CE_RPTID 1017 #define IDC_BUTTON_DEL_REPORT 1018 #define IDC_BUTTON_ADD_VID 1019 #define IDC_BUTTON_DEL_VID 1020 #define IDC_GROUP_IDS 1021 #define IDC_EDIT_ID 1022 -#define IDC_BUTTON1 1023 +#define IDC_EDIT_CE_DESCRIPTIONS 1023 +#define IDC_BUTTON_ED_EVENT_REPORT 1025 +#define IDC_BUTTON_ED_ALARM_REPORT 1026 +#define IDC_BUTTON_DEFINE_REPORT 1027 +#define IDC_BUTTON_LINE_REPORT2 1028 +#define IDC_BUTTON_CONFIGURE_SPOOLING 1029 +#define IDC_BUTTON_PURGE_SPOOLED_DATA 1030 +#define IDC_EDIT_CE_NAME 1031 +#define IDC_BUTTON_QUERY_PPID_LIST 1032 +#define IDC_EDIT_CE_RPTID 1033 +#define IDC_BUTTON_PROCEED_WITH_CARRIER 1034 +#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1035 +#define IDC_BUTTON_CARRIER_RELEASE 1036 +#define IDC_BUTTON_QUERY_CJ_SPACE 1037 +#define IDC_BUTTON_QUERY_PJ_SPACE 1038 +#define IDC_BUTTON_CREATE_PJ 1039 +#define IDC_BUTTON_ADD 1040 +#define IDC_BUTTON_CREATE_PJ2 1040 +#define IDC_BUTTON_CREATE_CJ 1040 +#define IDC_BUTTON_DELETE 1041 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 141 +#define _APS_NEXT_RESOURCE_VALUE 143 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1025 +#define _APS_NEXT_CONTROL_VALUE 1042 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- Gitblit v1.9.3