最新更改

This commit is contained in:
2022-08-30 16:14:46 +08:00
parent 8c6be81f94
commit 1cee2339ce
26 changed files with 440 additions and 874 deletions

View File

@ -4,7 +4,7 @@
ZZ_SysConfigger::ZZ_SysConfigger(QObject* parent /*= nullptr*/)
{
#ifdef _DEBUG
m_qstrDeviceConfigFilePath = "E:/WorkSpace/git/IRIS_FODIS/IRIS_FODIS/Settings/DeviceSettings.ini";
m_qstrDeviceSettingsFilePath = "E:/WorkSpace/git/IRIS_FODIS/IRIS_FODIS/Settings/DeviceSettings.ini";
#else
m_qstrDeviceSettingsFilePath = "/home/data/Setting/DeviceSettings.ini";
#endif // DEBUG
@ -40,7 +40,8 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
QString qstrTemp = m_qsDeviceSettings->value(QString("FS/Model"), "Null").toString();
if(qstrTemp == "Null")
{
qDebug() << "FS Model Value Err.";
//qDebug() << "FS Model Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.ucDeviceModel = ZZ_MISCDEF::IRIS::GetIndex(qstrTemp.toStdString());
@ -49,6 +50,7 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
if (qstrTemp == "Null")
{
qDebug() << "FS Port Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.strInterface = qstrTemp.toStdString();
@ -57,6 +59,7 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
if (qstrTemp == "Null")
{
qDebug() << "FS UID Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.strSN = qstrTemp.toStdString();
@ -65,6 +68,7 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
if (fAEMax == -1)
{
qDebug() << "FS AEMax Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.fMaxFactor = fAEMax;
@ -73,6 +77,7 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
if (fAEMin == -1)
{
qDebug() << "FS AEMin Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.fMinFactor = fAEMin;
@ -81,6 +86,7 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
if (lDepth == -1)
{
qDebug() << "FS Depth Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.lDepth = lDepth;
@ -89,6 +95,7 @@ bool ZZ_SysConfigger::LoadSettings_FS(OneFSContext &struOFSC)
if (dMSI == -1)
{
qDebug() << "FS MinSI Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struOneFSContext.dMinSamplingInterval = dMSI;
@ -106,6 +113,7 @@ bool ZZ_SysConfigger::LoadSettings_GPS(GPSInfo &struGPSC)
if (qstrTemp == "Null")
{
qDebug() << "GPS Port Value Err.";
printf("FS Model Value Err.");
return false;
}
m_struGPSContext.qstrInterfaceName = qstrTemp;
@ -113,7 +121,8 @@ bool ZZ_SysConfigger::LoadSettings_GPS(GPSInfo &struGPSC)
qstrTemp = m_qsDeviceSettings->value(QString("GPS/Baud"), "Null").toString();
if (qstrTemp == "Null")
{
qDebug() << "GPS Port Value Err.";
//qDebug() << "GPS Port Value Err.";
printf("GPS Port Value Err.");
return false;
}
m_struGPSContext.iBaud = qstrTemp.toInt();