gamma功能删除peak接口增加核素是否存在的判断
This commit is contained in:
parent
a27f937e35
commit
af7825d761
|
@ -1454,8 +1454,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
|
||||||
PeakInfo info = phd.getVPeak().get(curRow);
|
PeakInfo info = phd.getVPeak().get(curRow);
|
||||||
//获取当前选中的峰值信息的能量值
|
//获取当前选中的峰值信息的能量值
|
||||||
double energy = info.energy;
|
double energy = info.energy;
|
||||||
|
if (CollectionUtils.isNotEmpty(info.nuclides)) {
|
||||||
//遍历核素信息
|
//遍历核素信息
|
||||||
for (String nuclideName : info.nuclides) {
|
for (int i=0; i<info.nuclides.size(); i++) {
|
||||||
|
String nuclideName = info.nuclides.get(i);
|
||||||
//从缓存信息中获取核素名称
|
//从缓存信息中获取核素名称
|
||||||
NuclideLines nuclideLines = nuclideMap.get(nuclideName);
|
NuclideLines nuclideLines = nuclideMap.get(nuclideName);
|
||||||
//获取最大活度的核素位置
|
//获取最大活度的核素位置
|
||||||
|
@ -1479,6 +1481,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
|
||||||
}
|
}
|
||||||
//重新计算核素活度浓度
|
//重新计算核素活度浓度
|
||||||
gammaFileUtil.NuclidesIdent(phd, nuclideMap);
|
gammaFileUtil.NuclidesIdent(phd, nuclideMap);
|
||||||
|
}
|
||||||
//将当前行从峰数组中移除
|
//将当前行从峰数组中移除
|
||||||
phd.getVPeak().remove(curRow);
|
phd.getVPeak().remove(curRow);
|
||||||
//重新分析数据
|
//重新分析数据
|
||||||
|
|
Loading…
Reference in New Issue
Block a user