WebSVN – seema-scanner – Diff – /src/algorithm/AlgorithmPhaseShift.cpp

 #ifndef M_PI
     #define M_PI 3.14159265358979323846
 #endif
 static unsigned int nSteps = 20; // number of shifts/steps in primary
-static float pPrimary = 200; // primary period
+static float pPrimary = 64; // primary period
 // Algorithm
 static cv::Mat computePhaseVector(unsigned int length, float phase, float pitch){
     cv::Mat phaseVector(length, 1, CV_8UC3);
+}
 AlgorithmPhaseShift::AlgorithmPhaseShift(unsigned int _screenCols, unsigned int _screenRows) : Algorithm(_screenCols, _screenRows){
     // Set N
-    N = 2+nSteps+3;
+    N = 2+2*nSteps;
     // Determine the secondary (wider) period
     float pSecondary = (screenCols*pPrimary)/(screenCols-pPrimary);
     // all on pattern
         patternI = computePhaseVector(screenCols, phase, pitch);
         patterns.push_back(patternI.t());
+    }
     // Secondary encoding patterns
-    for(unsigned int i=0; i<3; i++){
+    for(unsigned int i=0; i<nSteps; i++){
-        float phase = 2.0*pi/3 * i;
+        float phase = 2.0*pi/nSteps * i;
         float pitch = pSecondary;
         cv::Mat patternI(1,1,CV_8U);
         patternI = computePhaseVector(screenCols, phase, pitch);
         patterns.push_back(patternI.t());
+    }
         cv::cvtColor(frames1[i], frames1Gray[i], CV_RGB2GRAY);
+    }
     // Decode camera0
     std::vector<cv::Mat> frames0Primary(frames0Gray.begin()+2, frames0Gray.begin()+2+nSteps);
-    std::vector<cv::Mat> frames0Secondary(frames0Gray.begin()+2+nSteps, frames0Gray.begin()+2+nSteps+3);
+    std::vector<cv::Mat> frames0Secondary(frames0Gray.begin()+2+nSteps, frames0Gray.begin()+2+2*nSteps);
-    std::vector<cv::Mat> F0Enc = getDFTComponents(frames0Primary);
+    std::vector<cv::Mat> F0Primary = getDFTComponents(frames0Primary);
     cv::Mat up0Primary;
-    cv::phase(F0Enc[2], -F0Enc[3], up0Primary);
+    cv::phase(F0Primary[2], -F0Primary[3], up0Primary);
-    cv::Mat up0Secondary = getPhase(frames0Secondary[0], frames0Secondary[1], frames0Secondary[2]);
+    //cv::Mat up0Secondary = getPhase(frames0Secondary[0], frames0Secondary[1], frames0Secondary[2]);
+    std::vector<cv::Mat> F0Secondary = getDFTComponents(frames0Secondary);
+    cv::Mat up0Secondary;
+    cv::phase(F0Secondary[2], -F0Secondary[3], up0Secondary);
     cv::Mat up0Equivalent = up0Primary - up0Secondary;
     up0Equivalent = cvtools::modulo(up0Equivalent, 2*pi);
     cv::Mat up0 = unwrapWithCue(up0Primary, up0Equivalent, (float)screenCols/pPrimary);
     up0 *= screenCols/(2*pi);
     // Decode camera1
     std::vector<cv::Mat> frames1Primary(frames1Gray.begin()+2, frames1Gray.begin()+2+nSteps);
-    std::vector<cv::Mat> frames1Secondary(frames1Gray.begin()+2+nSteps, frames1Gray.begin()+2+nSteps+3);
+    std::vector<cv::Mat> frames1Secondary(frames1Gray.begin()+2+nSteps, frames1Gray.begin()+2+2*nSteps);
-    std::vector<cv::Mat> F1Enc = getDFTComponents(frames1Primary);
+    std::vector<cv::Mat> F1Primary = getDFTComponents(frames1Primary);
     cv::Mat up1Primary;
-    cv::phase(F1Enc[2], -F1Enc[3], up1Primary);
+    cv::phase(F1Primary[2], -F1Primary[3], up1Primary);
-    cv::Mat up1Secondary = getPhase(frames1Secondary[0], frames1Secondary[1], frames1Secondary[2]);
+    //cv::Mat up1Secondary = getPhase(frames1Secondary[0], frames1Secondary[1], frames1Secondary[2]);
+    std::vector<cv::Mat> F1Secondary = getDFTComponents(frames1Secondary);
+    cv::Mat up1Secondary;
+    cv::phase(F1Secondary[2], -F1Secondary[3], up1Secondary);
     cv::Mat up1Equivalent = up1Primary - up1Secondary;
     up1Equivalent = cvtools::modulo(up1Equivalent, 2*pi);
     cv::Mat up1 = unwrapWithCue(up1Primary, up1Equivalent, (float)screenCols/pPrimary);
     up1 *= screenCols/(2*pi);
+                }
+            }
+        }
+    }
-    // camera1 against camera0
+//    // camera1 against camera0
-    for(int row=0; row<frameRectRows; row++){
+//    for(int row=0; row<frameRectRows; row++){
-        for(int col=0; col<frameRectCols; col++){
+//        for(int col=0; col<frameRectCols; col++){
-            if(!occlusion1Rect.at<char>(row,col))
+//            if(!occlusion1Rect.at<char>(row,col))
-                continue;
+//                continue;
-            float up1i = up1Rect.at<float>(row,col);
+//            float up1i = up1Rect.at<float>(row,col);
-            for(int col0=0; col0<up0Rect.cols-1; col0++){
+//            for(int col0=0; col0<up0Rect.cols-1; col0++){
-                if(!occlusion0Rect.at<char>(row,col0) || !occlusion0Rect.at<char>(row,col0+1))
+//                if(!occlusion0Rect.at<char>(row,col0) || !occlusion0Rect.at<char>(row,col0+1))
-                    continue;
+//                    continue;
-                float up0Left = up0Rect.at<float>(row,col0);
+//                float up0Left = up0Rect.at<float>(row,col0);
-                float up0Right = up0Rect.at<float>(row,col0+1);
+//                float up0Right = up0Rect.at<float>(row,col0+1);
-                if((up0Left <= up1i) && (up1i <= up0Right) && (up1i-up0Left < 1) && (up0Right-up1i < 1)){
+//                if((up0Left <= up1i) && (up1i <= up0Right) && (up1i-up0Left < 1) && (up0Right-up1i < 1)){
-                    float col0i = col0 + (up1i-up0Left)/(up0Right-up0Left);
+//                    float col0i = col0 + (up1i-up0Left)/(up0Right-up0Left);
-                    q1Rect.push_back(cv::Point2f(col, row));
+//                    q1Rect.push_back(cv::Point2f(col, row));
-                    q0Rect.push_back(cv::Point2f(col0i, row));
+//                    q0Rect.push_back(cv::Point2f(col0i, row));
-                    break;
+//                    break;
-                }
+//                }
-            }
+//            }
-        }
+//        }
-    }
+//    }
     int nMatches = q0Rect.size();
     if(nMatches < 1){
         Q.resize(0);

Subversion Repositories seema-scanner

(root)/src/algorithm/AlgorithmPhaseShift.cpp – Rev 74 → 76