Commit Graph

95 Commits

Author SHA1 Message Date
anxinglong
7b6b967397 新增核素数据库,修改乱码问题,删除符合能谱再次符合逻辑 2026-04-13 18:17:01 +08:00
anxinglong
65e7a5787c 新增符合能谱视图,新增2维视图显示左侧悬浮窗口 2026-04-09 17:55:20 +08:00
b209ba9737 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-04-08 15:39:06 +08:00
3c72ba9654 添加测量工作类 2026-04-08 15:38:41 +08:00
anxinglong
4a2aa2e0be 修复三维视图内存泄漏问题 2026-04-08 11:20:08 +08:00
d5caa22930 优化获取测量数据文件接口 2026-04-08 10:09:57 +08:00
24bf6cb113 调试测量客户端类修改 2026-04-07 19:15:58 +08:00
anxinglong
905614ff6f 迁移二维符合谱 2026-04-07 18:15:20 +08:00
829e322b7c 添加测量客户端实现类 2026-04-06 23:46:03 +08:00
47251ebc70 完善测量参数配置视图 2026-04-02 13:33:49 +08:00
ab742c6290 优化测量分析测量设备参数配置 2026-04-01 11:57:38 +08:00
adc67aac77 修改样式 2026-03-31 09:49:58 +08:00
f5c61d6940 优化测量分析历史处理维护 2026-03-31 09:18:46 +08:00
anxinglong
7016f584b9 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl
Conflicts:
	src/CountRateAnalysisView/CountRateAnalysisView.cpp
	src/ParticleInjectTimeView/ParticleInjectTimeAnalysisView.cpp
2026-03-30 18:30:11 +08:00
anxinglong
cee020032e 修改规范 2026-03-30 18:06:52 +08:00
4ba9703c4d 优化粒子入射时间数据加载及交互 2026-03-30 13:37:14 +08:00
829b22d74e 1、优化粒子时间差数据加载,添加交互动画; 2、优化图表轴拖动缩放 2026-03-30 11:55:15 +08:00
5e4d8f943f Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-27 20:32:51 +08:00
fb0f34b541 更改粒子时间差视图代码命名 2026-03-27 20:32:43 +08:00
f8f553ccd5 更改粒子时间差视图代码命名 2026-03-27 19:44:54 +08:00
anxinglong
3f9fe830ec Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl 2026-03-27 12:55:53 +08:00
anxinglong
20d4afc585 新增设备参数配置 2026-03-27 12:55:42 +08:00
8ba3063a84 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-27 12:01:24 +08:00
13471d93ab 完善测量分析历史管理实现 2026-03-27 12:01:18 +08:00
anxinglong
93225c466e 修改三维视图显示 2026-03-27 10:24:41 +08:00
aaf6883f4d 完善测量分析记录实现 2026-03-26 21:27:38 +08:00
c039e9bf61 修改符合数据事件ID问题 2026-03-26 20:07:26 +08:00
5d8caba6f0 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh
# Conflicts:
#	src/src.pro
2026-03-26 19:37:24 +08:00
0c89bec29d 添加峰拟合视图初步实现;优化其他一直BUG; 2026-03-26 19:33:24 +08:00
a3bfaa3333 添加峰拟合视图初步实现;优化其他一直BUG; 2026-03-26 19:07:49 +08:00
anxinglong
7219460e45 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev 2026-03-26 17:36:43 +08:00
anxinglong
5d808b6264 三维视图显示 2026-03-26 17:35:58 +08:00
55316155a2 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-26 17:02:59 +08:00
d95c1d9caa 优化plot 轴标签字体 2026-03-26 17:02:39 +08:00
anxinglong
32ae5177b4 Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl
Conflicts:
	src/src.pro
2026-03-26 16:34:47 +08:00
anxinglong
9734bbb665 修改pro文件 2026-03-26 16:31:54 +08:00
20f3375742 修改dock的显示属性 2026-03-26 15:41:38 +08:00
3a09022a29 符合数据处理 2026-03-26 14:48:12 +08:00
1c80d3fcfe 合并修改 2026-03-26 10:10:59 +08:00
740b3bf53c Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-26 10:08:21 +08:00
anxinglong
c0c1ee39e3 修改粒子时间差 2026-03-26 10:03:45 +08:00
e04e2bf28b Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-26 10:03:39 +08:00
03d321f2f0 优化程序 2026-03-26 10:03:30 +08:00
anxinglong
e69629e203 新增计数率分析 2026-03-26 09:41:59 +08:00
ec38d506fd Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-25 14:01:54 +08:00
c424f718bf Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh
补充提交
2026-03-25 14:01:42 +08:00
03225795ad Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_xuh 2026-03-25 13:59:53 +08:00
bbde72e1de 修改已知BUG 2026-03-25 13:59:36 +08:00
anxinglong
1cb0145073 修改命名 2026-03-25 12:05:36 +08:00
anxinglong
f0e254300a Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl
Conflicts:
	src/MeasureAnalysisView.cpp
	src/src.pro
2026-03-25 11:51:13 +08:00