From cfe6778c8286f977d72d702cecf68f760be45964 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Tue, 8 Oct 2024 14:29:33 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=E5=88=86=E6=9E=90=E6=96=B0beta?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=BB=E5=BA=A6=E6=95=B0=E6=8D=AE=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E3=80=82=E4=BF=AE=E6=94=B9=E4=BB=8E=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=8A=A0=E8=BD=BD=E8=AF=BB=E5=8F=96=E5=88=BB=E5=BA=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/jeecg/common/util/SelfStationUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java index fede0794..70570cd0 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java @@ -469,7 +469,8 @@ public class SelfStationUtil extends SelfBaseUtil { vChan.add(1.0); vChan.add(Double.valueOf(selfStationData.getSampleStruct().g_channels)); - List vEner = CalValuesHandler.calFcnEval(vChan, selfStationData.getSampleVueData().getUsedEnerPara().getP()).counts; + PHDFile phd = selfStationData.getSampleVueData().getROIOnePHDFile(); + List vEner = CalValuesHandler.calFcnEval(vChan, phd.getUsedEnerPara().getP()).counts; double d = vEner.get(0), maxE = vEner.get(1); double dStep = maxE / width * 2; @@ -602,7 +603,8 @@ public class SelfStationUtil extends SelfBaseUtil { vChan.add(1.0); vChan.add(Double.valueOf(selfStationData.getSampleStruct().g_channels)); - List vEner = CalValuesHandler.calFcnEval(vChan, selfStationData.getSampleVueData().getUsedEnerPara().getP()).counts; + PHDFile phd = selfStationData.getSampleVueData().getROIOnePHDFile(); + List vEner = CalValuesHandler.calFcnEval(vChan, phd.getUsedEnerPara().getP()).counts; double d = vEner.get(0); double maxE = vEner.get(1); double dStep = maxE / width * 2;