Move binary format to built in and make it default

aacuevas · aacuevas · commit e1c3b7d89590 · 2019-08-13T15:46:55.000+02:00
diff --git a/Plugins/BinaryFormat/CMakeLists.txt b/Plugins/BinaryFormat/CMakeLists.txt
diff --git a/Plugins/BinaryFormat/OpenEphysLib.cpp b/Plugins/BinaryFormat/OpenEphysLib.cpp
diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt
@@ -13,7 +13,6 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
 #add plugin subdirectories
 add_subdirectory(ArduinoOutput)
 add_subdirectory(BasicSpikeDisplay)
-add_subdirectory(BinaryFormat)
 add_subdirectory(CAR)
 add_subdirectory(ChannelMappingNode)
 add_subdirectory(EvntTrigAvg)
diff --git a/Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.cpp b/Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.cpp
diff --git a/Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.h b/Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef BINARYFILESOURCE_H_INCLUDED
 #define BINARYFILESOURCE_H_INCLUDED
 
-#include <FileSourceHeaders.h>
+#include "../FileSource.h"
 
 namespace BinarySource
 {
diff --git a/Source/Processors/FileReader/BinaryFileSource/CMakeLists.txt b/Source/Processors/FileReader/BinaryFileSource/CMakeLists.txt
@@ -0,0 +1,11 @@
+#Open Ephys GUI direcroty-specific file
+
+#add files in this folder
+add_sources(open-ephys 
+	BinaryFileSource.cpp
+	BinaryFileSource.h
+)
+
+#add nested directories
+
+
diff --git a/Source/Processors/FileReader/CMakeLists.txt b/Source/Processors/FileReader/CMakeLists.txt
@@ -11,5 +11,5 @@ add_sources(open-ephys
 )
 
 #add nested directories
-
+add_subdirectory(BinaryFileSource)
 
diff --git a/Source/Processors/FileReader/FileReader.cpp b/Source/Processors/FileReader/FileReader.cpp
@@ -27,6 +27,7 @@
 #include "../../AccessClass.h"
 #include "../../Audio/AudioComponent.h"
 #include "../PluginManager/PluginManager.h"
+#include "BinaryFileSource\BinaryFileSource.h"
 
 
 FileReader::FileReader()
@@ -466,13 +467,15 @@ StringArray FileReader::getSupportedExtensions() const
 
 int FileReader::getNumBuiltInFileSources() const
 {
-	return 0;
+	return 1;
 }
 
 String FileReader::getBuiltInFileSourceExtensions(int index) const
 {
 	switch (index)
 	{
+	case 0: //Binary
+		return "oebin";
 	default:
 		return "";
 	}
@@ -482,6 +485,8 @@ FileSource* FileReader::createBuiltInFileSource(int index) const
 {
 	switch (index)
 	{
+	case 0:
+		return new BinarySource::BinaryFileSource();
 	default:
 		return nullptr;
 	}
diff --git a/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp b/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp
diff --git a/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.h b/Source/Processors/RecordNode/BinaryFormat/BinaryRecording.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef BINARYRECORDING_H
 #define BINARYRECORDING_H
 
-#include <RecordingLib.h>
+#include "../RecordEngine.h"
 #include "SequentialBlockFile.h"
 #include "NpyFile.h"
 
diff --git a/Source/Processors/RecordNode/BinaryFormat/CMakeLists.txt b/Source/Processors/RecordNode/BinaryFormat/CMakeLists.txt
@@ -0,0 +1,16 @@
+#Open Ephys GUI direcroty-specific file
+
+#add files in this folder
+add_sources(open-ephys 
+	BinaryRecording.cpp
+	BinaryRecording.h
+	FileMemoryBlock.h
+	NpyFile.cpp
+	NpyFile.h
+	SequentialBlockFile.cpp
+	SequentialBlockFile.h
+	)
+
+#add nested directories
+
+
diff --git a/Source/Processors/RecordNode/BinaryFormat/FileMemoryBlock.h b/Source/Processors/RecordNode/BinaryFormat/FileMemoryBlock.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef FILEMEMORYBLOCK_H
 #define FILEMEMORYBLOCK_H
 
-#include <BasicJuceHeader.h>
+#include "../../../../JuceLibraryCode/JuceHeader.h"
 
 namespace BinaryRecordingEngine
 {
diff --git a/Source/Processors/RecordNode/BinaryFormat/NpyFile.cpp b/Source/Processors/RecordNode/BinaryFormat/NpyFile.cpp
diff --git a/Source/Processors/RecordNode/BinaryFormat/NpyFile.h b/Source/Processors/RecordNode/BinaryFormat/NpyFile.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef NPYFILE_H
 #define NPYFILE_H
 
-#include <RecordingLib.h>
+#include "../RecordEngine.h"
 
 namespace BinaryRecordingEngine
 {
diff --git a/Source/Processors/RecordNode/BinaryFormat/SequentialBlockFile.cpp b/Source/Processors/RecordNode/BinaryFormat/SequentialBlockFile.cpp
diff --git a/Source/Processors/RecordNode/BinaryFormat/SequentialBlockFile.h b/Source/Processors/RecordNode/BinaryFormat/SequentialBlockFile.h
diff --git a/Source/Processors/RecordNode/CMakeLists.txt b/Source/Processors/RecordNode/CMakeLists.txt
@@ -7,8 +7,6 @@ add_sources(open-ephys
 	EngineConfigWindow.cpp
 	EngineConfigWindow.h
 	EventQueue.h
-	OriginalRecording.cpp
-	OriginalRecording.h
 	RecordEngine.cpp
 	RecordEngine.h
 	RecordNode.cpp
@@ -18,5 +16,6 @@ add_sources(open-ephys
 )
 
 #add nested directories
-
+add_subdirectory(BinaryFormat)
+add_subdirectory(OpenEphysFormat)
 
diff --git a/Source/Processors/RecordNode/OpenEphysFormat/CMakeLists.txt b/Source/Processors/RecordNode/OpenEphysFormat/CMakeLists.txt
@@ -0,0 +1,11 @@
+#Open Ephys GUI direcroty-specific file
+
+#add files in this folder
+add_sources(open-ephys 
+	OriginalRecording.cpp
+	OriginalRecording.h
+)
+
+#add nested directories
+
+
diff --git a/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp b/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.cpp
@@ -22,8 +22,8 @@
 */
 
 #include "OriginalRecording.h"
-#include "../../AccessClass.h"
-#include "../../Audio/AudioComponent.h"
+#include "../../../AccessClass.h"
+#include "../../../Audio/AudioComponent.h"
 
 OriginalRecording::OriginalRecording() : separateFiles(false),
     recordingNumber(0), experimentNumber(0),  zeroBuffer(1, 50000),
diff --git a/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.h b/Source/Processors/RecordNode/OpenEphysFormat/OriginalRecording.h
@@ -23,9 +23,9 @@
 #ifndef ORIGINALRECORDING_H_INCLUDED
 #define ORIGINALRECORDING_H_INCLUDED
 
-#include "../../../JuceLibraryCode/JuceHeader.h"
+#include "../../../../JuceLibraryCode/JuceHeader.h"
 
-#include "RecordEngine.h"
+#include "../RecordEngine.h"
 #include <stdio.h>
 #include <map>
 
diff --git a/Source/Processors/RecordNode/RecordEngine.cpp b/Source/Processors/RecordNode/RecordEngine.cpp
@@ -27,7 +27,8 @@
 #include "../../AccessClass.h"
 
 #include "EngineConfigWindow.h"
-#include "OriginalRecording.h"
+#include "OpenEphysFormat\OriginalRecording.h"
+#include "BinaryFormat\BinaryRecording.h"
 
 RecordEngine::RecordEngine()
     : manager (nullptr)
@@ -245,14 +246,16 @@ void RecordEngineManager::addParameter (EngineParameter* param)
 
 int RecordEngineManager::getNumOfBuiltInEngines()
 {
-    return 1;
+    return 2;
 }
 
 RecordEngineManager* RecordEngineManager::createBuiltInEngineManager (int index)
 {
     switch (index)
     {
-        case 0:
+		case 0:
+			return BinaryRecordingEngine::BinaryRecording::getEngineManager();
+        case 1:
             return OriginalRecording::getEngineManager();
 
         default:
@@ -267,8 +270,10 @@ RecordEngine* RecordEngineManager::instantiateEngine()
 
     //Built-in engines
 
-    if (id == "OPENEPHYS")
-        return new OriginalRecording();
+	if (id == "OPENEPHYS")
+		return new OriginalRecording();
+	else if (id == "RAWBINARY")
+		return new BinaryRecordingEngine::BinaryRecording();
 
     return nullptr;
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.`
`24`	`24`	`#ifndef BINARYFILESOURCE_H_INCLUDED`
`25`	`25`	`#define BINARYFILESOURCE_H_INCLUDED`
`26`	`26`
`27`		`-#include <FileSourceHeaders.h>`
	`27`	`+#include "../FileSource.h"`
`28`	`28`
`29`	`29`	`namespace BinarySource`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ add_sources(open-ephys`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`#add nested directories`
`14`		`-`
	`14`	`+add_subdirectory(BinaryFileSource)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@`
`27`	`27`	`#include "../../AccessClass.h"`
`28`	`28`	`#include "../../Audio/AudioComponent.h"`
`29`	`29`	`#include "../PluginManager/PluginManager.h"`
	`30`	`+#include "BinaryFileSource\BinaryFileSource.h"`
`30`	`31`
`31`	`32`
`32`	`33`	`FileReader::FileReader()`
`@@ -466,13 +467,15 @@ StringArray FileReader::getSupportedExtensions() const`
`466`	`467`
`467`	`468`	`int FileReader::getNumBuiltInFileSources() const`
`468`	`469`	`{`
`469`		`- return 0;`
	`470`	`+ return 1;`
`470`	`471`	`}`
`471`	`472`
`472`	`473`	`String FileReader::getBuiltInFileSourceExtensions(int index) const`
`473`	`474`	`{`
`474`	`475`	`switch (index)`
`475`	`476`	`{`
	`477`	`+ case 0: //Binary`
	`478`	`+ return "oebin";`
`476`	`479`	`default:`
`477`	`480`	`return "";`
`478`	`481`	`}`
`@@ -482,6 +485,8 @@ FileSource* FileReader::createBuiltInFileSource(int index) const`
`482`	`485`	`{`
`483`	`486`	`switch (index)`
`484`	`487`	`{`
	`488`	`+ case 0:`
	`489`	`+ return new BinarySource::BinaryFileSource();`
`485`	`490`	`default:`
`486`	`491`	`return nullptr;`
`487`	`492`	`}`