xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

散点图B,G位置颠倒问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2024-01-10 18:30:24 +08:00
parent ee3a04af2f
commit 3c4aae44e0
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java
View File

@ -115,8 +115,8 @@ public class PHDFileUtil extends AbstractLogOrReport {
List<Long> hCounts = struct.h_counts; List<Long> hCounts = struct.h_counts;
List<HistogramData> histogramDataList = new LinkedList<>(); List<HistogramData> histogramDataList = new LinkedList<>();
List<HistogramData> histogramDataDList = new LinkedList<>(); List<HistogramData> histogramDataDList = new LinkedList<>();
for (int i=0; i<bChannels; i++){ for (int i=0; i<gChannels; i++){
for (int j=0; j< gChannels; j++){ for (int j=0; j< bChannels; j++){
Long index = i * bChannels + j; Long index = i * bChannels + j;
Long count = hCounts.get(index.intValue()); Long count = hCounts.get(index.intValue());
if (count > 0){ if (count > 0){

8
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
View File

@ -138,15 +138,15 @@ public class SelfStationUtil extends AbstractLogOrReport {
Long count = hCounts.get(index.intValue()); Long count = hCounts.get(index.intValue());
if (count > 0){ if (count > 0){
HistogramData his = new HistogramData(); HistogramData his = new HistogramData();
his.setG(i); his.setB(i);
his.setB(j); his.setG(j);
his.setC(count); his.setC(count);
histogramDataList.add(his); histogramDataList.add(his);
histogramDataDList.add(his); histogramDataDList.add(his);
}else { }else {
HistogramData his = new HistogramData(); HistogramData his = new HistogramData();
his.setG(i); his.setB(i);
his.setB(j); his.setG(j);
his.setC(count); his.setC(count);
histogramDataDList.add(his); histogramDataDList.add(his);
} }

7
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

@ -62,18 +62,25 @@ public class SelfStationServiceImpl implements ISelfStationService {
if (StringUtils.isNotBlank(sampleFileName)) { if (StringUtils.isNotBlank(sampleFileName)) {
//拼接sample文件路径 //拼接sample文件路径
String sampleFilePath = path + StringPool.SLASH + sampleFileName; String sampleFilePath = path + StringPool.SLASH + sampleFileName;
//获取sample分析后的对象 //获取sample分析后的对象
EnergySpectrumStruct struct = selfStationUtil.getSourceData(sampleFilePath, "sample", selfStationData); EnergySpectrumStruct struct = selfStationUtil.getSourceData(sampleFilePath, "sample", selfStationData);
if (Objects.nonNull(struct)) {
selfStationData.setSampleStruct(struct); selfStationData.setSampleStruct(struct);
selfStationData.setSampleTmpPath(sampleFilePath);
selfStationUtil.loadFile(selfStationData, null, null, map); selfStationUtil.loadFile(selfStationData, null, null, map);
} }
}
//判断det文件名是否为空 //判断det文件名是否为空
if (StringUtils.isNotBlank(detFileName)) { if (StringUtils.isNotBlank(detFileName)) {
//拼接det文件路径 //拼接det文件路径
String detFilePath = path + StringPool.SLASH + detFileName; String detFilePath = path + StringPool.SLASH + detFileName;
//获取sample分析后的对象 //获取sample分析后的对象
EnergySpectrumStruct struct = selfStationUtil.getSourceData(detFilePath, "det", selfStationData); EnergySpectrumStruct struct = selfStationUtil.getSourceData(detFilePath, "det", selfStationData);
if (Objects.nonNull(struct)) {
selfStationData.setDetStruct(struct); selfStationData.setDetStruct(struct);
selfStationData.setDetTmpPath(detFilePath);
}
} }
} }
//将自建台站的数据封装到缓存对象中 //将自建台站的数据封装到缓存对象中