Merge branch 'master' into kde

Josh Klontz
2 parents 10160b94 f74da8dd
Showing 3 changed files with 59 additions and 21 deletions
sdk/core/opencvutils.cpp
sdk/core/opencvutils.h
sdk/plugins/misc.cpp
@@ -169,6 +169,30 @@ float OpenCVUtils::elemToFloat(const Mat &amp;m, int r, int c)
     return 0;
 }
+QString OpenCVUtils::matrixToString(const Mat &m)
+{
+    QString result;
+    vector<Mat> mv;
+    split(m, mv);
+    if (m.rows > 1) result += "{ ";
+    for (int r=0; r<m.rows; r++) {
+        if ((m.rows > 1) && (r > 0)) result += "  ";
+        if (m.cols > 1) result += "[";
+        for (int c=0; c<m.cols; c++) {
+            if (mv.size() > 1) result += "(";
+            for (unsigned int i=0; i<mv.size()-1; i++)
+                result += OpenCVUtils::elemToString(mv[i], r, c) + ", ";
+            result += OpenCVUtils::elemToString(mv[mv.size()-1], r, c);
+            if (mv.size() > 1) result += ")";
+            if (c < m.cols - 1) result += ", ";
+        }
+        if (m.cols > 1) result += "]";
+        if (r < m.rows-1) result += "\n";
+    }
+    if (m.rows > 1) result += " }";
+    return result;
+}
+
 QStringList OpenCVUtils::matrixToStringList(const Mat &m)
 {
     QStringList results;
@@ -285,25 +309,8 @@ QDataStream &amp;operator&gt;&gt;(QDataStream &amp;stream, Mat &amp;m)
 QDebug operator<<(QDebug dbg, const Mat &m)
 {
-    vector<Mat> mv;
-    split(m, mv);
-    if (m.rows > 1) dbg.nospace() << "{ ";
-    for (int r=0; r<m.rows; r++) {
-        if ((m.rows > 1) && (r > 0)) dbg.nospace() << "  ";
-        if (m.cols > 1) dbg.nospace() << "[";
-        for (int c=0; c<m.cols; c++) {
-            if (mv.size() > 1) dbg.nospace() << "(";
-            for (unsigned int i=0; i<mv.size()-1; i++)
-                dbg.nospace() << qPrintable(OpenCVUtils::elemToString(mv[i], r, c)) << ", ";
-            dbg.nospace() << qPrintable(OpenCVUtils::elemToString(mv[mv.size()-1], r, c));
-            if (mv.size() > 1) dbg.nospace() << ")";
-            if (c < m.cols - 1) dbg.nospace() << ", ";
-        }
-        if (m.cols > 1) dbg.nospace() << "]";
-        if (r < m.rows-1) dbg.nospace() << "\n";
-    }
-    if (m.rows > 1) dbg.nospace() << " }";
-    return dbg;
+    dbg.nospace() << OpenCVUtils::matrixToString(m);
+    return dbg.space();
 }
 QDebug operator<<(QDebug dbg, const Point &p)
@@ -41,6 +41,7 @@ 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);
@@ -99,13 +99,17 @@ class PrintTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(bool error READ get_error WRITE set_error RESET reset_error)
+    Q_PROPERTY(bool data READ get_data WRITE set_data RESET reset_data)
     BR_PROPERTY(bool, error, false)
+    BR_PROPERTY(bool, data, false)
     void project(const Template &src, Template &dst) const
     {
         dst = src;
-        if (error) qDebug("%s\n", qPrintable(src.file.flat()));
-        else       printf("%s\n", qPrintable(src.file.flat()));
+        const QString nameString = src.file.flat();
+        const QString dataString = data ? OpenCVUtils::matrixToString(src)+"\n" : QString();
+        if (error) qDebug("%s\n%s", qPrintable(nameString), qPrintable(dataString));
+        else       printf("%s\n%s", qPrintable(nameString), qPrintable(dataString));
     }
 };
@@ -113,6 +117,32 @@ BR_REGISTER(Transform, PrintTransform)
 /*!
  * \ingroup transforms
+ * \brief Checks the template for NaN values.
+ * \author Josh Klontz \cite jklontz
+ */
+class CheckTransform : public UntrainableMetaTransform
+{
+    Q_OBJECT
+
+    void project(const Template &src, Template &dst) const
+    {
+        dst = src;
+        foreach (const Mat &m, src) {
+            Mat fm;
+            m.convertTo(fm, CV_32F);
+            const int elements = fm.rows * fm.cols * fm.channels();
+            const float *data = (const float*)fm.data;
+            for (int i=0; i<elements; i++)
+                if (data[i] != data[i])
+                    qFatal("%s NaN check failed!", qPrintable(src.file.flat()));
+        }
+    }
+};
+
+BR_REGISTER(Transform, CheckTransform)
+
+/*!
+ * \ingroup transforms
  * \brief Sets the template's matrix data to the br::File::name.
  * \author Josh Klontz \cite jklontz
  */