generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Naming fixes and code beautification

Browse Source
This commit is contained in:
Grigory Serebryakov 2014-08-27 12:41:18 +04:00
parent 57cf3d1766
commit 74d8527f8a
5 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/haartraining/createsamples.cpp
View File

@ -50,6 +50,7 @@
#include <cstdlib> #include <cstdlib>
#include <cmath> #include <cmath>
#include <ctime> #include <ctime>
#include <memory>
using namespace std; using namespace std;
@ -218,28 +219,22 @@ int main( int argc, char* argv[] )
printf( "Done\n" ); printf( "Done\n" );
} }
else if( imagename && bgfilename && infoname && pngoutput) else if( imagename && bgfilename && infoname)
{ {
printf( "Create training set from a single image and a collection of backgrounds.\n" printf( "Create data set from single image applying distortions...\n"
"Output format: %s\n"
"Annotations are in a separate directory\n",
(( pngoutput ) ? "JPG" : "PNG") );
PngDatasetGenerator creator( infoname );
creator.create( imagename, bgcolor, bgthreshold, bgfilename, num,
invert, maxintensitydev, maxxangle, maxyangle, maxzangle,
showsamples, width, height );
printf( "Done\n" );
}
else if( imagename && bgfilename && infoname )
{
printf( "Create test samples from single image applying distortions...\n"
"Output format: %s\n", "Output format: %s\n",
(( pngoutput ) ? "JPG" : "PNG") ); (( pngoutput ) ? "PNG" : "JPG") );
JpgDatasetGrenerator creator( infoname ); std::auto_ptr<DatasetGenerator> creator;
creator.create( imagename, bgcolor, bgthreshold, bgfilename, num, if( pngoutput )
{
creator = std::auto_ptr<DatasetGenerator>( new PngDatasetGenerator( infoname ) );
}
else
{
creator = std::auto_ptr<DatasetGenerator>( new JpgDatasetGenerator( infoname ) );
}
creator->create( imagename, bgcolor, bgthreshold, bgfilename, num,
invert, maxintensitydev, maxxangle, maxyangle, maxzangle, invert, maxintensitydev, maxxangle, maxyangle, maxzangle,
showsamples, width, height ); showsamples, width, height );

12
apps/haartraining/cvhaartraining.cpp
View File

@ -3029,12 +3029,12 @@ DatasetGenerator::~DatasetGenerator()
} }
JpgDatasetGrenerator::JpgDatasetGrenerator(const char* filename) JpgDatasetGenerator::JpgDatasetGenerator( const char* filename )
:DatasetGenerator(IOutput::createOutput(filename,IOutput::JPG_TEST_SET)) :DatasetGenerator( IOutput::createOutput( filename, IOutput::JPG_DATASET ) )
{ {
} }
CvSize JpgDatasetGrenerator::scaleObjectSize(const CvSize& bgImgSize, CvSize JpgDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize,
const CvSize& , const CvSize& ,
const CvSize& sampleSize) const const CvSize& sampleSize) const
{ {
@ -3074,13 +3074,13 @@ CvRect DatasetGenerator::getObjectPosition(const CvSize& bgImgSize,
PngDatasetGenerator::PngDatasetGenerator(const char* filename) PngDatasetGenerator::PngDatasetGenerator(const char* filename)
:DatasetGenerator(IOutput::createOutput(filename,IOutput::PNG_TRAINING_SET)) :DatasetGenerator( IOutput::createOutput( filename, IOutput::PNG_DATASET ) )
{ {
} }
CvSize PngDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize, CvSize PngDatasetGenerator::scaleObjectSize( const CvSize& bgImgSize,
const CvSize& imgSize, const CvSize& imgSize,
const CvSize& ) const const CvSize& ) const
{ {
float scale; float scale;

4
apps/haartraining/cvhaartraining.h
View File

@ -227,10 +227,10 @@ private:
}; };
/* Provides the functionality of test set generating */ /* Provides the functionality of test set generating */
class JpgDatasetGrenerator: public DatasetGenerator class JpgDatasetGenerator: public DatasetGenerator
{ {
public: public:
JpgDatasetGrenerator(const char* filename); JpgDatasetGenerator(const char* filename);
private: private:
CvSize scaleObjectSize(const CvSize& bgImgSize, CvSize scaleObjectSize(const CvSize& bgImgSize,
const CvSize& , const CvSize& ,

4
apps/haartraining/cvsamplesoutput.cpp
View File

@ -34,10 +34,10 @@ IOutput* IOutput::createOutput(const char *filename,
{ {
IOutput* output = 0; IOutput* output = 0;
switch (type) { switch (type) {
case IOutput::PNG_TRAINING_SET: case IOutput::PNG_DATASET:
output = new PngDatasetOutput(); output = new PngDatasetOutput();
break; break;
case IOutput::JPG_TEST_SET: case IOutput::JPG_DATASET:
output = new JpgDatasetOutput(); output = new JpgDatasetOutput();
break; break;
default: default:

2
apps/haartraining/ioutput.h
View File

@ -11,7 +11,7 @@ struct CvRect;
class IOutput class IOutput
{ {
public: public:
enum OutputType {PNG_TRAINING_SET, JPG_TEST_SET}; enum OutputType {PNG_DATASET, JPG_DATASET};
public: public:
virtual bool write( const CvMat& img, virtual bool write( const CvMat& img,
const CvRect& boundingBox ) =0; const CvRect& boundingBox ) =0;