Subversion Repositories seema-scanner

Rev

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

Rev 217 Rev 222
Line 279... Line 279...
279
    // if selection is just cleared
279
    // if selection is just cleared
280
    if(ui->calibrationListWidget->selectedItems().empty())
280
    if(ui->calibrationListWidget->selectedItems().empty())
281
        return;
281
        return;
282
 
282
 
283
    // clamp to available range
283
    // clamp to available range
284
    assert(ui->calibrationListWidget->currentRow() >= 0
284
    if(ui->calibrationListWidget->currentRow() < 0)
-
 
285
        return;
285
           && ui->calibrationListWidget->currentRow() < calibrationData.size());
286
    assert(ui->calibrationListWidget->currentRow() < calibrationData.size());
286
    int currentRow = std::min(int(calibrationData.size())-1,
287
    int currentRow = std::min(int(calibrationData.size())-1,
287
                              std::max(0, ui->calibrationListWidget->currentRow()));
288
                              std::max(0, ui->calibrationListWidget->currentRow()));
288
 
289
 
289
    calibrationReviewMode = true;
290
    calibrationReviewMode = true;
290
    ui->singleCalibrationButton->setText("Live View");
291
    ui->singleCalibrationButton->setText("Live View");
291
    ui->batchCalibrationButton->setText("Live View");
292
    ui->batchCalibrationButton->setText("Live View");
292
 
293
 
293
    if(!calibrationData[currentRow].frame0Result.empty())
294
    if(calibrationData[currentRow].frame0Result.empty())
294
        ui->calibrationCamera0Widget->showImageCV(calibrationData[currentRow].frame0Result);
-
 
295
    else
-
 
296
        ui->calibrationCamera0Widget->showImageCV(calibrationData[currentRow].frame0);
295
        ui->calibrationCamera0Widget->showImageCV(calibrationData[currentRow].frame0);
297
 
-
 
298
    if(!calibrationData[currentRow].frame1Result.empty())
-
 
299
        ui->calibrationCamera1Widget->showImageCV(calibrationData[currentRow].frame1Result);
-
 
300
    else
296
    else
-
 
297
        ui->calibrationCamera0Widget->showImageCV(calibrationData[currentRow].frame0Result);
-
 
298
 
-
 
299
    if(calibrationData[currentRow].frame1Result.empty())
301
        ui->calibrationCamera1Widget->showImageCV(calibrationData[currentRow].frame1);
300
        ui->calibrationCamera1Widget->showImageCV(calibrationData[currentRow].frame1);
-
 
301
    else
-
 
302
        ui->calibrationCamera1Widget->showImageCV(calibrationData[currentRow].frame1Result);
302
 
303
 
303
//     std::cout << "on_calibrationListWidget_itemSelectionChanged" << std::endl;
304
//     std::cout << "on_calibrationListWidget_itemSelectionChanged" << std::endl;
304
}
305
}
305
 
306
 
306
void SMScanner::onCalibrationFrameResult(int idx, int camID, bool success, cv::Mat result){
307
void SMScanner::onCalibrationFrameResult(int idx, int camID, bool success, cv::Mat result){