fix:
1、配置页面3; 2、resononNirImager的bug修复;
This commit is contained in:
@ -1,4 +1,5 @@
|
||||
#include "ImagerOperationBase.h"
|
||||
#include <QDir>
|
||||
|
||||
ImagerOperationBase::ImagerOperationBase()
|
||||
{
|
||||
@ -250,6 +251,7 @@ void ImagerOperationBase::start_record()
|
||||
string timesFile = removeFileExtension(m_FileName2Save2) + ".times";
|
||||
FILE* hTimesFile = fopen(timesFile.c_str(), "w+");
|
||||
|
||||
|
||||
imagerStartCollect();
|
||||
while (m_bRecordControlState)
|
||||
{
|
||||
@ -257,7 +259,8 @@ void ImagerOperationBase::start_record()
|
||||
|
||||
getFrame(buffer);
|
||||
long long timeOs = getNanosecondsSinceMidnight();
|
||||
|
||||
//qDebug() << "time ns-------------------: " << timeOs;
|
||||
|
||||
//减去暗电流,应为buffer和dark都是unsigned short,所以当dark>buffer时,buffer-dark=65535
|
||||
if (m_HasDark)
|
||||
{
|
||||
@ -297,7 +300,7 @@ void ImagerOperationBase::start_record()
|
||||
}
|
||||
|
||||
x = fwrite(buffer, 2, m_FrameSize, m_fImage);
|
||||
fprintf(hTimesFile, "%d\n", timeOs);
|
||||
fprintf(hTimesFile, "%ll\n", timeOs);
|
||||
|
||||
//将rgb波段提取出来,以便在界面中显示
|
||||
m_RgbImage->FillRgbImage(buffer);//??????????????????????????????????????????????????????????????????????????????????????????????????????
|
||||
@ -320,7 +323,7 @@ void ImagerOperationBase::start_record()
|
||||
|
||||
//在最后一次画图前需要进行一次拉伸
|
||||
//m_RgbImage
|
||||
emit PlotSignal(m_FileSavedCounter, -1, filePath);
|
||||
emit PlotSignal(m_FileSavedCounter, -1, filePath);//采集完成后进行一次画图,以防采集帧数不是帧率的倍数时,画图不全
|
||||
|
||||
m_bRecordControlState = false;
|
||||
WriteHdr();
|
||||
@ -357,6 +360,14 @@ void ImagerOperationBase::setFileName2Save(string FileName)
|
||||
m_FileSavedCounter = 0;
|
||||
}
|
||||
|
||||
void ImagerOperationBase::updateRecordingFileInfo(const QString& filePath, const QString& baseName, int frameNumber)
|
||||
{
|
||||
m_FileName2Save = (filePath + QDir::separator() + baseName).toStdString();
|
||||
m_FileSavedCounter = 0;
|
||||
|
||||
setFrameNumber(frameNumber);
|
||||
}
|
||||
|
||||
void ImagerOperationBase::setFocusControlState(bool FocusControlState)
|
||||
{
|
||||
m_bFocusControlState = FocusControlState;
|
||||
|
||||
Reference in New Issue
Block a user