Skip to content

Commit 6bb0d04

Browse files
ethanbbethanbb
committed
Merge branch 'development' into network-events-ttl-event
2 parents 022c80b + aedf4ec commit 6bb0d04

24 files changed

Lines changed: 484 additions & 307 deletions

Builds/VisualStudio2013/Plugins/BinaryWriter/BinaryWriter.vcxproj renamed to Builds/VisualStudio2013/Plugins/BinaryFormat/BinaryFormat.vcxproj

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,24 @@
1818
<Platform>x64</Platform>
1919
</ProjectConfiguration>
2020
</ItemGroup>
21+
<ItemGroup>
22+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\FileSource\BinaryFileSource.cpp" />
23+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\OpenEphysLib.cpp" />
24+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\BinaryRecording.cpp" />
25+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\NpyFile.cpp" />
26+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\SequentialBlockFile.cpp" />
27+
</ItemGroup>
28+
<ItemGroup>
29+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\FileSource\BinaryFileSource.h" />
30+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\BinaryRecording.h" />
31+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\FileMemoryBlock.h" />
32+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\NpyFile.h" />
33+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\SequentialBlockFile.h" />
34+
</ItemGroup>
2135
<PropertyGroup Label="Globals">
2236
<ProjectGuid>{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}</ProjectGuid>
2337
<RootNamespace>BinaryWriter</RootNamespace>
38+
<ProjectName>BinaryFormat</ProjectName>
2439
</PropertyGroup>
2540
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2641
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -114,18 +129,6 @@
114129
<OptimizeReferences>true</OptimizeReferences>
115130
</Link>
116131
</ItemDefinitionGroup>
117-
<ItemGroup>
118-
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryWriter\BinaryRecording.h" />
119-
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryWriter\FileMemoryBlock.h" />
120-
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryWriter\NpyFile.h" />
121-
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryWriter\SequentialBlockFile.h" />
122-
</ItemGroup>
123-
<ItemGroup>
124-
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryWriter\BinaryRecording.cpp" />
125-
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryWriter\NpyFile.cpp" />
126-
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryWriter\OpenEphysLib.cpp" />
127-
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryWriter\SequentialBlockFile.cpp" />
128-
</ItemGroup>
129132
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
130133
<ImportGroup Label="ExtensionTargets">
131134
</ImportGroup>

‎Builds/VisualStudio2013/Plugins/BinaryFormat/BinaryFormat.vcxproj.filters‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
<Filter Include="Source Files\RecordEngine">
17+
<UniqueIdentifier>{1b16254b-e802-4d23-bd3f-1796871b55e8}</UniqueIdentifier>
18+
</Filter>
19+
<Filter Include="Source Files\FileSource">
20+
<UniqueIdentifier>{9ccccbc4-5f08-4b60-a6fd-0a727df0bbb8}</UniqueIdentifier>
21+
</Filter>
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\OpenEphysLib.cpp">
25+
<Filter>Source Files</Filter>
26+
</ClCompile>
27+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\BinaryRecording.cpp">
28+
<Filter>Source Files\RecordEngine</Filter>
29+
</ClCompile>
30+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\NpyFile.cpp">
31+
<Filter>Source Files\RecordEngine</Filter>
32+
</ClCompile>
33+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\SequentialBlockFile.cpp">
34+
<Filter>Source Files\RecordEngine</Filter>
35+
</ClCompile>
36+
<ClCompile Include="..\..\..\..\Source\Plugins\BinaryFormat\FileSource\BinaryFileSource.cpp">
37+
<Filter>Source Files\FileSource</Filter>
38+
</ClCompile>
39+
</ItemGroup>
40+
<ItemGroup>
41+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\BinaryRecording.h">
42+
<Filter>Source Files\RecordEngine</Filter>
43+
</ClInclude>
44+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\FileMemoryBlock.h">
45+
<Filter>Source Files\RecordEngine</Filter>
46+
</ClInclude>
47+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\NpyFile.h">
48+
<Filter>Source Files\RecordEngine</Filter>
49+
</ClInclude>
50+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\RecordEngine\SequentialBlockFile.h">
51+
<Filter>Source Files\RecordEngine</Filter>
52+
</ClInclude>
53+
<ClInclude Include="..\..\..\..\Source\Plugins\BinaryFormat\FileSource\BinaryFileSource.h">
54+
<Filter>Source Files\FileSource</Filter>
55+
</ClInclude>
56+
</ItemGroup>
57+
</Project>

