Some Cleanup

This commit is contained in:
Hiro Protagonist 2017-04-05 18:54:28 +12:00
parent cd5152f113
commit 47073a8eb4
6 changed files with 5 additions and 8 deletions

View file

@ -79,7 +79,7 @@ class CameraManager : public QObject {
void cameraConnected();
void cameraDisconnected( bool current );
void captureError( FlyCapture2::Error err );
void captureError( QString err );
};
#endif // CAMERAMANAGER_H

View file

@ -11,7 +11,7 @@ void ImageGrabber::run() {
err = cam->RetrieveBuffer( &tmp );
if ( err != FlyCapture2::PGRERROR_OK )
emit captureError( err );
emit captureError( err.GetDescription() );
if ( !capture ) {
delete stored_img;

View file

@ -21,7 +21,7 @@ class ImageGrabber : public QThread {
signals:
void imageCaptured( FlyCapture2::Image * image );
void captureError( FlyCapture2::Error err );
void captureError( QString err );
public slots:
void stopCapturing();

View file

@ -4,9 +4,6 @@
int main( int argc, char * argv[] ) {
QApplication a( argc, argv );
qRegisterMetaType<FlyCapture2::Error>();
MainWindow w;
w.show();

View file

@ -471,7 +471,7 @@ void MainWindow::frameSaved( FlyCapture2::Image * image ) {
m.unlock();
}
void MainWindow::handleCaptureError( FlyCapture2::Error err ) {
void MainWindow::handleCaptureError( QString err ) {
showError( err );
try {

View file

@ -73,7 +73,7 @@ class MainWindow : public QMainWindow {
void cameraSelected( int index );
void frameCaptured( FlyCapture2::Image * image );
void frameSaved( FlyCapture2::Image * image );
void handleCaptureError( FlyCapture2::Error err );
void handleCaptureError( QString err );
void handleWriteError( FlyCapture2::Error err );
void fit();