Permalink
Browse files

Merge branch 'master' of https://github.com/open-ephys/GUI

  • Loading branch information...
uutari committed Nov 21, 2012
2 parents 2ef4ec7 + 5693792 commit 3fe158fabd1941bb8f632c5fcf8277bd9679369f
Showing with 1,869 additions and 1,090 deletions.
  1. +6 −0 .gitignore
  2. +12 −0 Builds/Linux/Makefile
  3. +1,155 −870 Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
  4. BIN ...en-ephys.xcodeproj/project.xcworkspace/xcuserdata/Josh.xcuserdatad/UserInterfaceState.xcuserstate
  5. +4 −0 Builds/VisualStudio2010/open-ephys.vcxproj
  6. +12 −0 Builds/VisualStudio2010/open-ephys.vcxproj.filters
  7. +12 −0 Builds/VisualStudio2012/open-ephys.vcxproj
  8. +36 −0 Builds/VisualStudio2012/open-ephys.vcxproj.filters
  9. +112 −112 JuceLibraryCode/BinaryData.cpp
  10. +3 −3 JuceLibraryCode/JuceHeader.h
  11. +1 −1 Source/Processors/ArduinoOutput.cpp
  12. +1 −1 Source/Processors/ArduinoOutput.h
  13. +25 −22 Source/Processors/AudioNode.cpp
  14. +9 −1 Source/Processors/Channel.cpp
  15. +5 −0 Source/Processors/Channel.h
  16. +13 −3 Source/Processors/DataThreads/FPGAThread.cpp
  17. +78 −0 Source/Processors/Editors/RecordControlEditor.cpp
  18. +53 −0 Source/Processors/Editors/RecordControlEditor.h
  19. +11 −8 Source/Processors/FPGAOutput.cpp
  20. +1 −1 Source/Processors/FPGAOutput.h
  21. +5 −5 Source/Processors/FilterNode.cpp
  22. +8 −2 Source/Processors/GenericProcessor.cpp
  23. +1 −1 Source/Processors/GenericProcessor.h
  24. +8 −4 Source/Processors/LfpDisplayNode.cpp
  25. +1 −1 Source/Processors/LfpDisplayNode.h
  26. +11 −5 Source/Processors/PhaseDetector.cpp
  27. +1 −1 Source/Processors/PhaseDetector.h
  28. +7 −1 Source/Processors/ProcessorGraph.cpp
  29. +90 −30 Source/Processors/RecordNode.cpp
  30. +8 −2 Source/Processors/RecordNode.h
  31. +7 −5 Source/Processors/SourceNode.cpp
  32. +76 −0 Source/Processors/Utilities/RecordControl.cpp
  33. +54 −0 Source/Processors/Utilities/RecordControl.h
  34. +18 −8 Source/Processors/Visualization/LfpDisplayCanvas.cpp
  35. +1 −1 Source/Processors/WiFiOutput.cpp
  36. +1 −1 Source/Processors/WiFiOutput.h
  37. +13 −1 Source/UI/ControlPanel.cpp
  38. +1 −0 Source/UI/ControlPanel.h
  39. +1 −0 Source/UI/ProcessorList.cpp
  40. +8 −0 open-ephys.jucer
