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;