mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-23 12:59:43 +08:00
更新支持使用asd测定的积分球标准能量曲线
This commit is contained in:
@ -64,7 +64,10 @@ int main(int argc, char *argv[])
|
||||
case CommandLineOk:
|
||||
break;
|
||||
case CommandLineError:
|
||||
fputs(qPrintable(errorMessage), stderr);
|
||||
errorMessage = "<br><b style=\"color:red\">" + errorMessage + "s!</b>";
|
||||
logout(errorMessage);
|
||||
|
||||
// fputs(qPrintable(errorMessage), stderr);
|
||||
fputs("\n\n", stderr);
|
||||
fputs(qPrintable(parser.helpText()), stderr);
|
||||
return 1;
|
||||
@ -78,12 +81,14 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƕ<EFBFBD><C7B6><EFBFBD>
|
||||
FiberSpectrometerOperationBase * m_FiberSpectrometer;
|
||||
switch (query.deviceType)
|
||||
{
|
||||
case OPTOSKY:
|
||||
m_FiberSpectrometer = new ATPFiberImager(false,"ttyUSB0","ocean_optics");
|
||||
m_FiberSpectrometer = new ATPFiberImager(false,query.serialPort.toStdString(),"ocean_optics");
|
||||
break;
|
||||
case OceanOptics:
|
||||
m_FiberSpectrometer = new OceanOpticsFiberImager();
|
||||
@ -342,13 +347,15 @@ CommandLineParseResult parseCommandLine2(QCommandLineParser &parser, TcQuery *qu
|
||||
QString selector = parser.value(standardLightFileSelector);
|
||||
// QString standardLightFilePath_tmp = QDir::cleanPath(QDir::rootPath() + QDir::separator() + "standardLightFile" + QDir::separator() + selector);
|
||||
|
||||
QString tmp = "/home/data/Setting/standardLightFile";
|
||||
QString tmp = "/home/data/Setting/StandardLightFile";
|
||||
QString standardLightFilePath_tmp = tmp + QDir::separator() + selector;
|
||||
|
||||
string xx=standardLightFilePath_tmp.toStdString();
|
||||
|
||||
//<2F>ж϶<D0B6><CFB6><EFBFBD><EFBFBD>ļ<EFBFBD><C4BC>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD>
|
||||
if (!isFileExist(standardLightFilePath_tmp))
|
||||
{
|
||||
*errorMessage = "No standard light file set.";
|
||||
*errorMessage = "Standard light file '" + selector + "' does not exist!";
|
||||
return CommandLineError;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user