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

uvosled changes

Browse Source
This commit is contained in:
uvos
2021-06-26 15:27:00 +02:00
parent 6b7276d99d
commit 0f764776b8
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cameras.cpp
View File

@ -98,8 +98,8 @@ void Cameras::trigger()
for(auto& camera : cameras_) for(auto& camera : cameras_)
camera->cam()->trigger(); camera->cam()->trigger();
if(led_ && !free_) /*if(led_ && !free_)
uvosled_capture(led_, lighting_.mask, lighting_.brightness, exposrueTime_*1.5, exposrueTime_*0.25); uvosled_capture(led_, lighting_.mask, lighting_.brightness, exposrueTime_*1.5, exposrueTime_*0.25);*/
} }
bool Cameras::start() bool Cameras::start()
@ -111,8 +111,8 @@ bool Cameras::start()
ret = false; ret = false;
} }
if(free_ && led_) /*if(free_ && led_)
uvosled_set_current(led_, lighting_.mask, lighting_.brightness); uvosled_set_current(led_, lighting_.mask, lighting_.brightness);*/
return ret; return ret;
} }

4
src/main.cpp
View File

@ -88,8 +88,6 @@ int main(int argc, char *argv[])
// TODO: figure out how to do this better // TODO: figure out how to do this better
sleep(10); sleep(10);
} }
uvosledRet = -1;
Cameras cameras(uvosledRet < 0 ? nullptr : &led); Cameras cameras(uvosledRet < 0 ? nullptr : &led);
cameras.setFree(false); cameras.setFree(false);
@ -111,7 +109,7 @@ int main(int argc, char *argv[])
QObject::connect(&w, &MainWindow::sigEditProfiles, [&cameras, &w](){showProfileDialog(&cameras); w.refreshProfiles();}); QObject::connect(&w, &MainWindow::sigEditProfiles, [&cameras, &w](){showProfileDialog(&cameras); w.refreshProfiles();});
QObject::connect(&pipe, &ImagePipeline::sigResult, w.mainImageViewer(), &CvImageViewer::setImage, Qt::QueuedConnection); QObject::connect(&pipe, &ImagePipeline::sigResult, w.mainImageViewer(), &CvImageViewer::setImage, Qt::QueuedConnection);
QObject::connect(&pipe, &ImagePipeline::sigResult, [&w](){w->statusMsg("idle");}); QObject::connect(&pipe, &ImagePipeline::sigResult, [&w](){w.statusMsg("idle");});
QObject::connect(&pipe, &ImagePipeline::sigInvalidProfile, &w, &MainWindow::profileInconpatible); QObject::connect(&pipe, &ImagePipeline::sigInvalidProfile, &w, &MainWindow::profileInconpatible);
QObject::connect(&w, &MainWindow::sigProfile, [&pipe](QString name) QObject::connect(&w, &MainWindow::sigProfile, [&pipe](QString name)