From fea5ebcc1d5d22f54827df6431670bb543ec4eed Mon Sep 17 00:00:00 2001
From: wanglong <1553009806@qq.com>
Date: Mon, 17 Feb 2025 09:57:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReadPHDFile.pro.user                                   | 2 +-
 org_jeecg_modules_native_jni_EnergySpectrumHandler.cpp | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ReadPHDFile.pro.user b/ReadPHDFile.pro.user
index 41e6180..4b9c178 100644
--- a/ReadPHDFile.pro.user
+++ b/ReadPHDFile.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.9.1, 2024-12-12T16:21:19. -->
+<!-- Written by QtCreator 4.9.1, 2025-02-17T09:56:40. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/org_jeecg_modules_native_jni_EnergySpectrumHandler.cpp b/org_jeecg_modules_native_jni_EnergySpectrumHandler.cpp
index 590119d..26a905f 100644
--- a/org_jeecg_modules_native_jni_EnergySpectrumHandler.cpp
+++ b/org_jeecg_modules_native_jni_EnergySpectrumHandler.cpp
@@ -5183,7 +5183,6 @@ jstring Java_org_jeecg_modules_native_1jni_EnergySpectrumHandler_selfBgAnalyse(J
      /***************解析json参数*******************/
     QString jsonStr = CplusToJava::jstring2QString(env, json);
     QJsonDocument doc;
-    printf("param:%s\n", jsonStr.toStdString().c_str());
     doc = QJsonDocument::fromJson(jsonStr.toUtf8());
     QJsonObject inObj = doc.object();
      /***************开始计算*******************/
@@ -5205,7 +5204,6 @@ jstring Java_org_jeecg_modules_native_1jni_EnergySpectrumHandler_selfBgAnalyse(J
         double sendOdds = factorObj["yield"].toString().toDouble() / 100.0;
         double area = factorObj["area"].toString().toDouble();
         double lcConst = factorObj["lcConst"].toString().toDouble();
-        printf("lcConst:%f\n", lcConst);
 
         double bgeff, geff;
         double f;
@@ -5245,7 +5243,6 @@ jstring Java_org_jeecg_modules_native_1jni_EnergySpectrumHandler_selfBgAnalyse(J
         double ac = (1000 * a / (vxe / 0.087)) * ac_e * ac_kc;
 
         double cBaseLine = factorObj["baseline"].toString().toDouble();
-        printf("cBaseLine:%f\n", cBaseLine);
         double ld = 2.71 + 4.65 * sqrt(cBaseLine);
         double mda = (ld / a_low) * kc;
         double mdc = (1000 * mda / (vxe / 0.087)) * ac_e * ac_kc;
@@ -5262,8 +5259,9 @@ jstring Java_org_jeecg_modules_native_1jni_EnergySpectrumHandler_selfBgAnalyse(J
         obj["concLa"] = conc_la;
         obj["concLc"] = conc_lc;
         obj["concErr"] = a * 0.15;
-        obj["baseLineErr"] = sqrt(cBaseLine);
+        obj["netErr"] = sqrt(cBaseLine);
         obj["lc"] = lc;
+        obj["net"] = cBaseLine;
         data.push_back(obj);
     }