‎Builds/VisualStudio2013/Plugins/BinaryWriter/BinaryWriter.vcxproj.filters‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎Builds/VisualStudio2013/Plugins/Plugins.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SpikeSorter", "SpikeSorter\
4141
EndProject
4242
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExampleProcessor", "ExampleProcessor\ExampleProcessor.vcxproj", "{767D282E-0BE5-4B35-874A-3B1ED925F06B}"
4343
EndProject
44-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryWriter", "BinaryWriter\BinaryWriter.vcxproj", "{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}"
45-
EndProject
4644
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NWBFormat", "NWBFormat\NWBFormat.vcxproj", "{270F2CBD-EE26-44CF-B53C-068CA80BFBF7}"
4745
ProjectSection(ProjectDependencies) = postProject
4846
{F250DB70-6E3E-408C-BD9E-1483D574499D} = {F250DB70-6E3E-408C-BD9E-1483D574499D}
@@ -66,6 +64,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IntanRecordingController",
6664
EndProject
6765
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LFP_Viewer_Beta", "LFP_Viewer_Beta\LFP_Viewer_Beta.vcxproj", "{A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}"
6866
EndProject
67+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BinaryFormat", "BinaryFormat\BinaryFormat.vcxproj", "{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}"
68+
EndProject
6969
Global
7070
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7171
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -256,18 +256,6 @@ Global
256256
{767D282E-0BE5-4B35-874A-3B1ED925F06B}.Release|Mixed Platforms.ActiveCfg = Release|x64
257257
{767D282E-0BE5-4B35-874A-3B1ED925F06B}.Release|Win32.ActiveCfg = Release|Win32
258258
{767D282E-0BE5-4B35-874A-3B1ED925F06B}.Release|x64.ActiveCfg = Release|x64
259-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Mixed Platforms.ActiveCfg = Release|x64
260-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Mixed Platforms.Build.0 = Release|x64
261-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Win32.ActiveCfg = Debug|Win32
262-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Win32.Build.0 = Debug|Win32
263-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.ActiveCfg = Debug|x64
264-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.Build.0 = Debug|x64
265-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Mixed Platforms.ActiveCfg = Release|x64
266-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Mixed Platforms.Build.0 = Release|x64
267-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Win32.ActiveCfg = Release|Win32
268-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Win32.Build.0 = Release|Win32
269-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|x64.ActiveCfg = Release|x64
270-
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|x64.Build.0 = Release|x64
271259
{270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
272260
{270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Mixed Platforms.Build.0 = Debug|Win32
273261
{270F2CBD-EE26-44CF-B53C-068CA80BFBF7}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -364,6 +352,18 @@ Global
364352
{A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|Win32.Build.0 = Release|Win32
365353
{A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|x64.ActiveCfg = Release|x64
366354
{A6E2C4F0-63A3-496B-8929-1B2785FDBBFD}.Release|x64.Build.0 = Release|x64
355+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
356+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Mixed Platforms.Build.0 = Debug|Win32
357+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Win32.ActiveCfg = Debug|Win32
358+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|Win32.Build.0 = Debug|Win32
359+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.ActiveCfg = Debug|x64
360+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Debug|x64.Build.0 = Debug|x64
361+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Mixed Platforms.ActiveCfg = Release|Win32
362+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Mixed Platforms.Build.0 = Release|Win32
363+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Win32.ActiveCfg = Release|Win32
364+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|Win32.Build.0 = Release|Win32
365+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|x64.ActiveCfg = Release|x64
366+
{9DB31964-F7E8-49B0-92E9-BAB2C35AF4B5}.Release|x64.Build.0 = Release|x64
367367
EndGlobalSection
368368
GlobalSection(SolutionProperties) = preSolution
369369
HideSolutionNode = FALSE

‎Source/Main.cpp‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,15 @@ class OpenEphysApplication : public JUCEApplication
6161

6262
StringArray parameters;
6363
parameters.addTokens(commandLine," ","\"");
64+
parameters.removeEmptyStrings();
6465

6566
#ifdef WIN32
6667
//glWinInit();
6768

68-
if (parameters.contains("--console",true))
69+
int consoleArg = parameters.indexOf("--console", true);
70+
if (consoleArg != -1)
6971
{
72+
parameters.remove(consoleArg);
7073
if (AllocConsole())
7174
{
7275
freopen("CONOUT$","w",stdout);
@@ -81,14 +84,20 @@ class OpenEphysApplication : public JUCEApplication
8184

8285
#endif
8386

84-
8587
customLookAndFeel = new CustomLookAndFeel();
8688
LookAndFeel::setDefaultLookAndFeel(customLookAndFeel);
8789

88-
mainWindow = new MainWindow();
89-
90-
9190

91+
// signal chain to load
92+
if (!parameters.isEmpty())
93+
{
94+
File fileToLoad(File::getCurrentWorkingDirectory().getChildFile(parameters[0]));
95+
mainWindow = new MainWindow(fileToLoad);
96+
}
97+
else
98+
{
99+
mainWindow = new MainWindow();
100+
}
92101
}
93102

94103
void shutdown() { }

‎Source/MainWindow.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static inline File getSavedStateDirectory() {
3939
#endif
4040
}
4141

42-
MainWindow::MainWindow()
42+
MainWindow::MainWindow(const File& fileToLoad)
4343
: DocumentWindow(JUCEApplication::getInstance()->getApplicationName(),
4444
Colour(Colours::black),
4545
DocumentWindow::allButtons)
@@ -83,7 +83,11 @@ static inline File getSavedStateDirectory() {
8383
// Constraining the window's size doesn't seem to work:
8484
setResizeLimits(500, 500, 10000, 10000);
8585

86-
if (shouldReloadOnStartup)
86+
if (!fileToLoad.getFullPathName().isEmpty())
87+
{
88+
ui->getEditorViewport()->loadState(fileToLoad);
89+
}
90+
else if (shouldReloadOnStartup)
8791
{
8892
File file = getSavedStateDirectory().getChildFile("lastConfig.xml");
8993
ui->getEditorViewport()->loadState(file);

‎Source/MainWindow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MainWindow : public DocumentWindow
4646

4747
/** Initializes the MainWindow, creates the AudioComponent, ProcessorGraph,
4848
and UIComponent, and sets the window boundaries. */
49-
MainWindow();
49+
MainWindow(const File& fileToLoad = File());
5050

5151
/** Destroys the AudioComponent, ProcessorGraph, and UIComponent, and saves the window boundaries. */
5252
~MainWindow();

0 commit comments

Comments
 (0)