Subversion Repositories seema-scanner

Rev

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

Rev 148 Rev 159
Line 184... Line 184...
184 
 
 184 
 
185 
    float angle = ui->calibrationRotationDial->value();
 185 
    float angle = ui->calibrationRotationDial->value();
186 
    std::cout << "Rotation stage target: " << angle << std::endl;
 186 
    std::cout << "Rotation stage target: " << angle << std::endl;
187 
    QMetaObject::invokeMethod(captureWorker, "rotateTo", Q_ARG(float, angle));
 187 
    QMetaObject::invokeMethod(captureWorker, "rotateTo", Q_ARG(float, angle));
188 
 
 188 
 
- 
 
 189 
    ui->calibrationRotationSpinBox->setValue(angle);
- 
 
 190 
 
- 
 
 191 
    ui->captureRotationDial->setValue(angle);
- 
 
 192 
    ui->captureRotationSpinBox->setValue(angle);
- 
 
 193 
}
- 
 
 194 
 
- 
 
 195 
 
- 
 
 196 
void SMScanner::on_calibrationRotationSpinBox_editingFinished(){
- 
 
 197 
 
189 
    ui->captureRotationDial->setValue(ui->calibrationRotationDial->value());
 198 
    float angle = ui->calibrationRotationSpinBox->value();
- 
 
 199 
    std::cout << "Rotation stage target: " << angle << std::endl;
- 
 
 200 
    QMetaObject::invokeMethod(captureWorker, "rotateTo", Q_ARG(float, angle));
- 
 
 201 
 
- 
 
 202 
    ui->calibrationRotationDial->setValue(angle);
- 
 
 203 
 
- 
 
 204 
    ui->captureRotationSpinBox->setValue(angle);
- 
 
 205 
    ui->captureRotationDial->setValue(angle);
190 
}
 206 
}
191 
 
 207 
 
192 
void SMScanner::onReceiveCalibrationSet(SMCalibrationSet calibrationSet){
 208 
void SMScanner::onReceiveCalibrationSet(SMCalibrationSet calibrationSet){
193 
 
 209 
 
194 
    int id = ui->calibrationListWidget->count();
 210 
    int id = ui->calibrationListWidget->count();
Line 293... Line 309...
293 
            calibrationData[idx].frame1Result = result;
 309 
            calibrationData[idx].frame1Result = result;
294 
    }
 310 
    }
295 
 
 311 
 
296 
}
 312 
}
297 
 
 313 
 
- 
 
 314 
void SMScanner::on_captureRotationDial_sliderReleased(){
- 
 
 315 
 
- 
 
 316 
    float angle = ui->captureRotationDial->value();
- 
 
 317 
    std::cout << "Rotation stage target: " << angle << std::endl;
- 
 
 318 
    QMetaObject::invokeMethod(captureWorker, "rotateTo", Q_ARG(float, angle));
- 
 
 319 
 
- 
 
 320 
    ui->captureRotationSpinBox->setValue(ui->captureRotationDial->value());
- 
 
 321 
 
- 
 
 322 
    ui->calibrationRotationDial->setValue(ui->captureRotationDial->value());
- 
 
 323 
    ui->calibrationRotationSpinBox->setValue(ui->captureRotationDial->value());
- 
 
 324 
}
- 
 
 325 
 
- 
 
 326 
void SMScanner::on_captureRotationSpinBox_editingFinished(){
- 
 
 327 
 
- 
 
 328 
    float angle = ui->captureRotationSpinBox->value();
- 
 
 329 
    std::cout << "Rotation stage target: " << angle << std::endl;
- 
 
 330 
    QMetaObject::invokeMethod(captureWorker, "rotateTo", Q_ARG(float, angle));
- 
 
 331 
 
- 
 
 332 
    ui->captureRotationDial->setValue(angle);
- 
 
 333 
 
- 
 
 334 
    ui->calibrationRotationSpinBox->setValue(angle);
- 
 
 335 
    ui->calibrationRotationDial->setValue(angle);
- 
 
 336 
}
- 
 
 337 
 
298 
void SMScanner::on_singleCaptureButton_clicked(){
 338 
void SMScanner::on_singleCaptureButton_clicked(){
299 
 
 339 
 
300 
    // If in review mode, go back to aquisition mode
 340 
    // If in review mode, go back to aquisition mode
301 
    if(captureReviewMode){
 341 
    if(captureReviewMode){
302 
        ui->captureTreeWidget->clearSelection();
 342 
        ui->captureTreeWidget->clearSelection();
Line 340... Line 380...
340 
    std::cout << " degrees" <<std::endl;
 380 
    std::cout << " degrees" <<std::endl;
341 
 
 381 
 
342 
    QMetaObject::invokeMethod(captureWorker, "acquireFrameSequences", Q_ARG(std::vector<float>, angles));
 382 
    QMetaObject::invokeMethod(captureWorker, "acquireFrameSequences", Q_ARG(std::vector<float>, angles));
343 
}
 383 
}
344 
 
 384 
 
345 
void SMScanner::on_captureRotationDial_sliderReleased(){
 - 
 
346 
 
 - 
 
347 
    float angle = ui->captureRotationDial->value();
 - 
 
348 
    std::cout << "Rotation stage target: " << angle << std::endl;
 - 
 
349 
    QMetaObject::invokeMethod(captureWorker, "rotateTo", Q_ARG(float, angle));
 - 
 
350 
 
 - 
 
351 
    ui->calibrationRotationDial->setValue(ui->captureRotationDial->value());
 - 
 
352 
}
 - 
 
353 
 
 - 
 
354 
void SMScanner::onReceiveFrameSequence(SMFrameSequence frameSequence){
 385 
void SMScanner::onReceiveFrameSequence(SMFrameSequence frameSequence){
355 
 
 386 
 
356 
    int id = lastCaptureId + 1;
 387 
    int id = lastCaptureId + 1;
357 
    lastCaptureId += 1;
 388 
    lastCaptureId += 1;
358 
 
 389 
 
Line 405... Line 436...
405 
 
 436 
 
406 
    // update ui with new position
 437 
    // update ui with new position
407 
    ui->calibrationRotationDial->setValue(angle);
 438 
    ui->calibrationRotationDial->setValue(angle);
408 
    ui->captureRotationDial->setValue(angle);
 439 
    ui->captureRotationDial->setValue(angle);
409 
 
 440 
 
- 
 
 441 
    ui->calibrationRotationSpinBox->setValue(angle);
- 
 
 442 
    ui->captureRotationSpinBox->setValue(angle);
410 
}
 443 
}
411 
 
 444 
 
412 
void SMScanner::on_actionExport_Sets_triggered(){
 445 
void SMScanner::on_actionExport_Sets_triggered(){
413 
 
 446 
 
414 
    QString dirName = QFileDialog::getExistingDirectory(this, "Export calibration sets", QString());
 447 
    QString dirName = QFileDialog::getExistingDirectory(this, "Export calibration sets", QString());
Line 822... Line 855...
822 
 
 855 
 
823 
        for(int i=0; i<captureData.size(); i++)
 856 
        for(int i=0; i<captureData.size(); i++)
824 
            captureData[i].reconstructed = false;
 857 
            captureData[i].reconstructed = false;
825 
    }
 858 
    }
826 
}
 859 
}
- 
 
 860