From 000168114677ef86fc796e3bd7cc6c12059a99da Mon Sep 17 00:00:00 2001
From: axt <axt@load.hu>
Date: Tue, 7 Dec 2021 20:53:43 +0100
Subject: [PATCH] Change edf-parser to be more inheritation-friendly

---
 oscar/SleepLib/loader_plugins/edfparser.cpp |  9 ++++++--
 oscar/SleepLib/loader_plugins/edfparser.h   | 25 ++++++++++++---------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/edfparser.cpp b/oscar/SleepLib/loader_plugins/edfparser.cpp
index e0f0bd3a..300afd96 100644
--- a/oscar/SleepLib/loader_plugins/edfparser.cpp
+++ b/oscar/SleepLib/loader_plugins/edfparser.cpp
@@ -250,6 +250,12 @@ bool EDFInfo::Parse() {
         return false;
     }
 
+    bool ret = ParseSignalData();
+    fileData.clear();
+    return ret;
+}
+
+bool EDFInfo::ParseSignalData() {
     // Now check the file isn't truncated before allocating space for the values
     long allocsize = 0;
     for (auto & sig : edfsignals) {
@@ -265,7 +271,6 @@ bool EDFInfo::Parse() {
         fileData.clear();
         return false;
     }
-
     // allocate the arrays for the signal values
     for (auto & sig : edfsignals) {
         long samples = sig.sampleCnt * edfHdr.num_data_records;
@@ -289,7 +294,7 @@ bool EDFInfo::Parse() {
             }
         }
     }
-    fileData.clear();
+
     return true;
 }
 
diff --git a/oscar/SleepLib/loader_plugins/edfparser.h b/oscar/SleepLib/loader_plugins/edfparser.h
index 2bb7778d..3f03b291 100644
--- a/oscar/SleepLib/loader_plugins/edfparser.h
+++ b/oscar/SleepLib/loader_plugins/edfparser.h
@@ -129,6 +129,8 @@ class EDFInfo
 
     virtual bool Parse();                          //! \brief Parse the EDF+ file into the EDFheaderQT. Must call Open(..) first.
 
+    virtual bool ParseSignalData();                          //! \brief Parse the signal data
+
     virtual bool parseHeader( EDFHeaderRaw * hdrPtr );                  //! \brief parse just the edf header for duration, etc
 
     virtual EDFSignal * lookupLabel(const QString & name, int index=0);  //! \brief Return a ptr to the i'th signal with that name
@@ -166,24 +168,27 @@ class EDFInfo
     QHash<QString, QList<EDFSignal *> > signalList; //! \brief ResMed sometimes re-uses the SAME signal name
 
 //  the following could be private
+  protected:
+    //! \brief This is the array of signal descriptors and values
+    char *signalPtr;
+    long filesize;
+    long datasize;
+    long pos;
+    bool eof;
+
+    //! \brief This is the array holding the EDF file data
+    QByteArray  fileData;
+    //! \brief Read 16 bit word of data from the EDF+ data stream
+    qint16 Read16();
+
   private:
     QVector<Annotation> ReadAnnotations( const char * data, int charLen );	//! \brief Create an Annotaion vector from the signal values
 
     QString ReadBytes(unsigned n);                                   //! \brief Read n bytes of 8 bit data from the EDF+ data stream
 
-    qint16 Read16();                                            //! \brief Read 16 bit word of data from the EDF+ data stream
-
-    //! \brief This is the array holding the EDF file data
-    QByteArray  fileData;
     //! \brief  The EDF+ files header structure, used as a place holder while processing the text data.
     EDFHeaderRaw *hdrPtr;
-    //! \brief This is the array of signal descriptors and values
-    char *signalPtr;
 
-    long filesize;
-    long datasize;
-    long pos;
-    bool eof;
 };