hiro/Taevitas
1
0
Fork 0
mirror of https://github.com/vale981/Taevitas synced 2025-03-05 09:31:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

quit the thread right

Browse source
This commit is contained in:
Hiro Protagonist 2017-03-28 15:39:54 +13:00
parent 610e980ff8
commit cf3851d181
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mainwindow.cpp
View file

@ -39,9 +39,9 @@ MainWindow::MainWindow( QWidget * parent ) :
// TODO: Finish -> quit
// Move Recorder into another thread
QThread * t = new QThread();
recorder.moveToThread( t );
connect( t, &QThread::finished, t, &QThread::deleteLater );
capThread = new QThread();
recorder.moveToThread( capThread );
connect( capThread, &QThread::finished, t, &QThread::deleteLater );
// Initialize Image buffer.
image_buffer = new QVector<FlyCapture2::Image *>;
@ -81,10 +81,15 @@ MainWindow::~MainWindow() {
delete ui;
delete image_buffer;
if ( RECORDING )
startStopRecording();
capThread->quit();
capThread->wait();
}
void MainWindow::setStatus( STATUS status ) {
stopping = false;
this->status = status;
switch ( status ) {
case WAITING:
@ -111,7 +116,6 @@ void MainWindow::setStatus( STATUS status ) {
case STOPPING:
ui->startButton->setText( "Stopping..." );
disableRecOptions();
stopping = true;
break;
}
}
@ -355,7 +359,7 @@ void MainWindow::frameSaved( FlyCapture2::Image * image ) {
}
}
if ( stopping && image_buffer->empty() )
if ( status == STOPPING && image_buffer->empty() )
startStopRecording();
m.unlock();

4
src/mainwindow.h
View file

@ -42,7 +42,7 @@ class MainWindow : public QMainWindow {
CONNECTED,
RECORDING,
STOPPING
};
} status;
void setStatus( STATUS status );
@ -50,7 +50,7 @@ class MainWindow : public QMainWindow {
QVector<FlyCapture2::Image *> * image_buffer;
bool stopping;
QThread * capThread;
private slots:
// Fills Camera Combobox with Cameras