Subversion Repositories seema-scanner

Rev

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

Rev 144 Rev 148
Line 54... Line 54...
54 
 
 54 
 
55 
    // Start capturing
 55 
    // Start capturing
56 
    QMetaObject::invokeMethod(captureWorker, "setup");
 56 
    QMetaObject::invokeMethod(captureWorker, "setup");
57 
    QMetaObject::invokeMethod(captureWorker, "doWork");
 57 
    QMetaObject::invokeMethod(captureWorker, "doWork");
58 
 
 58 
 
- 
 
 59 
 
- 
 
 60 
//ui->captureCamera0ScrollArea->setWidget(ui->captureCamera0Widget);
- 
 
 61 
 
59 
}
 62 
}
60 
 
 63 
 
61 
void SMScanner::onReceiveFrame(unsigned int camId, cv::Mat frame){
 64 
void SMScanner::onReceiveFrame(unsigned int camId, cv::Mat frame){
62 
 
 65 
 
63 
    if(camId == 0){
 66 
    if(camId == 0){
Line 532... Line 535...
532 
    reconstructionWorkerThread->setObjectName("reconstructionWorkerThread");
 535 
    reconstructionWorkerThread->setObjectName("reconstructionWorkerThread");
533 
    reconstructionWorker->moveToThread(reconstructionWorkerThread);
 536 
    reconstructionWorker->moveToThread(reconstructionWorkerThread);
534 
    reconstructionWorkerThread->start();
 537 
    reconstructionWorkerThread->start();
535 
 
 538 
 
536 
    // Connections
 539 
    // Connections
537 
    connect(reconstructionWorker, SIGNAL(newPointCloud(SMPointCloud)), this, SLOT(onNewPointCloud(SMPointCloud)));
 540 
    connect(reconstructionWorker, SIGNAL(newPointCloud(SMPointCloud)), this, SLOT(onReceivePointCloud(SMPointCloud)));
538 
    connect(reconstructionWorker, SIGNAL(done()), reconstructionWorkerThread, SLOT(quit()));
 541 
    connect(reconstructionWorker, SIGNAL(done()), reconstructionWorkerThread, SLOT(quit()));
539 
    connect(reconstructionWorker, SIGNAL(done()), reconstructionWorker, SLOT(deleteLater()));
 542 
    connect(reconstructionWorker, SIGNAL(done()), reconstructionWorker, SLOT(deleteLater()));
540 
 
 543 
 
541 
    // Start reconstructing
 544 
    // Start reconstructing
542 
    QMetaObject::invokeMethod(reconstructionWorker, "setup");
 545 
    QMetaObject::invokeMethod(reconstructionWorker, "setup");
Line 548... Line 551...
548 
        }
 551 
        }
549 
    }
 552 
    }
550 
 
 553 
 
551 
}
 554 
}
552 
 
 555 
 
553 
void SMScanner::onNewPointCloud(SMPointCloud smCloud){
 556 
void SMScanner::onReceivePointCloud(SMPointCloud smCloud){
554 
 
 557 
 
555 
    int id = smCloud.id;
 558 
    int id = smCloud.id;
556 
 
 559 
 
557 
//    for(int i=0; i<captureData.size(); i++){
 560 
//    for(int i=0; i<captureData.size(); i++){
558 
//        if(captureData[i].id == id)
 561 
//        if(captureData[i].id == id)
Line 560... Line 563...
560 
//    }
 563 
//    }
561 
 
 564 
 
562 
    pointCloudData.push_back(smCloud);
 565 
    pointCloudData.push_back(smCloud);
563 
 
 566 
 
564 
    // Add identifier to list
 567 
    // Add identifier to list
565 
    QListWidgetItem* item = new QListWidgetItem(QString("Point Cloud %1 -- %2 deg").arg(id).arg(smCloud.rotationAngle), ui->pointCloudsListWidget);
 568 
    QListWidgetItem* item = new QListWidgetItem(QString("Point Cloud %1 -- %2 deg").arg(id).arg(smCloud.rotationAngle));
566 
    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
 569 
    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
567 
    item->setData(Qt::UserRole, QVariant(id));
 570 
    item->setData(Qt::UserRole, QVariant(id));
568 
    item->setCheckState(Qt::Checked);
 571 
    item->setCheckState(Qt::Checked);
569 
 
 572 
 
570 
    ui->pointCloudsListWidget->addItem(item);
 573 
    ui->pointCloudsListWidget->addItem(item);
571 
 
 - 
 
572 
//    ui->pointCloudWidget->addPointCloud(smCloud, id);
 574 
ui->pointCloudWidget->addPointCloud(smCloud, id);
573 
}
 575 
}
574 
 
 576 
 
575 
 
 577 
 
576 
 
 578 
 
577 
void SMScanner::on_actionExport_Point_Clouds_triggered(){
 579 
void SMScanner::on_actionExport_Point_Clouds_triggered(){