Subversion Repositories seema-scanner

Rev

Rev 73 | Rev 75 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 73 Rev 74
Line 70... Line 70...
70 
    }
 70 
    }
71 
}
 71 
}
72 
 
 72 
 
73 
void SMScanner::on_actionPreferences_triggered(){
 73 
void SMScanner::on_actionPreferences_triggered(){
74 
 
 74 
 
75 
//    connect(&preferenceDialog, SIGNAL(accepted()), this, SLOT(onPreferencesChanged()));
 75 
    connect(&preferenceDialog, SIGNAL(accepted()), this, SLOT(onPreferencesChanged()));
76 
 
 76 
 
77 
    preferenceDialog.show();
 77 
    preferenceDialog.show();
78 
}
 78 
}
79 
 
 79 
 
80 
void SMScanner::onPreferencesChanged(){
 80 
void SMScanner::onPreferencesChanged(){
81 
 
 81 
 
82 
    // Stop capturing thread
 82 
//    // Stop capturing thread
83 
    connect(captureWorker, SIGNAL(finished()), captureWorker, SLOT(deleteLater()));
 83 
//    connect(captureWorker, SIGNAL(finished()), captureWorker, SLOT(deleteLater()));
84 
    connect(captureWorker, SIGNAL(finished()), captureWorkerThread, SLOT(quit()));
 84 
//    connect(captureWorker, SIGNAL(finished()), captureWorkerThread, SLOT(quit()));
85 
    QMetaObject::invokeMethod(captureWorker, "stopWork");
 85 
//    QMetaObject::invokeMethod(captureWorker, "stopWork");
86 
    captureWorkerThread->quit();
 86 
//    captureWorkerThread->quit();
87 
    captureWorkerThread->wait();
 87 
//    captureWorkerThread->wait();
88 
 
 88 
 
89 
    // Restart capturing thread
 89 
//    // Restart capture worker
- 
 
 90 
//    captureWorker = new SMCaptureWorker;
- 
 
 91 
//    captureWorkerThread = new QThread(this);
- 
 
 92 
//    captureWorkerThread->setObjectName("captureWorkerThread");
- 
 
 93 
//    captureWorker->moveToThread(captureWorkerThread);
- 
 
 94 
//    captureWorkerThread->start();
- 
 
 95 
 
- 
 
 96 
//    connect(captureWorker, SIGNAL(newFrame(unsigned int, cv::Mat)), this, SLOT(onReceiveFrame(unsigned int, cv::Mat)));
- 
 
 97 
//    connect(captureWorker, SIGNAL(newCalibrationSet(SMCalibrationSet)), this, SLOT(onReceiveCalibrationSet(SMCalibrationSet)));
- 
 
 98 
//    connect(captureWorker, SIGNAL(newFrameSequence(SMFrameSequence)), this, SLOT(onReceiveFrameSequence(SMFrameSequence)));
- 
 
 99 
//    connect(captureWorker, SIGNAL(rotatedTo(float)), this, SLOT(onReceiveRotatedTo(float)));
- 
 
 100 
 
90 
    QMetaObject::invokeMethod(captureWorker, "setup");
 101 
//    QMetaObject::invokeMethod(captureWorker, "setup");
91 
    QMetaObject::invokeMethod(captureWorker, "doWork");
 102 
//    QMetaObject::invokeMethod(captureWorker, "doWork");
- 
 
 103 
 
- 
 
 104 
    QMessageBox::warning(this, "Information", "You must quit and restart the program for new settings to take effect!", QMessageBox::Ok);
92 
 
 105 
 
93 
}
 106 
}
94 
 
 107 
 
95 
void SMScanner::closeEvent(QCloseEvent *event){
 108 
void SMScanner::closeEvent(QCloseEvent *event){
96 
 
 109