Subversion Repositories seema-scanner

Rev

Rev 245 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 245 Rev 255
Line 67... Line 67...
67 
    rotationStage.reset(new RotationStage());
 67 
    rotationStage.reset(new RotationStage());
68 
 
 68 
 
69 
    // Create Algorithm
 69 
    // Create Algorithm
70 
    unsigned int screenCols, screenRows;
 70 
    unsigned int screenCols, screenRows;
71 
    projector->getScreenRes(&screenCols, &screenRows);
 71 
    projector->getScreenRes(&screenCols, &screenRows);
- 
 
 72 
    std::cout << "Screen res: " << screenCols << " x " << screenRows << std::endl;
72 
    codec = settings.value("algorithm", "GrayCode").toString();
 73 
    codec = settings.value("algorithm", "GrayCode").toString();
73 
    if(codec == "GrayCode")
 74 
    if(codec == "GrayCode")
74 
        algorithm.reset(new AlgorithmGrayCode(screenCols, screenRows));
 75 
        algorithm.reset(new AlgorithmGrayCode(screenCols, screenRows));
75 
    else if(codec == "GrayCodeHorzVert")
 76 
    else if(codec == "GrayCodeHorzVert")
76 
        algorithm.reset(new AlgorithmGrayCodeHorzVert(screenCols, screenRows));
 77 
        algorithm.reset(new AlgorithmGrayCodeHorzVert(screenCols, screenRows));
Line 316... Line 317...
316 
    int nShutters = shutters.size();
 317 
    int nShutters = shutters.size();
317 
 
 318 
 
318 
    CameraSettings cameraSettings;
 319 
    CameraSettings cameraSettings;
319 
 
 320 
 
320 
    for(int i=0; i<nShutters; i++){
 321 
    for(int i=0; i<nShutters; i++){
- 
 
 322 
        std::cout << "Acquiring HDR frame sequence "
- 
 
 323 
                  << i + 1 << "/" << nShutters << std::endl;
- 
 
 324 
        std::cout << "Shutter time [ms] "
- 
 
 325 
                  << shutters[i] << std::endl;
321 
 
 326 
 
322 
        // Set camera shutter
 327 
        // Set camera shutter
323 
        cameraSettings.shutter = shutters[i];
 328 
        cameraSettings.shutter = shutters[i];
324 
 
 329 
 
325 
        // assert that shutter is given in ms
 330 
        // assert that shutter is given in ms
Line 357... Line 362...
357 
        rotateTo(angle);
 362 
        rotateTo(angle);
358 
 
 363 
 
359 
    SMFrameSequence frameSequence;
 364 
    SMFrameSequence frameSequence;
360 
 
 365 
 
361 
    QSettings settings;
 366 
    QSettings settings;
362 
    if(settings.contains("camera/shuttersHDR"))
 367 
    bool HDR = settings.value("camera/shuttersHDR").toString() != QString("");
- 
 
 368 
    if(HDR)
363 
        acquireFrameSequenceHDR(frameSequence);
 369 
        acquireFrameSequenceHDR(frameSequence);
364 
    else
 370 
    else
365 
        acquireFrameSequenceLDR(frameSequence);
 371 
        acquireFrameSequenceLDR(frameSequence);
366 
 
 372 
 
367 
 
 373