修改了Setting文件和DCT文件的加载机制。出厂时将出厂制作的默认settings和dct文件留存于root目录下。程序启动后会先检查sd卡对应目录中是否含有settings和dct文件。如果有则会直接加载,如果没有则会将root中的拷贝至sd卡中再加载。
This commit is contained in:
Binary file not shown.
Binary file not shown.
@ -2,8 +2,8 @@
|
||||
"ExpandedNodes": [
|
||||
"",
|
||||
"\\Source",
|
||||
"\\Source\\Calibration",
|
||||
"\\Source\\Capture",
|
||||
"\\Source\\Data",
|
||||
"\\Source\\Logger",
|
||||
"\\Source\\OSIF",
|
||||
"\\Source\\OSIF\\DLib",
|
||||
|
BIN
.vs/slnx.sqlite
BIN
.vs/slnx.sqlite
Binary file not shown.
60
main.cpp
60
main.cpp
@ -36,9 +36,67 @@ int main(int argc, char* argv[])
|
||||
CMainGrabber m_mgMainGrabber;
|
||||
DataFileProcessor m_dfpDataSaver;
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////Check Settings File
|
||||
QFileInfo m_qfiSettingFileInfo("/home/data/Setting/DeviceSettings.ini");
|
||||
QFileInfo m_qfiDCTFileInfo("/home/data/Data/DCTable.txt");
|
||||
|
||||
if (!m_qfiSettingFileInfo.isFile())
|
||||
{
|
||||
printf ("DeviceSettings File Missing !!! Will create from default one.");
|
||||
|
||||
QDir qdirPath("/home/data/Setting");
|
||||
if (!qdirPath.exists())
|
||||
{
|
||||
bool bRes = qdirPath.mkpath("/home/data/Setting");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "DataFileProcessor mkdir Failed.";
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
bool bRes = QFile::copy("/root/DeviceSettings.ini", "/home/data/Setting/DeviceSettings.ini");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << " QFile::copy Failed.";
|
||||
return -2;
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_qfiDCTFileInfo.isFile())
|
||||
{
|
||||
printf ("DCTable File Missing !!! Will create from default one.");
|
||||
|
||||
QDir qdirPath("/home/data/Data");
|
||||
if (!qdirPath.exists())
|
||||
{
|
||||
bool bRes = qdirPath.mkpath("/home/data/Data");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "DataFileProcessor mkdir Failed.";
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool bRes = QFile::copy("/root/DCTable.txt", "/home/data/Data/DCTable.txt");
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << " QFile::copy Failed.";
|
||||
return -2;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
///test
|
||||
//m_dfpDataSaver.LoadWaveLengthFile("E:/WavelengthInfo.txt");
|
||||
//m_dfpDataSaver.LoadSingleDataFile("E:/13_20_22.dat");
|
||||
//m_dfpDataSaver.LoadSingleDataFile("E:/11_06_45.dat");
|
||||
|
||||
///configger
|
||||
m_syscfSettings.Initialize();
|
||||
bRes = m_syscfSettings.LoadSettings_FS(m_struFSParam);
|
||||
|
Reference in New Issue
Block a user