tangchao0503/ximeaAirborneSystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix：返回的曝光时间都使用微秒；

Browse Source
This commit is contained in:
tangchao0503
2023-09-04 18:03:20 +08:00
parent a492baea18
commit 19e2309be7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source_Files/ximeaimager.cpp
View File

@ -204,9 +204,14 @@ void XimeaImager::setFramerate(double framerate)
{ {
m_imager.set_framerate(framerate); m_imager.set_framerate(framerate);
int exposureTimeInUs = getExposureTime();
int maxExposureTimeInUs=1/framerate*1000000; int maxExposureTimeInUs=1/framerate*1000000;
// setExposureTime(maxExposureTimeInUs);
// setExposureTime(1000); if (exposureTimeInUs > maxExposureTimeInUs)
{
wrapSetExposureTime(maxExposureTimeInUs);
}
m_iImagerState=102; m_iImagerState=102;
emit ximeaImageStatus(m_iImagerState); emit ximeaImageStatus(m_iImagerState);
@ -249,9 +254,7 @@ double XimeaImager::setExposureTime(float exposureTime_in_us)
//确保设置的积分时间比最大积分时间小 //确保设置的积分时间比最大积分时间小
if(exposureTime_in_us<maxExposureTime_in_us) if(exposureTime_in_us<maxExposureTime_in_us)
{ {
m_imager.set_integration_time(exposureTime_in_us); m_imager.set_integration_time(exposureTime_in_us);
} }
else else
{ {
@ -284,7 +287,7 @@ int XimeaImager::wrapSetExposureTime(float exposureTime_in_us)
m_iImagerState=103; m_iImagerState=103;
emit ximeaImageStatus(m_iImagerState); emit ximeaImageStatus(m_iImagerState);
emit autoExposeMaxValueOfOneFrame(maxValueOfOneFrame, exposureTime/1000); emit autoExposeMaxValueOfOneFrame(maxValueOfOneFrame, exposureTime);
return maxValueOfOneFrame; return maxValueOfOneFrame;
} }
@ -347,7 +350,7 @@ double XimeaImager::autoExposure()
m_iImagerState=103; m_iImagerState=103;
emit ximeaImageStatus(m_iImagerState); emit ximeaImageStatus(m_iImagerState);
emit autoExposeMaxValueOfOneFrame(maxValueOfOneFrame, exposureTime/1000); emit autoExposeMaxValueOfOneFrame(maxValueOfOneFrame, exposureTime);
std::cout<<"自动曝光完成!"<<std::endl; std::cout<<"自动曝光完成!"<<std::endl;
return exposureTime; return exposureTime;
@ -567,7 +570,8 @@ void XimeaImager::startRecord(double TimeDifferenceBetweensOSAndSbg,QString base
m_baseFileName=baseFileName; m_baseFileName=baseFileName;
std::cout << "曝光时间为：" << getExposureTime()/1000 << "ms" <<std::endl; std::cout << "帧率为：" << getFramerate() << "hz" <<std::endl;
std::cout << "曝光时间为：" << getExposureTime() << "μs" <<std::endl;
using namespace std; using namespace std;
// ofstream timesFileHandle(timesFileName.toStdString()+"_ofstream"); // ofstream timesFileHandle(timesFileName.toStdString()+"_ofstream");