Refactored opencv model storage

Scott Klum
1 parent 919ddb61
Showing 4 changed files with 48 additions and 78 deletions
openbr/core/opencvutils.cpp
openbr/core/opencvutils.h
openbr/plugins/svm.cpp
openbr/plugins/tree.cpp
@@ -23,6 +23,8 @@
 #include "opencvutils.h"
 #include "qtutils.h"
  
+#include <QTemporaryFile>
+
 using namespace cv;
 using namespace std;
  
@@ -261,6 +263,39 @@ QStringList OpenCVUtils::matrixToStringList(const Mat &amp;m)
     return results;
 }
  
+void OpenCVUtils::storeModel(const CvStatModel &model, QDataStream &stream)
+{
+    // Create local file
+    QTemporaryFile tempFile;
+    tempFile.open();
+    tempFile.close();
+
+    // Save MLP to local file
+    model.save(qPrintable(tempFile.fileName()));
+
+    // Copy local file contents to stream
+    tempFile.open();
+    QByteArray data = tempFile.readAll();
+    tempFile.close();
+    stream << data;
+}
+
+void OpenCVUtils::loadModel(CvStatModel &model, QDataStream &stream)
+{
+    // Copy local file contents from stream
+    QByteArray data;
+    stream >> data;
+
+    // Create local file
+    QTemporaryFile tempFile(QDir::tempPath()+"/model");
+    tempFile.open();
+    tempFile.write(data);
+    tempFile.close();
+
+    // Load MLP from local file
+    model.load(qPrintable(tempFile.fileName()));
+}
+
 Point2f OpenCVUtils::toPoint(const QPointF &qPoint)
 {
     return Point2f(qPoint.x(), qPoint.y());
@@ -22,6 +22,7 @@
 #include <QString>
 #include <QStringList>
 #include <opencv2/core/core.hpp>
+#include <opencv2/ml/ml.hpp>
 #include <assert.h>
  
 namespace OpenCVUtils
@@ -49,6 +50,10 @@ namespace OpenCVUtils
     QString matrixToString(const cv::Mat &m);
     QStringList matrixToStringList(const cv::Mat &m);
  
+    // Model storage
+    void storeModel(const CvStatModel &model, QDataStream &stream);
+    void loadModel(CvStatModel &model, QDataStream &stream);
+
     template <typename T>
     T getElement(const cv::Mat &m, int r, int c)
     {
@@ -26,39 +26,6 @@ using namespace cv;
 namespace br
 {
  
-static void storeSVM(const SVM &svm, QDataStream &stream)
-{
-    // Create local file
-    QTemporaryFile tempFile;
-    tempFile.open();
-    tempFile.close();
-
-    // Save SVM to local file
-    svm.save(qPrintable(tempFile.fileName()));
-
-    // Copy local file contents to stream
-    tempFile.open();
-    QByteArray data = tempFile.readAll();
-    tempFile.close();
-    stream << data;
-}
-
-static void loadSVM(SVM &svm, QDataStream &stream)
-{
-    // Copy local file contents from stream
-    QByteArray data;
-    stream >> data;
-
-    // Create local file
-    QTemporaryFile tempFile(QDir::tempPath()+"/SVM");
-    tempFile.open();
-    tempFile.write(data);
-    tempFile.close();
-
-    // Load SVM from local file
-    svm.load(qPrintable(tempFile.fileName()));
-}
-
 static void trainSVM(SVM &svm, Mat data, Mat lab, int kernel, int type, float C, float gamma, int folds, bool balanceFolds, int termCriteria)
 {
     if (data.type() != CV_32FC1)
@@ -190,13 +157,13 @@ private:
  
     void store(QDataStream &stream) const
     {
-        storeSVM(svm, stream);
+        OpenCVUtils::storeModel(svm, stream);
         stream << labelMap << reverseLookup;
     }
  
     void load(QDataStream &stream)
     {
-        loadSVM(svm, stream);
+        OpenCVUtils::loadModel(svm, stream);
         stream >> labelMap >> reverseLookup;
     }
  
@@ -281,12 +248,12 @@ private:
  
     void store(QDataStream &stream) const
     {
-        storeSVM(svm, stream);
+        OpenCVUtils::storeModel(svm, stream);
     }
  
     void load(QDataStream &stream)
     {
-        loadSVM(svm, stream);
+        OpenCVUtils::loadModel(svm, stream);
     }
 };
  
-#include <opencv2/ml/ml.hpp>
-
 #include "openbr_internal.h"
 #include "openbr/core/opencvutils.h"
-#include <QString>
-#include <QTemporaryFile>
  
 using namespace std;
 using namespace cv;
@@ -11,39 +7,6 @@ using namespace cv;
 namespace br
 {
  
-static void storeModel(const CvStatModel &model, QDataStream &stream)
-{
-    // Create local file
-    QTemporaryFile tempFile;
-    tempFile.open();
-    tempFile.close();
-
-    // Save MLP to local file
-    model.save(qPrintable(tempFile.fileName()));
-
-    // Copy local file contents to stream
-    tempFile.open();
-    QByteArray data = tempFile.readAll();
-    tempFile.close();
-    stream << data;
-}
-
-static void loadModel(CvStatModel &model, QDataStream &stream)
-{
-    // Copy local file contents from stream
-    QByteArray data;
-    stream >> data;
-
-    // Create local file
-    QTemporaryFile tempFile(QDir::tempPath()+"/model");
-    tempFile.open();
-    tempFile.write(data);
-    tempFile.close();
-
-    // Load MLP from local file
-    model.load(qPrintable(tempFile.fileName()));
-}
-
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV's random trees framework
@@ -127,12 +90,12 @@ class ForestTransform : public Transform
  
     void load(QDataStream &stream)
     {
-        loadModel(forest,stream);
+        OpenCVUtils::loadModel(forest,stream);
     }
  
     void store(QDataStream &stream) const
     {
-        storeModel(forest,stream);
+        OpenCVUtils::storeModel(forest,stream);
     }
  
     void init()
@@ -233,12 +196,12 @@ private:
  
     void load(QDataStream &stream)
     {
-        loadModel(boost,stream);
+        OpenCVUtils::loadModel(boost,stream);
     }
  
     void store(QDataStream &stream) const
     {
-        storeModel(boost,stream);
+        OpenCVUtils::storeModel(boost,stream);
     }