From 292289a9fbfc2693640195d4f199fd076c8bb29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=B5=B7?= <xuhai_cpp@live.cn>
Date: Tue, 21 Apr 2026 10:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=9B=E6=99=AE=E6=A3=AE?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=AE=97=E6=B3=95=E5=AE=9E=E7=8E=B0=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdaptiveSimpsonIntegrate.h                |  9 +++---
 .../DeviceParamsTableForm.ui                  | 32 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h b/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h
index 8eafc54..881848e 100644
--- a/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h
+++ b/src/DataCalcProcess/AdaptiveSimpsonIntegrate.h
@@ -1,13 +1,14 @@
-#ifndef ADAPTIVESIMPSONINTEGRATE_H
+#ifndef ADAPTIVESIMPSONINTEGRATE_H
 #define ADAPTIVESIMPSONINTEGRATE_H
 
-namespace AdaptiveSimpsonIntegrate {
-
 #include <armadillo>
 #include <cmath>
 #include <iostream>
 #include <iomanip> // 用于格式化输出
 
+
+namespace AdaptiveSimpsonIntegrate {
+
 // 定义被积函数：y = A*exp(-(x-P)²/(2*delt²)) + H/(1+exp((x-P)/W)) + C
 struct FitFunction {
     // 拟合公式的参数
@@ -55,7 +56,7 @@ double adaptive_simpson(double a, double b, double eps, const Func& f,
     double right = simpson(c, b, f);
 
     // 精度判断：满足则返回，不满足则递归细分
-    if (::std::abs(left + right - whole) <= 15 * eps) {
+    if (std::abs(left + right - whole) <= 15 * eps) {
         return left + right + (left + right - whole) / 15.0;
     }
 
diff --git a/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui b/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui
index 34d8935..0980e99 100644
--- a/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui
+++ b/src/MeasureDeviceParamsConfigView/DeviceParamsTableForm.ui
@@ -88,6 +88,11 @@
        <string>道址数</string>
       </property>
      </column>
+     <column>
+      <property name="text">
+       <string>数据模式</string>
+      </property>
+     </column>
      <column>
       <property name="text">
        <string>硬件增益</string>
@@ -120,7 +125,32 @@
      </column>
      <column>
       <property name="text">
-       <string>最大能量范围</string>
+       <string>成形时间</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>快通道触发阈值</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>CR微分模式</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>新建列</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>新建列</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>输入信号正负极性选择</string>
       </property>
      </column>
     </widget>