Move readStruct(...) into blackrock.h so it can be used by NSXTracesP…

…rovider
neurosuite · Dec 12, 2015 · f90132a · f90132a
1 parent 284c422
commit f90132a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/src/blackrock.h b/src/blackrock.h
@@ -20,6 +20,17 @@
 // include c/c++ headers
 #include <stdint.h>
 
+// incluse qt headers
+#include <QFile>
+
+/** Little helper function to read structs from QFiles in binary mode. */
+template <typename T>
+inline bool readStruct(QFile& file, T& s) {
+    qint64 bytesToRead = sizeof(T);
+    qint64 bytesRead = file.read(reinterpret_cast<char*>(&s), bytesToRead);
+    return (bytesToRead == bytesRead);
+}
+
 #pragma pack(push, 1)
 
 //  Shared data structures

diff --git a/src/neveventsprovider.h b/src/neveventsprovider.h
@@ -34,13 +34,6 @@ class NEVEventsProvider : public EventsProvider  {
 private:
     NEVBasicHeader mBasicHeader;
     NEVExtensionHeader* mExtensionHeaders;
-
-    template <typename T>
-    inline bool readStruct(QFile& file, T& s) {
-        qint64 bytesToRead = sizeof(T);
-        qint64 bytesRead = file.read(reinterpret_cast<char*>(&s), bytesToRead);
-        return (bytesToRead == bytesRead);
-    }
 };
 
 #endif
diff --git a/src/nsxtracesprovider.cpp b/src/nsxtracesprovider.cpp
@@ -43,10 +43,7 @@ bool NSXTracesProvider::init() {
     }
 
     // Read basic header
-    qint64 bytesToRead = sizeof(NSXBasicHeader);
-    qint64 bytesRead = dataFile.read(reinterpret_cast<char*>(&(mBasicHeader)), bytesToRead);
-
-    if(bytesToRead != bytesRead) {
+    if(!readStruct<NSXBasicHeader>(dataFile, mBasicHeader)) {
         dataFile.close();
         return false;
     }
@@ -58,22 +55,16 @@ bool NSXTracesProvider::init() {
     // Read extension headers
     mExtensionHeaders = new NSXExtensionHeader[this->nbChannels];
 
-    bytesToRead = sizeof(NSXExtensionHeader);
     for(int channel = 0; channel < this->nbChannels; channel++) {
-        bytesRead = dataFile.read(reinterpret_cast<char*>(mExtensionHeaders + channel), bytesToRead);
-
-        if(bytesToRead != bytesRead) {
+        if(!readStruct<NSXExtensionHeader>(dataFile, mExtensionHeaders[channel])) {
             delete[] mExtensionHeaders;
             dataFile.close();
             return false;
         }
     }
 
     // Read data header
-    bytesToRead = sizeof(NSXDataHeader);
-    bytesRead = dataFile.read(reinterpret_cast<char *>(&mDataHeader), bytesToRead);
-
-    if(bytesToRead != bytesRead) {
+    if(!readStruct<NSXDataHeader>(dataFile, mDataHeader)) {
         delete[] mExtensionHeaders;
         dataFile.close();
         return false;