From bc1d9fb90a69fcbf85fe22b10208157c3f0933a3 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 16 Oct 2023 17:18:32 +0800 Subject: [PATCH] =?UTF-8?q?GammaFileUtil=E9=81=97=E6=BC=8FwriteFile?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E7=94=A8=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 215 ++++++++++-------- 1 file changed, 121 insertions(+), 94 deletions(-) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 611942c5..eca66462 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -601,8 +601,6 @@ public class GammaFileUtil extends AbstractLogOrReport { } public void RunQC(PHDFile phd) { - //调用dll库 - //System.loadLibrary("GammaAnaly"); try { //获取phdFile的 采集开始时间 Date start = DateUtils.parseDate(phd.getCollect().getCollection_start_date() + StringPool.SPACE + phd.getCollect().getCollection_start_time()); @@ -747,7 +745,6 @@ public class GammaFileUtil extends AbstractLogOrReport { } public Double CalculateMDC(PHDFile phd, List vMdcInfo, Double CCF) { - //System.loadLibrary("GammaAnaly"); try { //判断用于计算的数据大小是否小于3 判断集合中最后一个数值是否等于0 if(vMdcInfo.size() < 3 || vMdcInfo.get(2) == 0) { @@ -2518,14 +2515,14 @@ public class GammaFileUtil extends AbstractLogOrReport { strBuffer.append(System.lineSeparator()); //文本内容第十二部分数据 String data1 = String.format("%s peaks reported", String.valueOf(middleData.peaks_idPeak.size())); - String data2 = String.format("%s peaks with ID (%s%)", String.valueOf(peaksUsed), String.valueOf(peaksUsed / middleData.peaks_idPeak.size() * 100)); - String data3 = String.format("%s peaks without ID(%s%)", String.valueOf(middleData.peaks_idPeak.size() - peaksUsed), String.valueOf(Double.valueOf(middleData.peaks_idPeak.size() - peaksUsed) / middleData.peaks_idPeak.size() * 100)); + String data2 = String.format("%s peaks with ID (%s%%)", String.valueOf(peaksUsed), String.valueOf(peaksUsed / middleData.peaks_idPeak.size() * 100 ) ); + String data3 = String.format("%s peaks without ID(%s%%)", String.valueOf(middleData.peaks_idPeak.size() - peaksUsed), String.valueOf(Double.valueOf(middleData.peaks_idPeak.size() - peaksUsed) / middleData.peaks_idPeak.size() * 100)); String[] dataTitle12 = new String[]{data1, data2, data3}; String[] dataContent12 = new String[]{"", "", ""}; strBuffer.append(attributeFormat(dataTitle12, dataContent12)); //文本内容第十三部分数据 + String data14= "PeakID : %-7s Energy : %-13s Centroid : %-13s FWHM : %-10s NetArea : %-16s NAErr%% : %-23s Signif : %-13s Sensit : %-13s Nuclide : %-30s"; for (int i=0; i 0) { - spectrum.append("#TotalEff"); - //换行 - spectrum.append(System.lineSeparator()); - TotaleffBlock g_totE = phd.getUsedTotEKD(); - for(int i=0; i 0) { + spectrum.append("#TotalEff"); //换行 spectrum.append(System.lineSeparator()); + for(int i=0; i CreateShapeCP(BaseControls baseControls) { List shapes = new LinkedList<>(); for(int i=0; i