xin/TowerOptoSifAndSpectral
1
0
Fork 0
mirror of http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git synced 2025-10-20 03:49:43 +08:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: xin:f04f058b9cf7c30e523bd617dbef0f47ab218e1d
Branches Tags
xin:master xin:renlixin xin:zz xin:TC xin:zhangzhuo
..
compare: xin:527c23e30e5268a859a61dc19d30e0b35493113b
Branches Tags
xin:master xin:renlixin xin:zz xin:TC xin:zhangzhuo

2 Commits
f04f058b9c ... 527c23e30e

Author SHA1 Message Date
tangchao0503
527c23e30e 接上一个提交：遗漏代码 2022-10-12 14:15:14 +08:00
tangchao0503
4ebbea7bc9 张欣欣要求：定标时，将原始的dn值和重采样后的积分球标准曲线输出到csv，以便定标时排错； 2022-10-12 13:13:13 +08:00
3 changed files with 101 additions and 101 deletions
Expand all files Collapse all files

64
othersoft/calibration_console/Source_Files/atpFiberImager.cpp
View File

@ -102,22 +102,22 @@ void ATPFiberImager::recordDark(QString path)
//<2F>ɼ<EFBFBD><C9BC><EFBFBD>֡ //<2F>ɼ<EFBFBD><C9BC><EFBFBD>֡
singleShot(m_DarkData); singleShot(m_DarkData);
// //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv
// QDateTime curDateTime = QDateTime::currentDateTime(); QDateTime curDateTime = QDateTime::currentDateTime();
// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss");
// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral.csv"; QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral_dn.csv";
// std::ofstream outfile(fileName.toStdString().c_str()); std::ofstream outfile(fileName.toStdString().c_str());
//
// for (int i = 0; i < attribute.iPixels; i++) for (int i = 0; i < attribute.iPixels; i++)
// { {
// if (i==0) if (i==0)
// { {
// outfile << m_DarkData.usExposureTimeInMS << std::endl; outfile << m_DarkData.usExposureTimeInMS << std::endl;
// } }
// outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl; outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl;
// } }
//
// outfile.close(); outfile.close();
} }
void ATPFiberImager::recordTarget(int recordTimes, QString path) void ATPFiberImager::recordTarget(int recordTimes, QString path)
@ -155,22 +155,22 @@ void ATPFiberImager::recordTarget(int recordTimes, QString path)
} }
// //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv
// QDateTime curDateTime = QDateTime::currentDateTime(); QDateTime curDateTime = QDateTime::currentDateTime();
// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss");
// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral.csv"; QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral_dn.csv";
// std::ofstream outfile(fileName.toStdString().c_str()); std::ofstream outfile(fileName.toStdString().c_str());
//
// for (int i = 0; i < attribute.iPixels; i++) for (int i = 0; i < attribute.iPixels; i++)
// { {
// if (i==0) if (i==0)
// { {
// outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl; outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl;
// } }
// outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl; outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl;
// } }
//
// outfile.close(); outfile.close();
} }
void ATPFiberImager::autoExpose() void ATPFiberImager::autoExpose()

70
othersoft/calibration_console/Source_Files/calibration.cpp
View File

