Subversion Repositories seema-scanner

Rev

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

Rev 223 Rev 226
Line 51... Line 51...
51 
    //int screenNum = settings.value("projector/screenNumber", -1).toInt();
 51 
    //int screenNum = settings.value("projector/screenNumber", -1).toInt();
52 
    int screenNum = settings.value("projector/screenNumber", 1).toInt();
 52 
    int screenNum = settings.value("projector/screenNumber", 1).toInt();
53 
    if(screenNum != -1)
 53 
    if(screenNum != -1)
54 
        projector.reset(new ProjectorOpenGL(screenNum));
 54 
        projector.reset(new ProjectorOpenGL(screenNum));
55 
 
 55 
 
56 
    // Create rotation stage
 56 
//    // Create rotation stage
57 
    for(int i = 0; i<10; i++){
 57 
//    for(int i = 0; i<10; i++){
58 
        try{
 58 
//        try{
59 
            delete rotationStage.get();
 59 
//            delete rotationStage.get();
60 
            rotationStage = std::make_shared<RotationStage>();
 60 
//            rotationStage = std::make_shared<RotationStage>();
61 
            break;
 61 
//            break;
62 
        }
 62 
//        }
63 
        catch (...){
 63 
//        catch (...){
64 
            std::cerr << "trying to setup rotation stage" << std::endl;
 64 
//            std::cerr << "trying to setup rotation stage" << std::endl;
65 
        }
 65 
//        }
66 
    }
 66 
//    }
- 
 
 67 
    rotationStage.reset();
- 
 
 68 
    rotationStage.reset(new RotationStage());
67 
 
 69 
 
68 
    // Create Algorithm
 70 
    // Create Algorithm
69 
    unsigned int screenCols, screenRows;
 71 
    unsigned int screenCols, screenRows;
70 
    projector->getScreenRes(&screenCols, &screenRows);
 72 
    projector->getScreenRes(&screenCols, &screenRows);
71 
    codec = settings.value("algorithm", "GrayCode").toString();
 73 
    codec = settings.value("algorithm", "GrayCode").toString();