View
@@ -8,6 +8,11 @@
Builds/Linux/build/open-ephys
Resources/Fonts/font_serializer/Builds/Linux/build/
JuceLibraryCode/jucer/Builds/Linux/build
+JuceLibraryCode/jucer/Builds/VisualStudio2010/Debug
+JuceLibraryCode/jucer/Builds/VisualStudio2010/Release
+JuceLibraryCode/jucer/Builds/VisualStudio2010/*.user
+JuceLibraryCode/jucer/Builds/VisualStudio2010/The Jucer.sdf
+JuceLibraryCode/jucer/Builds/VisualStudio2010/The Jucer.v11.suo
# 3. extra files
Builds/Linux/build/data
@@ -22,6 +27,7 @@ Builds/VisualStudio2012/Debug
Builds/VisualStudio2012/Release
Builds/VisualStudio2012/ipch
Builds/VisualStudio2012/open-ephys.sdf
+Builds/VisualStudio2012/open-ephys.opensdf
Builds/VisualStudio2012/open-ephys.suo
Builds/VisualStudio2012/open-ephys.v11.suo
Builds/VisualStudio2012/open-ephys.vcxproj.user
View
@@ -75,6 +75,7 @@ OBJECTS := \
$(OBJDIR)/SpikeDisplayNode_9c52e4ad.o \
$(OBJDIR)/WiFiOutput_fa464ec5.o \
$(OBJDIR)/LfpDisplayNode_30ef22fd.o \
+ $(OBJDIR)/RecordControl_3e1c6062.o \
$(OBJDIR)/Merger_2f90542e.o \
$(OBJDIR)/Splitter_6e27a57b.o \
$(OBJDIR)/SpikePlot_c1cf98bd.o \
@@ -91,6 +92,7 @@ OBJECTS := \
$(OBJDIR)/SpikeDetector_300d85e7.o \
$(OBJDIR)/AudioNode_94606ff3.o \
$(OBJDIR)/EventNode_95c842b7.o \
+ $(OBJDIR)/RecordControlEditor_244084cb.o \
$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o \
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o \
$(OBJDIR)/ArduinoOutputEditor_1118f008.o \
@@ -317,6 +319,11 @@ $(OBJDIR)/LfpDisplayNode_30ef22fd.o: ../../Source/Processors/LfpDisplayNode.cpp
@echo "Compiling LfpDisplayNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/RecordControl_3e1c6062.o: ../../Source/Processors/Utilities/RecordControl.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling RecordControl.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/Merger_2f90542e.o: ../../Source/Processors/Utilities/Merger.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling Merger.cpp"
@@ -397,6 +404,11 @@ $(OBJDIR)/EventNode_95c842b7.o: ../../Source/Processors/EventNode.cpp
@echo "Compiling EventNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/RecordControlEditor_244084cb.o: ../../Source/Processors/Editors/RecordControlEditor.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling RecordControlEditor.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o: ../../Source/Processors/Editors/ResamplingNodeEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling ResamplingNodeEditor.cpp"

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -154,6 +154,7 @@
<ClCompile Include="..\..\Source\Processors\SpikeDisplayNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\WiFiOutput.cpp"/>
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp"/>
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp"/>
<ClCompile Include="..\..\Source\Processors\Utilities\Splitter.cpp"/>
<ClCompile Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.cpp"/>
@@ -170,6 +171,7 @@
<ClCompile Include="..\..\Source\Processors\SpikeDetector.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\EventNode.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\FPGAOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.cpp"/>
@@ -261,6 +263,7 @@
<ClInclude Include="..\..\Source\Processors\SpikeDisplayNode.h"/>
<ClInclude Include="..\..\Source\Processors\WiFiOutput.h"/>
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h"/>
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h"/>
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h"/>
<ClInclude Include="..\..\Source\Processors\Utilities\Splitter.h"/>
<ClInclude Include="..\..\Source\Processors\Visualization\SpikePlotting\SpikePlot.h"/>
@@ -279,6 +282,7 @@
<ClInclude Include="..\..\Source\Processors\SpikeDetector.h"/>
<ClInclude Include="..\..\Source\Processors\AudioNode.h"/>
<ClInclude Include="..\..\Source\Processors\EventNode.h"/>
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\FPGAOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.h"/>
@@ -331,6 +331,9 @@
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClCompile>
@@ -379,6 +382,9 @@
<ClCompile Include="..\..\Source\Processors\EventNode.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
<ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
@@ -648,6 +654,9 @@
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h">
<Filter>open-ephys\Source\Processors\Utilities</Filter>
</ClInclude>
@@ -702,6 +711,9 @@
<ClInclude Include="..\..\Source\Processors\EventNode.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
<ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
@@ -161,12 +161,18 @@
<ClCompile Include="..\..\Source\Dsp\State.cpp" />
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp" />
<ClCompile Include="..\..\Source\Processors\ArduinoOutput.cpp" />
+ <ClCompile Include="..\..\Source\Processors\AudioResamplingNode.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Channel.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp" />
<ClCompile Include="..\..\Source\Processors\EventDetector.cpp" />
<ClCompile Include="..\..\Source\Processors\FPGAOutput.cpp" />
<ClCompile Include="..\..\Source\Processors\Parameter.cpp" />
+ <ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp" />
<ClCompile Include="..\..\Source\Processors\Serial\ofArduino.cpp" />
<ClCompile Include="..\..\Source\Processors\Serial\ofSerial.cpp" />
<ClCompile Include="..\..\Source\Processors\SpikeDisplayNode.cpp" />
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp" />
<ClCompile Include="..\..\Source\Processors\WiFiOutput.cpp" />
<ClCompile Include="..\..\Source\Processors\LfpDisplayNode.cpp" />
<ClCompile Include="..\..\Source\Processors\Utilities\Merger.cpp" />
@@ -263,13 +269,19 @@
<ClInclude Include="..\..\Source\Dsp\Utilities.h" />
<ClInclude Include="..\..\Source\Audio\AudioComponent.h" />
<ClInclude Include="..\..\Source\Processors\ArduinoOutput.h" />
+ <ClInclude Include="..\..\Source\Processors\AudioResamplingNode.h" />
+ <ClInclude Include="..\..\Source\Processors\Channel.h" />
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h" />
+ <ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h" />
<ClInclude Include="..\..\Source\Processors\EventDetector.h" />
<ClInclude Include="..\..\Source\Processors\FPGAOutput.h" />
<ClInclude Include="..\..\Source\Processors\Parameter.h" />
+ <ClInclude Include="..\..\Source\Processors\PhaseDetector.h" />
<ClInclude Include="..\..\Source\Processors\Serial\ofArduino.h" />
<ClInclude Include="..\..\Source\Processors\Serial\ofConstants.h" />
<ClInclude Include="..\..\Source\Processors\Serial\ofSerial.h" />
<ClInclude Include="..\..\Source\Processors\SpikeDisplayNode.h" />
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h" />
<ClInclude Include="..\..\Source\Processors\WiFiOutput.h" />
<ClInclude Include="..\..\Source\Processors\LfpDisplayNode.h" />
<ClInclude Include="..\..\Source\Processors\Utilities\Merger.h" />
@@ -345,6 +345,24 @@
<ClCompile Include="..\..\Source\Processors\FPGAOutput.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Channel.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\AudioResamplingNode.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Editors\RecordControlEditor.cpp">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\Source\Processors\Utilities\RecordControl.cpp">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\AccessClass.h">
@@ -647,5 +665,23 @@
<ClInclude Include="..\..\Source\Processors\FPGAOutput.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Channel.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\AudioResamplingNode.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\PhaseDetector.h">
+ <Filter>open-ephys\Source\Processors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Editors\RecordControlEditor.h">
+ <Filter>open-ephys\Source\Processors\Editors</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\Source\Processors\Utilities\RecordControl.h">
+ <Filter>open-ephys\Source\Processors\Utilities</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
Oops, something went wrong.

0 comments on commit 3fe158f

Please sign in to comment.