Merge pull request #42 from JordanMcManus/master

refactor accuracyProcessor

Author: glabmoris

src/AccuracyProcessor.hpp

@@ -20,130 +20,107 @@
 #endif
 
 #pragma pack(1)
-typedef struct{
-	double time;    	//GPS seconds of week
-	double northingSd; 	//northing standard deviation
-	double eastingSd;	//easting standard deviation
-	double altitudeSd;    	//altitude standard deviation
-	double speedNorthSd;    //northing speed standard deviation
-	double speedEastSd;    	//easting speed standard deviation
-	double speedAltitudeSd; //vertical speed standard deviation
-	double rollSd;    	//roll standard deviation
-	double pitchSd;    	//pitch standard deviation
-	double headingSd;    	//heading standard deviation
+
+typedef struct {
+    double time; //GPS seconds of week
+    double northingSd; //northing standard deviation
+    double eastingSd; //easting standard deviation
+    double altitudeSd; //altitude standard deviation
+    double speedNorthSd; //northing speed standard deviation
+    double speedEastSd; //easting speed standard deviation
+    double speedAltitudeSd; //vertical speed standard deviation
+    double rollSd; //roll standard deviation
+    double pitchSd; //pitch standard deviation
+    double headingSd; //heading standard deviation
 } AccuracyEntry;
 #pragma pack()
 
 /*!
  * \brief AccuracyProcessor class
  */
-class AccuracyProcessor{
-	public:
-                /**
-                 * Create a AccuracyProcessor
-                 */
-		AccuracyProcessor();
-                
-                /**
-                 * Destroy the AccuracyProcessor
-                 */
-		virtual ~AccuracyProcessor();
-
-                /**
-                 * Read a SBET file and return true if the reading is successful
-                 * 
-                 * @param filename the name of the SBET file
-                 */
-		bool readFile(std::string & filename);
-                
-                /**
-                 * Print the information of the AccuracyEntry
-                 * 
-                 * @param entry The AccuracyEntry
-                 */
-		virtual void processEntry(AccuracyEntry * entry)=0;
-                
-                /**
-                 * Called by readFile after file is read
-                 * 
-                 */
-		virtual void done()=0;
-
-	private:
-		int doRead(int fd,void* buf,unsigned int sz);
-		int doOpen(const char * filename);
-};
+class AccuracyProcessor {
+public:
 
-/**
- * Create a AccuracyProcessor
- */
-AccuracyProcessor::AccuracyProcessor(){
+    /**
+     * Create a AccuracyProcessor
+     */
+    AccuracyProcessor() {}
 
-}
+    /**
+     * Destroy the AccuracyProcessor
+     */
+    virtual ~AccuracyProcessor() {}
 
-/**
- * Destroy the AccuracyProcessor
- */
-AccuracyProcessor::~AccuracyProcessor(){
+    /**
+     * Read a SBET file and return true if reading is successful
+     * 
+     * @param filename name of the SBET file
+     */
+    bool readFile(std::string & filename) {
+        int fd;
 
-}
+        if ((fd = doOpen(filename.c_str())) == -1) {
+            std::cerr << "Cannot open file " << filename << std::endl;
+            return false;
+        }
 
-int AccuracyProcessor::doRead(int fd,void * buffer,unsigned int sz){
+        AccuracyEntry entry;
 
-#ifdef _WIN32
-	return _read(fd,buffer,sz);
-#endif
+        int bytesRead;
 
-#ifdef __GNUC__
-	return read(fd,buffer,sz);
-#endif
+        do {
+            bytesRead = doRead(fd, (void*) &entry, sizeof (AccuracyEntry));
 
-}
+            if (bytesRead == sizeof (AccuracyEntry)) {
+                processEntry(&entry);
+            }
+        } while (bytesRead > 0);
 
-int AccuracyProcessor::doOpen(const char * filename){
-#ifdef _WIN32
-        return _open(filename,_O_RDONLY|_O_BINARY);
-#endif
+        if (bytesRead == -1) {
+            perror("Error while reading file");
+        }
 
-#ifdef __GNUC__
-        return open(filename,O_RDONLY);
-#endif
-}
+        done();
 
-/**
- * Read a SBET file and return true if reading is successful
- * 
- * @param filename name of the SBET file
- */
-bool AccuracyProcessor::readFile(std::string & filename){
-	int fd;
+        return true;
+    }
 
-	if((fd=doOpen(filename.c_str())) == -1){
-		std::cerr << "Cannot open file " << filename << std::endl;
-		return false;
-	}
+    /**
+     * Print the information of the AccuracyEntry
+     * 
+     * @param entry The AccuracyEntry
+     */
+    virtual void processEntry(AccuracyEntry * entry) = 0;
 
-	AccuracyEntry entry;
+    /**
+     * Called by readFile after file is read
+     * 
+     */
+    virtual void done() = 0;
 
-	int bytesRead;
+private:
 
-	do{
-		bytesRead = doRead(fd,(void*)&entry,sizeof(AccuracyEntry));
+    int doRead(int fd, void * buffer, unsigned int sz) {
 
-		if(bytesRead == sizeof(AccuracyEntry)){
-			processEntry(&entry);
-		}
-	}
-	while(bytesRead > 0);
+#ifdef _WIN32
+        return _read(fd, buffer, sz);
+#endif
 
-	if(bytesRead == -1){
-		perror("Error while reading file");
-	}
-        
-        done();
+#ifdef __GNUC__
+        return read(fd, buffer, sz);
+#endif
 
-	return true;
-}
+    }
 
+    int doOpen(const char * filename) {
+#ifdef _WIN32
+        return _open(filename, _O_RDONLY | _O_BINARY);
+#endif
 
+#ifdef __GNUC__
+        return open(filename, O_RDONLY);
 #endif
+    }
+};
+
+#endif