Commit 075d2eee authored by Laurent Claustre's avatar Laurent Claustre
Browse files

Merge branch '15-color-camera-inttrigmult-is-not-working' into 'master'

Resolve "color camera IntTrigMult is not working"

Closes #15

See merge request limagroup/Lima-camera-basler!16
parents 7e3e3acb d7c17fa8
Pipeline #54946 failed with stages
in 11 minutes and 41 seconds
......@@ -341,8 +341,6 @@ void Camera::prepareAcq()
_initStreamGrabber(SoftBuffer);
if(m_trigger_mode == IntTrigMult)
_startAcq();
}
catch (GenICam::GenericException &e)
{
......@@ -365,12 +363,19 @@ void Camera::startAcq()
else
m_buffer_ctrl_obj.getBuffer().setStartTimestamp(Timestamp::now());
}
// start acquisition at first image
// code moved from prepareAcq(), otherwise with color camera
// CtVideo::_prepareAcq() which calls stopAcq() will kill the acquisition
if(m_trigger_mode == IntTrigMult)
{
if (m_image_number == 0)
_startAcq();
this->Camera_->TriggerSoftware.Execute();
}
else
_startAcq();
else {
_startAcq();
}
}
catch (GenICam::GenericException &e)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment