Commit 083411a50324f472818ee20a270fc5273a6e8441

Authored by Scott Klum
1 parent da3ecbc4

Added cv::Mat to String in Variant to String

Showing 1 changed file with 2 additions and 5 deletions
openbr/core/qtutils.cpp
@@ -27,12 +27,11 @@ @@ -27,12 +27,11 @@
27 #include <QRegularExpression> 27 #include <QRegularExpression>
28 #include <QStack> 28 #include <QStack>
29 #include <QUrl> 29 #include <QUrl>
30 -#include <QMap>  
31 -  
32 #include <openbr/openbr_plugin.h> 30 #include <openbr/openbr_plugin.h>
33 31
34 #include "alphanum.hpp" 32 #include "alphanum.hpp"
35 #include "qtutils.h" 33 #include "qtutils.h"
  34 +#include "opencvutils.h"
36 35
37 using namespace br; 36 using namespace br;
38 37
@@ -413,9 +412,7 @@ QString toString(const QVariant &amp;variant) @@ -413,9 +412,7 @@ QString toString(const QVariant &amp;variant)
413 QString::number(rect.y()), 412 QString::number(rect.y()),
414 QString::number(rect.width()), 413 QString::number(rect.width()),
415 QString::number(rect.height())); 414 QString::number(rect.height()));
416 - } else if (variant.canConvert(QVariant::Map)) {  
417 - return toString(qvariant_cast<QVariantMap>(variant));  
418 - } 415 + } else if (variant.canConvert<cv::Mat>()) return OpenCVUtils::matrixToString(variant.value<cv::Mat>());
419 416
420 return QString(); 417 return QString();
421 } 418 }