diff --git a/src/DataProcessWorkPool.cpp b/src/DataProcessWorkPool.cpp index 45ce378..ceb03ef 100644 --- a/src/DataProcessWorkPool.cpp +++ b/src/DataProcessWorkPool.cpp @@ -1615,9 +1615,9 @@ bool ManualFindPeaksTask::processTask() arma::vec p_fit = NolinearLeastSquaresCurveFit::Lsqcurvefit( PhotonPeakModel, armaX, armaY, p0 ); - double amplitude = p_fit(0); // 峰振幅 - double sigma = p_fit(1); // 高斯sigma - double center = p_fit(5); // 峰中心(峰位) + double amplitude = p_fit(0);// 峰振幅 + double sigma = p_fit(1);// 高斯sigma + double center = p_fit(5);// 峰中心(峰位) double fwhm = sigma * 2.355; double baseline = p_fit(4); // 本底 double peakHeight = amplitude + baseline; // 峰高 = 振幅 + 本底 diff --git a/src/EnergyScaleDataModel.cpp b/src/EnergyScaleDataModel.cpp index da4528a..4fcd09e 100644 --- a/src/EnergyScaleDataModel.cpp +++ b/src/EnergyScaleDataModel.cpp @@ -25,7 +25,8 @@ const QString &EnergyScaleDataModel::GetDataFilename() const bool EnergyScaleDataModel::LoadData() { QFile json_file(_data_filename); - if (!json_file.open(QIODevice::ReadOnly | QIODevice::Text)) { + if (!json_file.open(QIODevice::ReadOnly | QIODevice::Text)) + { return false; } QJsonDocument json_doc = QJsonDocument::fromJson(json_file.readAll()); diff --git a/src/RegionOfInterest/RegionOfInterest.cpp b/src/RegionOfInterest/RegionOfInterest.cpp index c6b9f99..b20829d 100644 --- a/src/RegionOfInterest/RegionOfInterest.cpp +++ b/src/RegionOfInterest/RegionOfInterest.cpp @@ -350,13 +350,13 @@ void RegionOfInterest::loadROIFromFile() QString roiPath = QApplication::applicationDirPath() + "/configure/RegionOfInterest/roiData.json"; if (!QFile::exists(roiPath)) { - QMessageBox::information(this, "提示", "暂无保存的ROI文件"); + // QMessageBox::information(this, "提示", "暂无保存的ROI文件"); return; } QJsonArray arr = readAllROIJson(); if (arr.isEmpty()) { - QMessageBox::information(this, "提示", "文件内无ROI数据"); + // QMessageBox::information(this, "提示", "文件内无ROI数据"); return; } // 清空当前界面与内存