Add test

Author: LaurentBerger

modules/ximgproc/samples/color_match_template.cpp

@@ -1,4 +1,5 @@
 #include <iostream>
+#include <fstream>
 #include <opencv2/core.hpp>
 #include <opencv2/core/utility.hpp>
 #include <opencv2/highgui.hpp>
@@ -52,23 +53,35 @@ static void UpdateThreshImage(int , void *r)
 
     imshow("Max Quaternion corr",dst);
 }
+vector<Vec4d> LectureFichier(string s)
+{
+    fstream f;
+    vector<Vec4d> q;
+    f.open(s, ios::in);
+    int nbQuat;
+    f >> nbQuat;
+    f >> nbQuat;
+    nbQuat = nbQuat * nbQuat;
+    for (int i = 0; i < nbQuat; i++)
+    {
+        Vec4d v;
+        f >> v[0] >> v[1] >> v[2] >> v[3];
+        q.push_back(v);
+    }
+    return q;
+}
+
+
 
 int main(int , char *[])
 {
-#define TESTMATCHING
-
-#ifdef TESTMATCHING
     Mat imgLogo = imread("g:/lib/opencv/samples/data/opencv-logo.png", IMREAD_COLOR);
-    Mat fruits = imread("g:/lib/opencv/samples/data/lena.jpg", IMREAD_COLOR);
-    fruits = fruits ;
-//    resize(fruits,fruits, Size(), 0.5, 0.5);
+    Mat imgColor = imread("g:/lib/opencv/samples/data/lena.jpg", IMREAD_COLOR);
+    // DUPLICATE OPENCV LOGO CHANGING COLOR
     Mat img,colorTemplate;
     imgLogo(Rect(0, 0, imgLogo.cols, 580)).copyTo(img);
     resize(img, colorTemplate, Size(), 0.05, 0.05);
     vector<Mat> colorMask(4);
-    inRange(colorTemplate, Vec3b(255, 255, 255), Vec3b(255, 255, 255), colorMask[0]);
-//    colorTemplate.setTo(Scalar(0,0,0), colorMask[0]);
-
     inRange(colorTemplate, Vec3b(255, 0, 0), Vec3b(255, 0, 0), colorMask[0]);
     inRange(colorTemplate, Vec3b(0, 255, 0), Vec3b(0,255,  0), colorMask[1]);
     inRange(colorTemplate, Vec3b( 0, 0,255), Vec3b( 0, 0,255), colorMask[2]);
@@ -86,24 +99,23 @@ int main(int , char *[])
         }
         else
             ps.pRef.push_back(p);
-        newLogo.copyTo(fruits(Rect(p.x, p.y, newLogo.cols, newLogo.rows)));
+        newLogo.copyTo(imgColor(Rect(p.x, p.y, newLogo.cols, newLogo.rows)));
 
     }
-#else
-    Mat fruits = imread("c2.png", IMREAD_COLOR);
-    Mat colorTemplate = imread("c1.png", IMREAD_COLOR);
-    Mat img= colorTemplate;
-#endif
-    imshow("Image", fruits);
+    imshow("Image", imgColor);
     imshow("opencv_logo", colorTemplate);
-
+    imwrite("g:/image.png", imgColor);
+    Mat colorRef(imgColor.size(), imgColor.type(),Scalar::all(0));
+    colorTemplate.copyTo(colorRef(Rect(0, 0, colorTemplate.cols, colorTemplate.rows)));
+    imwrite("g:/opencv_logo.png", colorRef);
     if (img.empty())
     {
         cout << "Cannot load image file\n";
         return 0;
     }
+    // OK NOW WHERE IS OPENCV LOGO ?
     Mat imgcorr;
-    ximgproc::colorMatchTemplate(fruits, colorTemplate, imgcorr);
+    ximgproc::colorMatchTemplate(imgColor, colorTemplate, imgcorr);
     imshow("quaternion correlation real", imgcorr);
     normalize(imgcorr, imgcorr,1,0,NORM_MINMAX);
     imgcorr.convertTo(ps.img, CV_8U, 255);
