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

Revert "run splash on own thread"

Browse source 
This reverts commit 0f1a6f1ba0.
This commit is contained in:
uvos 2021-07-02 01:13:02 +02:00
parent 635514159c
commit ea3b870c0a
3 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cameras.cpp
View file

@ -3,8 +3,7 @@
#include <string>
#include <functional>
#include <QDebug>
#include <thread>
#include <chrono>
#include <unistd.h>
#include <QTimer>
Cameras::Cameras(uvosled* led): led_(led)
@ -81,7 +80,8 @@ bool Cameras::addCamera(const cam::Camera::Description& desc)
camera->cam()->setAcquisitionMode(cam::Camera::MODE_FREE);
camera->cam()->setFrameRate(10);
camera->cam()->startAcquisition();
std::this_thread::sleep_for (std::chrono::milliseconds(200));
struct timespec tv = {0, 200000000};
nanosleep(&tv, nullptr);
camera->cam()->stopAcquisition();
cameras_.pop_back();
camera = nullptr;
@ -97,7 +97,7 @@ bool Cameras::addCamera(const cam::Camera::Description& desc)
camera->cam()->setAcquisitionMode(cam::Camera::MODE_FREE);
camera->cam()->setFrameRate(10);
camera->cam()->startAcquisition();
QTimer::singleShot(5000, [this, camera](){finishAddCamera(camera);});
QTimer::singleShot(5000, [camera, this](){finishAddCamera(camera);});
}
else
{