mirror of
http://172.16.0.230/r/SIF/TowerOptoSifAndSpectral.git
synced 2025-10-18 19:39:43 +08:00
Merge remote-tracking branch 'origin/zhangzhuo'
This commit is contained in:
@ -41,8 +41,7 @@ bool DataFileProcessor::WriteDataFile()
|
||||
WriteEnvironmentInfo();
|
||||
WriteDeviceInfo();
|
||||
WriteData();
|
||||
bool res = true;
|
||||
return res;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void DataFileProcessor::GenerateFilePath()
|
||||
@ -54,17 +53,21 @@ void DataFileProcessor::GenerateFilePath()
|
||||
m_struEC.qstrUTCDateTime = m_qdtTime.toUTC().toString("yyyy_MM_dd hh:mm:ss");
|
||||
|
||||
m_qstrFullFileName = m_qstrFilePath + qstrAddYMD;
|
||||
m_qstrFilePath= m_qstrFullFileName;
|
||||
QString qstrTemp= m_qstrFullFileName;
|
||||
if (m_struEC.qstrLocation=="")
|
||||
{
|
||||
m_struEC.qstrLocation = "Unknown";
|
||||
}
|
||||
m_qstrFullFileName= m_qstrFullFileName+"/"+m_struEC.qstrLocation + qstrAddHMS+".csv";
|
||||
|
||||
QDir qdirPath(m_qstrFilePath);
|
||||
QDir qdirPath(qstrTemp);
|
||||
if (!qdirPath.exists())
|
||||
{
|
||||
qdirPath.mkdir(m_qstrFilePath);
|
||||
bool bRes = qdirPath.mkdir(qstrTemp);
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "DataFileProcessor mkdir Failed.";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -75,8 +78,10 @@ bool DataFileProcessor::WriteEnvironmentInfo()
|
||||
bRes = qfData.open(QFile::WriteOnly|QFile::Text|QFile::Truncate);
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "WriteEnvironmentInfo open Failed.";
|
||||
return bRes;
|
||||
}
|
||||
qDebug() << m_qstrFullFileName;
|
||||
//EC
|
||||
qfData.write("EnvironmentalContext,");
|
||||
qfData.write("CaseHumidity,");
|
||||
@ -134,6 +139,11 @@ void DataFileProcessor::WriteDeviceInfo()
|
||||
{
|
||||
QFile qfData(m_qstrFullFileName);
|
||||
bool bRes = qfData.open(QFile::WriteOnly | QFile::Text | QIODevice::Append);
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "WriteDeviceInfo open Failed.";
|
||||
return;
|
||||
}
|
||||
QString qstrTemp;
|
||||
|
||||
qfData.write("\n");
|
||||
@ -190,6 +200,11 @@ bool DataFileProcessor::WriteData()
|
||||
{
|
||||
QFile qfData(m_qstrFullFileName);
|
||||
bool bRes = qfData.open(QFile::WriteOnly | QFile::Text | QIODevice::Append);
|
||||
if (!bRes)
|
||||
{
|
||||
qDebug() << "WriteData open Failed.";
|
||||
return 0;
|
||||
}
|
||||
QString qstrTemp;
|
||||
qfData.write("Data Section");
|
||||
qfData.write("\n");
|
||||
@ -216,15 +231,8 @@ bool DataFileProcessor::WriteData()
|
||||
}
|
||||
qfData.write("\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool res = true;
|
||||
return res;
|
||||
}
|
||||
|
Reference in New Issue
Block a user