Subversion Repositories seema-scanner

Rev

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

Rev 247 Rev 249
Line 233... Line 233...
233 
}
 233 
}
234 
 
 234 
 
235 
void SMScanner::onReceiveCalibrationSet(SMCalibrationSet calibrationSet){
 235 
void SMScanner::onReceiveCalibrationSet(SMCalibrationSet calibrationSet){
236 
 
 236 
 
237 
    // Send to checkerboard detection on calibration thread
 237 
    // Send to checkerboard detection on calibration thread
- 
 
 238 
 
- 
 
 239 
    if(settings.value("calibration/method").toString() == "Charuco")
- 
 
 240 
        onReceiveCheckerboardResult(calibrationSet.id, calibrationSet);
- 
 
 241 
    else
238 
    QMetaObject::invokeMethod(calibrationWorker, "checkerboardDetection", Q_ARG(SMCalibrationSet, calibrationSet));
 242 
        QMetaObject::invokeMethod(calibrationWorker, "checkerboardDetection", Q_ARG(SMCalibrationSet, calibrationSet));
239 
 
 243 
 
240 
}
 244 
}
241 
 
 245 
 
242 
void SMScanner::on_calibrateCamerasButton_clicked(){
 246 
void SMScanner::on_calibrateCamerasButton_clicked(){
243 
 
 247 
 
Line 259... Line 263...
259 
    }
 263 
    }
260 
 
 264 
 
261 
    logDialog.show();
 265 
    logDialog.show();
262 
 
 266 
 
263 
    // start calibration
 267 
    // start calibration
- 
 
 268 
    QSettings settings;
- 
 
 269 
    if(settings.value("calibration/method").toString() == "Charuco")
- 
 
 270 
        QMetaObject::invokeMethod(calibrationWorker, "cameraCalibrationCharuco", Q_ARG(std::vector<SMCalibrationSet>, calibrationData));
- 
 
 271 
    else
264 
    QMetaObject::invokeMethod(calibrationWorker, "cameraCalibration", Q_ARG(std::vector<SMCalibrationSet>, calibrationData));
 272 
        QMetaObject::invokeMethod(calibrationWorker, "cameraCalibration", Q_ARG(std::vector<SMCalibrationSet>, calibrationData));
- 
 
 273 
 
265 
 
 274 
 
266 
}
 275 
}
267 
 
 276 
 
268 
void SMScanner::onReceiveCheckerboardResult(int idx, SMCalibrationSet calibrationSet){
 277 
void SMScanner::onReceiveCheckerboardResult(int idx, SMCalibrationSet calibrationSet){
269 
 
 278