Subversion Repositories seema-scanner

Rev

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

Rev 225 Rev 226
Line 439... Line 439...
439
    ui->singleCaptureButton->setText("Live View");
439
    ui->singleCaptureButton->setText("Live View");
440
    ui->batchCaptureButton->setText("Live View");
440
    ui->batchCaptureButton->setText("Live View");
441
 
441
 
442
    QPoint idx = item->data(0, Qt::UserRole).toPoint();
442
    QPoint idx = item->data(0, Qt::UserRole).toPoint();
443
 
443
 
444
    if( idx.y() != -1 && idx.x()>=0 && idx.x()<captureData.size()
444
    if( idx.y() != -1 && idx.x()>=0 && idx.x()<(int)captureData.size()
445
            && idx.y()<captureData[idx.x()].frames0.size()
445
            && idx.y()<(int)captureData[idx.x()].frames0.size()
446
            && idx.y()<captureData[idx.x()].frames1.size() ){
446
            && idx.y()<(int)captureData[idx.x()].frames1.size() ){
447
        // TODO idx.x() can & WILL be out of bounds
447
        // TODO idx.x() can & WILL be out of bounds
448
        ui->captureCamera0Widget->showImageCV(captureData[idx.x()].frames0[idx.y()]);
448
        ui->captureCamera0Widget->showImageCV(captureData[idx.x()].frames0[idx.y()]);
449
        ui->captureCamera1Widget->showImageCV(captureData[idx.x()].frames1[idx.y()]);
449
        ui->captureCamera1Widget->showImageCV(captureData[idx.x()].frames1[idx.y()]);
450
    }
450
    }
451
 
451
 
Line 662... Line 662...
662
}
662
}
663
 
663
 
664
void SMScanner::on_pointCloudsListWidget_itemChanged(QListWidgetItem *item){
664
void SMScanner::on_pointCloudsListWidget_itemChanged(QListWidgetItem *item){
665
 
665
 
666
    int id = item->data(Qt::UserRole).toInt();
666
    int id = item->data(Qt::UserRole).toInt();
667
    assert(pointCloudData.size()>id);
667
    assert((int)pointCloudData.size()>id);
668
 
668
 
669
    if(item->checkState() == Qt::Checked){
669
    if(item->checkState() == Qt::Checked){
670
        id = std::min(int(pointCloudData.size())-1,std::max(0,id));// clamp range
670
        id = std::min(int(pointCloudData.size())-1,std::max(0,id));// clamp range
671
        ui->pointCloudWidget->addPointCloud(pointCloudData[id], id);
671
        ui->pointCloudWidget->addPointCloud(pointCloudData[id], id);
672
    }
672
    }
Line 891... Line 891...
891
        else
891
        else
892
            calibrationData[i].selected = false;
892
            calibrationData[i].selected = false;
893
    }
893
    }
894
 
894
 
895
    logDialog.show();
895
    logDialog.show();
-
 
896
    logDialog.activateWindow();
896
 
897
 
897
    // start calibration
898
    // start calibration
898
    QMetaObject::invokeMethod(calibrationWorker, "rotationStageCalibration", Q_ARG(std::vector<SMCalibrationSet>, calibrationData));
899
    QMetaObject::invokeMethod(calibrationWorker, "rotationStageCalibration", Q_ARG(std::vector<SMCalibrationSet>, calibrationData));
899
 
900
 
900
}
901
}
901
 
902
 
902
 
903
 
903
void SMScanner::on_actionView_Log_Messages_triggered()
904
void SMScanner::on_actionView_Log_Messages_triggered()
904
{
905
{
905
     logDialog.show();
906
     logDialog.show();
-
 
907
     logDialog.activateWindow();
906
}
908
}