Subversion Repositories seema-scanner

Rev

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

Rev 225 Rev 228
Line 285... Line 285...
285
            cv::cvtColor(frame, frameResult, CV_BayerBG2RGB);
285
            cv::cvtColor(frame, frameResult, CV_BayerBG2RGB);
286
        else
286
        else
287
            frameResult = frame.clone();
287
            frameResult = frame.clone();
288
 
288
 
289
        cvtools::drawChessboardCorners(frameResult, checkerCount, qc, success, 10);
289
        cvtools::drawChessboardCorners(frameResult, checkerCount, qc, success, 10);
-
 
290
    } else {
-
 
291
        qc.clear();
290
    }
292
    }
291
    return success;
293
    return success;
292
}
294
}
293
 
295
 
294
void SMCalibrationWorker::checkerboardDetection(SMCalibrationSet calibrationSet){
296
void SMCalibrationWorker::checkerboardDetection(SMCalibrationSet calibrationSet){
295
 
297
 
296
    QSettings settings;
298
    QSettings settings;
297
    cv::Size checkerCount(cv::Size(settings.value("calibration/patternSizeX", 22).toInt(), settings.value("calibration/patternSizeY", 13).toInt()));
299
    cv::Size checkerCount(cv::Size(settings.value("calibration/patternSizeX", 22).toInt(), settings.value("calibration/patternSizeY", 13).toInt()));
298
 
300
 
299
    bool success0 = detectCheckerBoardCorners(checkerCount, calibrationSet.frame0, calibrationSet.frame0Result, calibrationSet.qc0);
301
    bool success0 = detectCheckerBoardCorners(checkerCount, calibrationSet.frame0, calibrationSet.frame0Result, calibrationSet.qc0);
300
    if(!success0)
302
    if(!success0){
-
 
303
//        calibrationSet.qc0.clear();
301
        emit logMessage(QString("Could not detect checkerboard on set %1 camera0").arg(calibrationSet.id));
304
        emit logMessage(QString("Could not detect checkerboard on set %1 camera0").arg(calibrationSet.id));
-
 
305
    }
302
 
306
 
303
    bool success1 = detectCheckerBoardCorners(checkerCount, calibrationSet.frame1, calibrationSet.frame1Result, calibrationSet.qc1);
307
    bool success1 = detectCheckerBoardCorners(checkerCount, calibrationSet.frame1, calibrationSet.frame1Result, calibrationSet.qc1);
304
    if(!success1)
308
    if(!success1){
-
 
309
//        calibrationSet.qc1.clear();
305
        emit logMessage(QString("Could not detect checkerboard on set %1 camera1").arg(calibrationSet.id));
310
        emit logMessage(QString("Could not detect checkerboard on set %1 camera1").arg(calibrationSet.id));
-
 
311
    }
306
 
312
 
307
    emit newCheckerboardResult(calibrationSet.id, calibrationSet);
313
    emit newCheckerboardResult(calibrationSet.id, calibrationSet);
308
 
314
 
309
}
315
}
310
 
316