Builder Source Build #2092

Results:

Build successful

SourceStamp:

Project	DAQ
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
Revision	16883
Changes	see below

BuildSlave:

buildbot-16

Reason:

Triggerable(SourceTriggerableScheduler)

Steps and Logfiles:

CheckoutSource update [branch] ( 5 secs )
1. stdio

Build Properties:

Name	Value	Source
branch	None	Build
buildername	Source	Builder
buildnumber	2092	Build
project	DAQ	Build
repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk	Build
revision	16883	Build
scheduler	SourceTriggerableScheduler	Scheduler
slavename	buildbot-16	BuildSlave

Blamelist:

chenjing

Timing:

Start	Tue Dec 23 08:56:23 2025
End	Tue Dec 23 08:56:28 2025
Elapsed	5 secs

Resubmit Build:

All Changes:

Change #1589

Changed by	chenjing
Changed at	Tue 23 Dec 2025 08:55:02
Repository	http://192.168.123.218:8888/svn/BH5000/DAQ/trunk
Project	DAQ
Revision	16883

Comments

[MERGE] 合并优化分支：
1. 优化配置文件读取方式
2. 键相界面添加迟滞门限配置
3. 非小在线采集模式不可配置小在线
4. 数据采集参数界面标题修改为仿真参数，且仅在模式为回放/仿真时可用
5. 仅快变相关模式时才能配置快变页面参数

Changed files

bin/Release/Locales/CHS.json
src/BHCommon/BHCommon.vcproj
src/BHCommon/ConfigFile.cpp
src/BHCommon/ConfigFile.h
src/BHCommon/Externs.h
src/BHCommon/Glbs.h
src/BHCommon/KddaqManager.cpp
src/BHCommon/KddaqManager.h
src/ConfigAssistant/ConfigAssistant.cpp
src/ConfigAssistant/ConfigAssistant.h
src/ConfigAssistant/ConfigAssistant.rc
src/ConfigAssistant/ConfigAssistant.vcproj
src/ConfigAssistant/CtrDlg.cpp
src/ConfigAssistant/CtrDlg.h
src/ConfigAssistant/Externs.h
src/ConfigAssistant/Glbs.h
src/ConfigAssistant/MyPropSheet.cpp
src/ConfigAssistant/MyPropSheet.h
src/ConfigAssistant/PlantInfoDlg.cpp
src/ConfigAssistant/PlantInfoDlg.h
src/ConfigAssistant/resource.h
src/KDDAQ/ConfigFile.cpp
src/KDDAQ/ConfigFile.h
src/KDDAQ/KDDAQ.cpp
src/KDDAQ/KDDAQ.vcproj
src/KDDAQ/stdafx.cpp