diff --git a/othersoft/calibration_console/Source_Files/atpFiberImager.cpp b/othersoft/calibration_console/Source_Files/atpFiberImager.cpp index 6270d3d..d9c8448 100644 --- a/othersoft/calibration_console/Source_Files/atpFiberImager.cpp +++ b/othersoft/calibration_console/Source_Files/atpFiberImager.cpp @@ -102,22 +102,22 @@ void ATPFiberImager::recordDark(QString path) //采集暗帧 singleShot(m_DarkData); -// //输出到csv -// QDateTime curDateTime = QDateTime::currentDateTime(); -// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); -// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral.csv"; -// std::ofstream outfile(fileName.toStdString().c_str()); -// -// for (int i = 0; i < attribute.iPixels; i++) -// { -// if (i==0) -// { -// outfile << m_DarkData.usExposureTimeInMS << std::endl; -// } -// outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl; -// } -// -// outfile.close(); + //输出到csv + QDateTime curDateTime = QDateTime::currentDateTime(); + QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); + QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral_dn.csv"; + std::ofstream outfile(fileName.toStdString().c_str()); + + for (int i = 0; i < attribute.iPixels; i++) + { + if (i==0) + { + outfile << m_DarkData.usExposureTimeInMS << std::endl; + } + outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl; + } + + outfile.close(); } void ATPFiberImager::recordTarget(int recordTimes, QString path) @@ -155,22 +155,22 @@ void ATPFiberImager::recordTarget(int recordTimes, QString path) } -// //输出到csv -// QDateTime curDateTime = QDateTime::currentDateTime(); -// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); -// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral.csv"; -// std::ofstream outfile(fileName.toStdString().c_str()); -// -// for (int i = 0; i < attribute.iPixels; i++) -// { -// if (i==0) -// { -// outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl; -// } -// outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl; -// } -// -// outfile.close(); + //输出到csv + QDateTime curDateTime = QDateTime::currentDateTime(); + QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); + QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral_dn.csv"; + std::ofstream outfile(fileName.toStdString().c_str()); + + for (int i = 0; i < attribute.iPixels; i++) + { + if (i==0) + { + outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl; + } + outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl; + } + + outfile.close(); } void ATPFiberImager::autoExpose() diff --git a/othersoft/calibration_console/Source_Files/calibration.cpp b/othersoft/calibration_console/Source_Files/calibration.cpp index 9ec260d..64fc9aa 100644 --- a/othersoft/calibration_console/Source_Files/calibration.cpp +++ b/othersoft/calibration_console/Source_Files/calibration.cpp @@ -176,19 +176,19 @@ void CalibrationAlgorithm::readAndResample_StandardLightFile(QString filePath, i } -// //将重采样的标准灯数据输出到csv -// QString outputName = standardLightFileFolder + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_" + standardLightFileName + "_resample.csv"; -// std::ofstream outfile2(outputName.toStdString().c_str()); -// for (size_t i = 0; i < deviceAttribute.iPixels; i++) -// { -// if (i == 0) -// { -// outfile2 << m_dStandardLightDataBase << std::endl; -// } -// -// outfile2 << deviceAttribute.fWaveLengthInNM[i] << "," << m_dStandardLightDataResampled[i] << std::endl; -// } -// outfile2.close(); + //将重采样的标准灯数据输出到csv + QString outputName = standardLightFileFolder + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_" + standardLightFileName + "_resample.csv"; + std::ofstream outfile2(outputName.toStdString().c_str()); + for (size_t i = 0; i < deviceAttribute.iPixels; i++) + { + if (i == 0) + { + outfile2 << m_dStandardLightDataBase << std::endl; + } + + outfile2 << deviceAttribute.fWaveLengthInNM[i] << "," << m_dStandardLightDataResampled[i] << std::endl; + } + outfile2.close(); } void CalibrationAlgorithm::produceCalfile(QString calFilePath, DeviceAttribute deviceAttribute, DataFrame integratingSphereData, DataFrame darkData) diff --git a/othersoft/calibration_console/Source_Files/oceanOpticsFiberImager.cpp b/othersoft/calibration_console/Source_Files/oceanOpticsFiberImager.cpp index 3c13aaf..9e7e632 100644 --- a/othersoft/calibration_console/Source_Files/oceanOpticsFiberImager.cpp +++ b/othersoft/calibration_console/Source_Files/oceanOpticsFiberImager.cpp @@ -123,23 +123,23 @@ void OceanOpticsFiberImager::recordDark(QString path) //采集暗帧 singleShot(m_DarkData); -// //输出到csv -// QDateTime curDateTime = QDateTime::currentDateTime(); -// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); -// -// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral.csv"; -// std::ofstream outfile(fileName.toStdString().c_str()); -// -// for (int i = 0; i < attribute.iPixels; i++) -// { -// if (i==0) -// { -// outfile << m_DarkData.usExposureTimeInMS << std::endl;// -// } -// outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl; -// } -// -// outfile.close(); + //输出到csv + QDateTime curDateTime = QDateTime::currentDateTime(); + QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); + + QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral_dn.csv"; + std::ofstream outfile(fileName.toStdString().c_str()); + + for (int i = 0; i < attribute.iPixels; i++) + { + if (i==0) + { + outfile << m_DarkData.usExposureTimeInMS << std::endl;// + } + outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl; + } + + outfile.close(); } void OceanOpticsFiberImager::recordTarget(int recordTimes, QString path) @@ -177,23 +177,23 @@ void OceanOpticsFiberImager::recordTarget(int recordTimes, QString path) } -// //输出到csv -// QDateTime curDateTime = QDateTime::currentDateTime(); -// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); -// -// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral.csv"; -// std::ofstream outfile(fileName.toStdString().c_str()); -// -// for (int i = 0; i < attribute.iPixels; i++)// -// { -// if (i==0) -// { -// outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl; -// } -// outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl; -// } -// -// outfile.close(); + //输出到csv + QDateTime curDateTime = QDateTime::currentDateTime(); + QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); + + QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral_dn.csv"; + std::ofstream outfile(fileName.toStdString().c_str()); + + for (int i = 0; i < attribute.iPixels; i++)// + { + if (i==0) + { + outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl; + } + outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl; + } + + outfile.close(); } void OceanOpticsFiberImager::autoExpose()