tangchao0503/HPPA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add，计划采集16：

Browse Source 
解决切换相机时的图片不切换问题
解决设置高光谱相机帧率和积分时间失效问题
拷贝航线路径文件到数据文件夹
单反弹窗报错：添加描述
图像控制添加2%拉伸
This commit is contained in:
tangchao0503
2026-06-18 10:13:50 +08:00
parent 5372a7806c
commit 55609b7b3b
9 changed files with 302 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
HPPA/TimedDataCollectionDataStructures.cpp
View File

@ -3,6 +3,8 @@
#include <QJsonObject>
#include <QJsonArray>
#include <QFile>
#include <QFileInfo>
#include <QDir>
#include <QTextStream>
#include <QDebug>
#include <algorithm>
@ -299,6 +301,17 @@ void TaskExecutor::onSequenceComplete(int status)
subTask.durationMinutes = (double)subTask.startTime.secsTo(subTask.endTime) / 60;
qDebug() << "TaskExecutor: subtask "<< m_currentSubTaskIndex<< " time consuming(Minutes): "<< subTask.durationMinutes;
// 拷贝subTask.pathLineFilePath到m_currentFolder
if (!subTask.pathLineFilePath.isEmpty() && QFile::exists(subTask.pathLineFilePath)) {
QFileInfo fileInfo(subTask.pathLineFilePath);
QString destPath = m_currentFolder + QDir::separator() + fileInfo.fileName();
if (QFile::copy(subTask.pathLineFilePath, destPath)) {
qDebug() << "TaskExecutor: Copied path line file to" << destPath;
} else {
qDebug() << "TaskExecutor: Failed to copy path line file from" << subTask.pathLineFilePath << "to" << destPath;
}
}
emit subTaskFinished(m_currentSubTaskIndex, subTask.type, (status == 0));
emit taskUpdated(m_task);
}
@ -417,21 +430,24 @@ void TaskExecutor::executeNextSubTask()
case SubTaskType::HyperSpectual400_1000nm:
{
camType = 0;
emit hyperCamParm(camType, subTask.frameRate, subTask.exposureTime, makeSubTaskDataFolder("L"), "test");
m_currentFolder = makeSubTaskDataFolder("L");
emit hyperCamParm(camType, subTask.frameRate, subTask.exposureTime, m_currentFolder, "L");
break;
}
case SubTaskType::HyperSpectual1000_1700nm:
{
camType = 1;
emit hyperCamParm(camType, subTask.frameRate, subTask.exposureTime, makeSubTaskDataFolder("NIR"), "test");
m_currentFolder = makeSubTaskDataFolder("NIR");
emit hyperCamParm(camType, subTask.frameRate, subTask.exposureTime, m_currentFolder, "NIR");
break;
}
case SubTaskType::SingleLensReflex:
{
camType = 2;
emit camParm(camType, 3, makeSubTaskDataFolder("SLR"));
m_currentFolder = makeSubTaskDataFolder("SLR");
emit camParm(camType, 3, m_currentFolder);
emit switchD65LampSignal(1);
@ -443,7 +459,8 @@ void TaskExecutor::executeNextSubTask()
case SubTaskType::DepthCamera:
{
camType = 3;
emit camParm(camType, 3, makeSubTaskDataFolder("DepthCamera"));
m_currentFolder = makeSubTaskDataFolder("DepthCamera");
emit camParm(camType, 3, m_currentFolder);
emit switchD65LampSignal(1);