templatized some functions

Josh Klontz
1 parent 9f15f251
Showing 4 changed files with 33 additions and 33 deletions
sdk/core/opencvutils.cpp
sdk/core/opencvutils.h
sdk/plugins/hist.cpp
sdk/plugins/output.cpp
@@ -173,22 +173,6 @@ QString OpenCVUtils::elemToString(const Mat &amp;m, int r, int c)
     return "?";
 }
  
-float OpenCVUtils::elemToFloat(const Mat &m, int r, int c)
-{
-    assert(m.channels() == 1);
-    switch (m.depth()) {
-      case CV_8U:  return float(m.at<quint8>(r,c));
-      case CV_8S:  return float(m.at<qint8>(r,c));
-      case CV_16U: return float(m.at<quint16>(r,c));
-      case CV_16S: return float(m.at<qint16>(r,c));
-      case CV_32S: return float(m.at<qint32>(r,c));
-      case CV_32F: return float(m.at<float>(r,c));
-      case CV_64F: return float(m.at<double>(r,c));
-      default:     qFatal("Unknown matrix depth");
-    }
-    return 0;
-}
-
 QString OpenCVUtils::matrixToString(const Mat &m)
 {
     QString result;
@@ -225,18 +209,6 @@ QStringList OpenCVUtils::matrixToStringList(const Mat &amp;m)
     return results;
 }
  
-QList<float> OpenCVUtils::matrixToVector(const Mat &m)
-{
-    QList<float> results;
-    vector<Mat> mv;
-    split(m, mv);
-    foreach (const Mat &mc, mv)
-        for (int i=0; i<mc.rows; i++)
-            for (int j=0; j<mc.cols; j++)
-                results.append(elemToFloat(mc, i, j));
-    return results;
-}
-
 Point2f OpenCVUtils::toPoint(const QPointF &qPoint)
 {
     return Point2f(qPoint.x(), qPoint.y());
@@ -40,10 +40,38 @@ namespace OpenCVUtils
  
     // From image
     QString elemToString(const cv::Mat &m, int r, int c);
-    float elemToFloat(const cv::Mat &m, int r, int c);
     QString matrixToString(const cv::Mat &m);
     QStringList matrixToStringList(const cv::Mat &m);
-    QList<float> matrixToVector(const cv::Mat &m);
+
+    template <typename T>
+    T getElement(const cv::Mat &m, int r, int c)
+    {
+        assert(m.channels() == 1);
+        switch (m.depth()) {
+          case CV_8U:  return T(m.at<quint8>(r,c));
+          case CV_8S:  return T(m.at<qint8>(r,c));
+          case CV_16U: return T(m.at<quint16>(r,c));
+          case CV_16S: return T(m.at<qint16>(r,c));
+          case CV_32S: return T(m.at<qint32>(r,c));
+          case CV_32F: return T(m.at<float>(r,c));
+          case CV_64F: return T(m.at<double>(r,c));
+          default:     qFatal("Unknown matrix depth!");
+        }
+        return 0;
+    }
+
+    template <typename T>
+    QList<T> matrixToVector(const cv::Mat &m)
+    {
+        QList<T> results;
+        std::vector<cv::Mat> mv;
+        cv::split(m, mv);
+        foreach (const cv::Mat &mc, mv)
+            for (int i=0; i<mc.rows; i++)
+                for (int j=0; j<mc.cols; j++)
+                    results.append(getElement<float>(mc, i, j));
+        return results;
+    }
  
     // Conversions
     cv::Point2f toPoint(const QPointF &qPoint);
@@ -111,7 +111,7 @@ class RankTransform : public UntrainableTransform
         assert(m.channels() == 1);
         dst = Mat(m.rows, m.cols, CV_32FC1);
         typedef QPair<float,int> Tuple;
-        QList<Tuple> tuples = Common::Sort(OpenCVUtils::matrixToVector(m));
+        QList<Tuple> tuples = Common::Sort(OpenCVUtils::matrixToVector<float>(m));
  
         float prevValue = 0;
         int prevRank = 0;
@@ -176,7 +176,7 @@ class rrOutput : public MatrixOutput
             if (!byLine) files.append(queryFiles[i]);
  
             typedef QPair<float,int> Pair;
-            foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true, limit)) {
+            foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true, limit)) {
                 if (pair.first < threshold) break;
                 File target = targetFiles[pair.second];
                 target.set("Score", QString::number(pair.first));
@@ -278,7 +278,7 @@ class rankOutput : public MatrixOutput
         for (int i=0; i<queryFiles.size(); i++) {
             typedef QPair<float,int> Pair;
             int rank = 1;
-            foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true)) {
+            foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector<float>(data.row(i)), true)) {
                 if(targetFiles[pair.second].get<QString>("Label") == queryFiles[i].get<QString>("Label")) {
                     ranks.append(rank);
                     positions.append(pair.second);