mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-22 20:49:43 +08:00
添加了积分球探测器数值
This commit is contained in:
@ -32,6 +32,7 @@ struct TcQuery
|
||||
int sleepTimeinSecond;//<2F><>Ĭ<EFBFBD><C4AC>ֵ
|
||||
int averageTimes;
|
||||
int position;
|
||||
int integratingSphereDetectorValue;
|
||||
|
||||
QString calFileOutputDirectory;//<2F><>Ĭ<EFBFBD><C4AC>ֵ
|
||||
QString calFileOutputName;
|
||||
@ -93,6 +94,7 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
//<2F><><EFBFBD>ӹ<EFBFBD><D3B9><EFBFBD><EFBFBD><EFBFBD>
|
||||
QString message;
|
||||
QString SN;
|
||||
QString pixelCount;
|
||||
QString wavelengthInfo;
|
||||
@ -101,11 +103,12 @@ int main(int argc, char *argv[])
|
||||
|
||||
//<2F>Զ<EFBFBD><D4B6>ع<EFBFBD>
|
||||
logout("<br><b style=\"color:red\">AutoExpose!</b>");
|
||||
m_FiberSpectrometer->autoExpose();
|
||||
// m_FiberSpectrometer->autoExpose();
|
||||
|
||||
|
||||
//<2F><><EFBFBD><EFBFBD>sleep<65><70><EFBFBD>ȴ<EFBFBD><C8B4>رտ<D8B1><D5BF><EFBFBD>
|
||||
logout("<br><b style=\"color:red\">Wait for close the lamp!</b>");
|
||||
message="<br><b style=\"color:red\">Please close the lamp in " + QString::number(query.sleepTimeinSecond) + "s!</b>";
|
||||
logout(message);
|
||||
QThread::sleep(query.sleepTimeinSecond);
|
||||
|
||||
//<2F>ɼ<EFBFBD><C9BC><EFBFBD>֡
|
||||
@ -114,7 +117,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
|
||||
//<2F><><EFBFBD><EFBFBD>sleep<65><70><EFBFBD>ȴ<EFBFBD><C8B4><EFBFBD><F2BFAABF><EFBFBD>
|
||||
logout("<br><b style=\"color:red\">Wait for open the lamp!</b>");
|
||||
message="<br><b style=\"color:red\">Please open the lamp in " + QString::number(query.sleepTimeinSecond) + "s!</b>";
|
||||
logout(message);
|
||||
QThread::sleep(query.sleepTimeinSecond);
|
||||
|
||||
//<2F>ɼ<EFBFBD><C9BC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
@ -128,7 +132,7 @@ int main(int argc, char *argv[])
|
||||
m_FiberSpectrometer->getDeviceInfo(deviceInfo);
|
||||
|
||||
CalibrationAlgorithm * m_CalibrationAlgorithm = new CalibrationAlgorithm();
|
||||
m_CalibrationAlgorithm->readFile(query.standardLightFilePath, deviceAttribute, deviceInfo);//
|
||||
m_CalibrationAlgorithm->readAndResample_StandardLightFile(query.standardLightFilePath,query.integratingSphereDetectorValue, deviceAttribute, deviceInfo);
|
||||
|
||||
//<2F><><EFBFBD>ɷ<EFBFBD><C9B7>䶨<EFBFBD><E4B6A8><EFBFBD>ļ<EFBFBD>
|
||||
if (query.calFileOutputName.isEmpty())//query->calFileOutputName==""
|
||||
@ -174,6 +178,9 @@ CommandLineParseResult parseCommandLine2(QCommandLineParser &parser, TcQuery *qu
|
||||
QCommandLineOption position("position", "Position.", "position");
|
||||
parser.addOption(position);
|
||||
|
||||
QCommandLineOption integratingSphereDetectorValue("integratingSphereDetectorValue", "integratingSphereDetectorValue.", "integratingSphereDetectorValue");
|
||||
parser.addOption(integratingSphereDetectorValue);
|
||||
|
||||
// parser.addPositionalArgument("name", "The name to look up.");//????????????????????????????????????????????????????????????????????????????
|
||||
QCommandLineOption helpOption = parser.addHelpOption();//Adds the help option (-h, --help and -? on Windows) This option is handled automatically by QCommandLineParser.
|
||||
QCommandLineOption versionOption = parser.addVersionOption();//This option is handled automatically by QCommandLineParser.
|
||||
@ -226,6 +233,11 @@ CommandLineParseResult parseCommandLine2(QCommandLineParser &parser, TcQuery *qu
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if (!parser.parse(QCoreApplication::arguments()))//Process the actual command line arguments given by the user
|
||||
{
|
||||
*errorMessage = parser.errorText();
|
||||
@ -348,6 +360,24 @@ CommandLineParseResult parseCommandLine2(QCommandLineParser &parser, TcQuery *qu
|
||||
query->standardLightFilePath = parser.value(standardLightFilePath);
|
||||
}
|
||||
|
||||
if (parser.isSet(integratingSphereDetectorValue))
|
||||
{
|
||||
if(query->standardLightFilePath.contains("ocean_optics.lmp",Qt::CaseSensitive))
|
||||
{
|
||||
query->integratingSphereDetectorValue = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
const QString integratingSphereDetectorValueTmp = parser.value(integratingSphereDetectorValue);
|
||||
query->integratingSphereDetectorValue = integratingSphereDetectorValueTmp.toInt();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
*errorMessage = "No integratingSphereDetectorValue set.";
|
||||
return CommandLineError;
|
||||
}
|
||||
|
||||
|
||||
if (parser.isSet(calFileOutputDirectory))//<2F><><EFBFBD>걣<EFBFBD><EAB1A3><EFBFBD>ļ<EFBFBD>·<EFBFBD><C2B7>
|
||||
{
|
||||
|
Reference in New Issue
Block a user