Major formatting changes (breaks diffs). No code changes.

The changes made in this commit do not affect any actual code,
    they are purely aesthetic. I ran clang-format with google style
    over all .h/.cpp files in wpilibc that weren't in wpilibC++Sim
    or gtest, and the eclipse formatter over all of the Java files
    using the Google eclipse formatting configuration.

Change-Id: I9627bca0bc103c398ecc1c5ba17467193291ae63
This commit is contained in:
James Kuszmaul
2015-06-25 15:07:55 -04:00
parent bd64d9a7ef
commit 7eb8550bdb
470 changed files with 89798 additions and 77287 deletions

View File

@@ -9,31 +9,35 @@
#include "MonoImage.h"
/**
* Included for ParticleAnalysisReport definition
* TODO: Eliminate this dependency!
* TODO: Eliminate this dependency!
*/
#include "Vision/VisionAPI.h"
#include <vector>
#include <algorithm>
class BinaryImage : public MonoImage
{
public:
BinaryImage();
virtual ~BinaryImage();
int GetNumberParticles();
ParticleAnalysisReport GetParticleAnalysisReport(int particleNumber);
void GetParticleAnalysisReport(int particleNumber, ParticleAnalysisReport *par);
std::vector<ParticleAnalysisReport>* GetOrderedParticleAnalysisReports();
BinaryImage *RemoveSmallObjects(bool connectivity8, int erosions);
BinaryImage *RemoveLargeObjects(bool connectivity8, int erosions);
BinaryImage *ConvexHull(bool connectivity8);
BinaryImage *ParticleFilter(ParticleFilterCriteria2 *criteria, int criteriaCount);
virtual void Write(const char *fileName);
private:
bool ParticleMeasurement(int particleNumber, MeasurementType whatToMeasure, int *result);
bool ParticleMeasurement(int particleNumber, MeasurementType whatToMeasure, double *result);
static double NormalizeFromRange(double position, int range);
static bool CompareParticleSizes(ParticleAnalysisReport particle1, ParticleAnalysisReport particle2);
};
class BinaryImage : public MonoImage {
public:
BinaryImage();
virtual ~BinaryImage();
int GetNumberParticles();
ParticleAnalysisReport GetParticleAnalysisReport(int particleNumber);
void GetParticleAnalysisReport(int particleNumber,
ParticleAnalysisReport *par);
std::vector<ParticleAnalysisReport> *GetOrderedParticleAnalysisReports();
BinaryImage *RemoveSmallObjects(bool connectivity8, int erosions);
BinaryImage *RemoveLargeObjects(bool connectivity8, int erosions);
BinaryImage *ConvexHull(bool connectivity8);
BinaryImage *ParticleFilter(ParticleFilterCriteria2 *criteria,
int criteriaCount);
virtual void Write(const char *fileName);
private:
bool ParticleMeasurement(int particleNumber, MeasurementType whatToMeasure,
int *result);
bool ParticleMeasurement(int particleNumber, MeasurementType whatToMeasure,
double *result);
static double NormalizeFromRange(double position, int range);
static bool CompareParticleSizes(ParticleAnalysisReport particle1,
ParticleAnalysisReport particle2);
};