@@ -115,9 +127,6 @@ int main(int , char *[])
         code = waitKey(50);
     }
 
-    FileStorage fs("corr.yml", FileStorage::WRITE);
-    fs<<"Image"<< imgcorr;
-    fs.release();
     waitKey(0);
     return 0;
 }

modules/ximgproc/src/quaternion.cpp

@@ -15,7 +15,7 @@ void createQuaternionImage(InputArray _img, OutputArray _qimg)
     split(_img, plane);
     qplane[0] = Mat::zeros(_img.size(), CV_64FC1);
     for (int i = 0; i < cn; i++)
-        plane[i].convertTo(qplane[i + 1], CV_64F);
+        plane[i].convertTo(qplane[3-i], CV_64F);
     merge(qplane, _qimg);
 }
 
@@ -90,8 +90,8 @@ void qdft(InputArray _img, OutputArray _qimg, int  	flags, bool sideLeft)
     merge(vc2, c2);
     if (flags& DFT_INVERSE)
     {
-        dft(c1, C1, DFT_COMPLEX_OUTPUT | DFT_INVERSE);
-        dft(c2, C2, DFT_COMPLEX_OUTPUT | DFT_INVERSE);
+        dft(c1, C1, DFT_COMPLEX_OUTPUT | DFT_INVERSE|DFT_SCALE);
+        dft(c2, C2, DFT_COMPLEX_OUTPUT | DFT_INVERSE | DFT_SCALE);
     }
     else
     {

modules/ximgproc/test/test_matchcolortemplate.cpp

@@ -0,0 +1,65 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#include "test_precomp.hpp"
+
+namespace opencv_test { namespace {
+
+
+TEST(ximpgroc_matchcolortemplate,test_QFFT)
+{
+    String openCVExtraDir = cvtest::TS::ptr()->get_data_path();
+    String dataPath = openCVExtraDir+"cv/ximgproc/qdftData.yml.gz";
+    FileStorage f;
+    f.open(dataPath, FileStorage::READ);
+    Mat img;
+    f["image"] >> img;
+    Mat qTest;
+    vector<String> nodeName = { "qdftleft","qdftright","qidftleft","qidftright" };
+    vector<int> flag = { 0,0,DFT_INVERSE,DFT_INVERSE };
+    vector<bool> leftSize = {true,false,true,false};
+    ximgproc::createQuaternionImage(img, img);
+    for (int i=0;i<nodeName.size();i++)
+    {
+        Mat test, dd;
+        f[nodeName[i]] >> qTest;
+        ximgproc::qdft(img, test, flag[i], leftSize[i]);
+        absdiff(test, qTest, dd);
+        vector<Mat> plane;
+        split(dd, plane);
+        for (auto p : plane)
+        {
+            double maxVal;
+            Point pIdx;
+            minMaxLoc(p, NULL, &maxVal, NULL, &pIdx);
+            ASSERT_LE(p.at<double>(pIdx), 1e-5);
+        }
+
+    }
+}
+
+TEST(ximpgroc_matchcolortemplate, test_COLORMATCHTEMPLATE)
+{
+    String openCVExtraDir = cvtest::TS::ptr()->get_data_path();
+    String dataPath = openCVExtraDir + "cv/ximgproc/corr.yml.gz";
+    FileStorage f;
+    f.open(dataPath, FileStorage::READ);
+    Mat corrRef,corr,dd;
+    f["corr"] >> corrRef;
+    Mat img, logo;
+    img = imread(openCVExtraDir + "cv/ximgproc/image.png", IMREAD_COLOR);
+    logo = imread(openCVExtraDir + "cv/ximgproc/opencv_logo.png", IMREAD_COLOR);
+    ximgproc::colorMatchTemplate(img, logo, corr);
+
+    absdiff(corr, corrRef, dd);
+    double maxVal;
+    Point pIdx;
+    minMaxLoc(dd, NULL, &maxVal, NULL, &pIdx);
+    ASSERT_LE(maxVal, 1e-5);
+
+}
+
+
+
+}} // namespace