@ -113,28 +113,28 @@ void CalibrationAlgorithm::readAndResample_StandardLightFile(QString filePath, i
// //<2F><><EFBFBD>ضϱ<D8B6>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv //<2F><><EFBFBD>ضϱ<D8B6>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv
// QFileInfo fileInfo(filePath); QFileInfo fileInfo(filePath);
// QString standardLightFileFolder = fileInfo.path(); QString standardLightFileFolder = fileInfo.path();
// QString standardLightFileName = fileInfo.fileName(); QString standardLightFileName = fileInfo.fileName();
//
// QDateTime curDateTime = QDateTime::currentDateTime(); QDateTime curDateTime = QDateTime::currentDateTime();
// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss");
//
// QString tmp = standardLightFileFolder + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) +"_"+ standardLightFileName + "_truncation.csv"; QString tmp = standardLightFileFolder + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) +"_"+ standardLightFileName + "_truncation.csv";
//
// std::ofstream outfile1(tmp.toStdString().c_str()); std::ofstream outfile1(tmp.toStdString().c_str());
//
// for (size_t i = 0; i < endPos - startPos; i++) for (size_t i = 0; i < endPos - startPos; i++)
// { {
// if (i == 0) if (i == 0)
// { {
// outfile1 << m_dStandardLightDataBase << std::endl; outfile1 << m_dStandardLightDataBase << std::endl;
// } }
//
// outfile1 << m_dStandardLightWavelength[i] << "," << m_dStandardLightData[i] << std::endl; outfile1 << m_dStandardLightWavelength[i] << "," << m_dStandardLightData[i] << std::endl;
// } }
// outfile1.close(); outfile1.close();
@ -176,19 +176,19 @@ void CalibrationAlgorithm::readAndResample_StandardLightFile(QString filePath, i
} }
// //<2F><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD><EFBFBD>ı<EFBFBD>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv //<2F><><EFBFBD>ز<EFBFBD><D8B2><EFBFBD><EFBFBD>ı<EFBFBD>׼<EFBFBD><D7BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv
// QString outputName = standardLightFileFolder + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_" + standardLightFileName + "_resample.csv"; QString outputName = standardLightFileFolder + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_" + standardLightFileName + "_resample.csv";
// std::ofstream outfile2(outputName.toStdString().c_str()); std::ofstream outfile2(outputName.toStdString().c_str());
// for (size_t i = 0; i < deviceAttribute.iPixels; i++) for (size_t i = 0; i < deviceAttribute.iPixels; i++)
// { {
// if (i == 0) if (i == 0)
// { {
// outfile2 << m_dStandardLightDataBase << std::endl; outfile2 << m_dStandardLightDataBase << std::endl;
// } }
//
// outfile2 << deviceAttribute.fWaveLengthInNM[i] << "," << m_dStandardLightDataResampled[i] << std::endl; outfile2 << deviceAttribute.fWaveLengthInNM[i] << "," << m_dStandardLightDataResampled[i] << std::endl;
// } }
// outfile2.close(); outfile2.close();
} }
void CalibrationAlgorithm::produceCalfile(QString calFilePath, DeviceAttribute deviceAttribute, DataFrame integratingSphereData, DataFrame darkData) void CalibrationAlgorithm::produceCalfile(QString calFilePath, DeviceAttribute deviceAttribute, DataFrame integratingSphereData, DataFrame darkData)

68
othersoft/calibration_console/Source_Files/oceanOpticsFiberImager.cpp
View File

@ -123,23 +123,23 @@ void OceanOpticsFiberImager::recordDark(QString path)
//<2F>ɼ<EFBFBD><C9BC><EFBFBD>֡ //<2F>ɼ<EFBFBD><C9BC><EFBFBD>֡
singleShot(m_DarkData); singleShot(m_DarkData);
// //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv
// QDateTime curDateTime = QDateTime::currentDateTime(); QDateTime curDateTime = QDateTime::currentDateTime();
// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss");
//
// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral.csv"; QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_darkSpectral_dn.csv";
// std::ofstream outfile(fileName.toStdString().c_str()); std::ofstream outfile(fileName.toStdString().c_str());
//
// for (int i = 0; i < attribute.iPixels; i++) for (int i = 0; i < attribute.iPixels; i++)
// { {
// if (i==0) if (i==0)
// { {
// outfile << m_DarkData.usExposureTimeInMS << std::endl;// outfile << m_DarkData.usExposureTimeInMS << std::endl;//
// } }
// outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl; outfile << attribute.fWaveLengthInNM[i] << "," << m_DarkData.lData[i] << std::endl;
// } }
//
// outfile.close(); outfile.close();
} }
void OceanOpticsFiberImager::recordTarget(int recordTimes, QString path) void OceanOpticsFiberImager::recordTarget(int recordTimes, QString path)
@ -177,23 +177,23 @@ void OceanOpticsFiberImager::recordTarget(int recordTimes, QString path)
} }
// //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>csv
// QDateTime curDateTime = QDateTime::currentDateTime(); QDateTime curDateTime = QDateTime::currentDateTime();
// QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss"); QString currentTime = curDateTime.toString("yyyy_MM_dd_hh_mm_ss");
//
// QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral.csv"; QString fileName = path + "/" + currentTime + "_" + QString::fromStdString(deviceInfo.strSN) + "_integratingSphereSpectral_dn.csv";
// std::ofstream outfile(fileName.toStdString().c_str()); std::ofstream outfile(fileName.toStdString().c_str());
//
// for (int i = 0; i < attribute.iPixels; i++)// for (int i = 0; i < attribute.iPixels; i++)//
// { {
// if (i==0) if (i==0)
// { {
// outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl; outfile << m_IntegratingSphereData.usExposureTimeInMS << std::endl;
// } }
// outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl; outfile << attribute.fWaveLengthInNM[i] << "," << m_IntegratingSphereData.lData[i] << std::endl;
// } }
//
// outfile.close(); outfile.close();
} }
void OceanOpticsFiberImager::autoExpose() void OceanOpticsFiberImager::autoExpose()