WebSVN – seema-scanner – Diff – /src/SMCaptureWorker.cpp

     int screenNum = settings.value("projector/screenNumber", 1).toInt();
     if(screenNum != -1)
         projector.reset(new ProjectorOpenGL(screenNum));
     // Create rotation stage
-    for(int i = 0; i<100; i++){
+    for(int i = 0; i<10; i++){
         try{
+            delete rotationStage.get();
-            rotationStage.reset(new RotationStage);
+            rotationStage = std::make_shared<RotationStage>();
             break;
+        }
-        catch (std::exception e){
+        catch (...){
             std::cerr << "trying to setup rotation stage" << std::endl;
+        }
+    }
     // Create Algorithm
     emit finished();
+}
 void SMCaptureWorker::rotateTo(float angle){
-    if(!setupSuccessful)
+    // TODO is this the right check
+    if(!setupSuccessful || !rotationStage || !rotationStage->Handle)
         return;
-    if(rotationStage->Handle)// TODO is this the right check
-        rotationStage->moveAbsolute(angle);
+    rotationStage->moveAbsolute(angle);
     while(rotationStage->isMoving()){
         // prevent grab timeout in flycapture
         QTest::qSleep(10);
     emit rotatedTo(angle);
+}
 void SMCaptureWorker::acquireCalibrationSet(float angle){
-    if(!setupSuccessful)
+    if(!setupSuccessful || !rotationStage || !rotationStage->Handle)
         return;
     if(angle != -1.0)
         rotateTo(angle);
         frameSequence.frames0.push_back(frameCVStacked0);
         frameSequence.frames1.push_back(frameCVStacked1);
+    }
-    if(rotationStage->Handle)// TODO is this the right check
+    if(rotationStage && rotationStage->Handle)// TODO is this the right check
         frameSequence.rotationAngle = rotationStage->getAngle();
     else
         frameSequence.rotationAngle = 0;
     frameSequence.codec = codec;

Subversion Repositories seema-scanner

(root)/src/SMCaptureWorker.cpp @ 208 – Rev 208 → 223