MasterArbeit/MAClient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

various bug fixes around free trigger mode, display strings and image pipe robustness

Browse source
This commit is contained in:
uvos 2021-06-18 16:52:39 +02:00
parent 86ec50575b
commit d5af9adec9
12 changed files with 85 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/cameras.cpp
View file

@ -111,7 +111,7 @@ bool Cameras::start()
ret = false;
}
if(free_)
if(free_ && led_)
uvosled_set_current(led_, lighting_.mask, lighting_.brightness);
return ret;
@ -146,9 +146,11 @@ bool Cameras::setFree(bool free)
{
if(!camera->cam()->setAcquisitionMode(free ? cam::Camera::MODE_FREE : cam::Camera::MODE_SINGLE))
{
qDebug()<<"failed to set single on camera"<<camera->id();
qDebug()<<"failed to set acquisition mode on camera"<<camera->id();
ret = false;
}
if(ret)
camera->cam()->setTriggerMode(free ? cam::Camera::TRIGGER_FREE : cam::Camera::TRIGGER_SOFTWARE);
}
return ret;
}
@ -173,13 +175,14 @@ void Cameras::imageRecived(Camera::Image img)
{
if(!disable_)
{
qDebug()<<"free"<<free_;
bool allreadyUpdated = false;
for(auto& image : images_)
{
if(image.cameraId == img.cameraId)
{
allreadyUpdated = true;
break;;
break;
}
}