Step 1 (OpenCV I/O within OpenBR) complete

Jordan Cheney
1 parent 9567b975
Showing 2 changed files with 9 additions and 6 deletions
openbr/core/cascade.cpp
openbr/plugins/metadata/cascade.cpp
@@ -209,7 +209,7 @@ void CascadeParams::write( FileStorage &amp;fs ) const
     string stageTypeStr = stageType == BOOST ? CC_BOOST : string();
     CV_Assert( !stageTypeStr.empty() );
     fs << CC_STAGE_TYPE << stageTypeStr;
-    string featureTypeStr = featureType == FeatureParams::LBP ? CC_HAAR :
+    string featureTypeStr = featureType == FeatureParams::LBP ? CC_LBP :
                             0;
     CV_Assert( !stageTypeStr.empty() );
     fs << CC_FEATURE_TYPE << featureTypeStr;
@@ -544,7 +544,6 @@ bool BrCascadeClassifier::readParams( const FileNode &amp;node )
     FileNode rnode = node[CC_STAGE_PARAMS];
     if ( !stageParams->read( rnode ) )
         return false;
-
     featureParams = FeatureParams::create(cascadeParams.featureType);
     rnode = node[CC_FEATURE_PARAMS];
     if ( !featureParams->read( rnode ) )
@@ -599,12 +598,16 @@ void BrCascadeClassifier::save( const string filename, bool baseFormat )
 bool BrCascadeClassifier::load( const string cascadeDirName )
 {
     FileStorage fs( cascadeDirName + CC_PARAMS_FILENAME, FileStorage::READ );
-    if ( !fs.isOpened() )
+    qDebug() << "1";
+    if ( !fs.isOpened() ) {
+        qDebug() << "2";
         return false;
+    }
     FileNode node = fs.getFirstTopLevelNode();
-    if ( !readParams( node ) )
+    if ( !readParams( node ) ) {
+        qDebug() << "3";
         return false;
-
+    }
     featureEvaluator = FeatureEvaluator::create(cascadeParams.featureType);
     featureEvaluator->init( ((FeatureParams*)featureParams), numPos + numNeg, cascadeParams.winSize );
     fs.release();
@@ -111,7 +111,7 @@ class CascadeTransform : public MetaTransform
         QString cascadeDir = Globals->sdkPath + "/share/openbr/models/openbrcascades/" + model;
         classifier.train(cascadeDir.toStdString(),
                          vecFile.toStdString(), negFile.toStdString(),
-                         numPos, numNeg, 1024, 1024, 20,
+                         numPos, numNeg, 1024, 1024, 17,
                          cascadeParams, featureParams, stageParams);
     }