Permalink
Browse files

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

  • Loading branch information...
2 parents f595bb1 + bc105ec commit 832b88fa53d27271a3a1999f1403f2df0ce04d91 Josh Siegle committed Nov 19, 2012
Showing with 32,364 additions and 1,687 deletions.
  1. +18 −0 Builds/Linux/Makefile
  2. +30,017 −0 Builds/Linux/build/data_stream_16ch_theta
  3. +870 −1,115 Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
  4. +6 −0 Builds/VisualStudio2010/open-ephys.vcxproj
  5. +18 −0 Builds/VisualStudio2010/open-ephys.vcxproj.filters
  6. +1 −1 Source/Processors/ArduinoOutput.cpp
  7. +1 −1 Source/Processors/ArduinoOutput.h
  8. +316 −0 Source/Processors/AudioResamplingNode.cpp
  9. +103 −0 Source/Processors/AudioResamplingNode.h
  10. +1 −1 Source/Processors/Channel.cpp
  11. +2 −2 Source/Processors/DataThreads/DataBuffer.cpp
  12. +13 −3 Source/Processors/DataThreads/FPGAThread.cpp
  13. +3 −3 Source/Processors/DataThreads/FileReaderThread.cpp
  14. +10 −10 Source/Processors/Editors/FPGAOutputEditor.cpp
  15. +2 −0 Source/Processors/Editors/FPGAOutputEditor.h
  16. +24 −2 Source/Processors/Editors/GenericEditor.cpp
  17. +1 −0 Source/Processors/Editors/GenericEditor.h
  18. +92 −25 Source/Processors/Editors/ParameterEditor.cpp
  19. +20 −2 Source/Processors/Editors/ParameterEditor.h
  20. +40 −0 Source/Processors/Editors/ResamplingNodeEditor.cpp
  21. +19 −36 Source/Processors/{Visualization/LfpViewer.h → Editors/ResamplingNodeEditor.h}
  22. +92 −14 Source/Processors/FPGAOutput.cpp
  23. +5 −1 Source/Processors/FPGAOutput.h
  24. +25 −4 Source/Processors/FilterNode.cpp
  25. +7 −3 Source/Processors/GenericProcessor.cpp
  26. +1 −1 Source/Processors/GenericProcessor.h
  27. +8 −4 Source/Processors/LfpDisplayNode.cpp
  28. +1 −1 Source/Processors/LfpDisplayNode.h
  29. +7 −7 Source/Processors/Parameter.cpp
  30. +5 −3 Source/Processors/Parameter.h
  31. +174 −0 Source/Processors/PhaseDetector.cpp
  32. +90 −0 Source/Processors/PhaseDetector.h
  33. +11 −5 Source/Processors/ProcessorGraph.cpp
  34. +186 −35 Source/Processors/RecordNode.cpp
  35. +27 −20 Source/Processors/RecordNode.h
  36. +67 −220 Source/Processors/ResamplingNode.cpp
  37. +21 −26 Source/Processors/ResamplingNode.h
  38. +16 −5 Source/Processors/SourceNode.cpp
  39. +18 −8 Source/Processors/Visualization/LfpDisplayCanvas.cpp
  40. +0 −122 Source/Processors/Visualization/LfpViewer.cpp
  41. +4 −4 Source/Processors/Visualization/SpikeObject.cpp
  42. +1 −1 Source/Processors/WiFiOutput.cpp
  43. +1 −1 Source/Processors/WiFiOutput.h
  44. +6 −1 Source/UI/ControlPanel.cpp
  45. +2 −0 Source/UI/ProcessorList.cpp
  46. +12 −0 open-ephys.jucer
View
@@ -63,6 +63,8 @@ OBJECTS := \
$(OBJDIR)/RootFinder_239a995f.o \
$(OBJDIR)/State_22979684.o \
$(OBJDIR)/AudioComponent_521bd9c9.o \
+ $(OBJDIR)/PhaseDetector_7193f7dc.o \
+ $(OBJDIR)/AudioResamplingNode_3dbffa2d.o \
$(OBJDIR)/Channel_33a3e5fe.o \
$(OBJDIR)/ofArduino_12f202a5.o \
$(OBJDIR)/ofSerial_c3b0a9e1.o \
@@ -89,6 +91,7 @@ OBJECTS := \
$(OBJDIR)/SpikeDetector_300d85e7.o \
$(OBJDIR)/AudioNode_94606ff3.o \
$(OBJDIR)/EventNode_95c842b7.o \
+ $(OBJDIR)/ResamplingNodeEditor_f2d6f061.o \
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o \
$(OBJDIR)/ArduinoOutputEditor_1118f008.o \
$(OBJDIR)/ChannelSelector_c1430874.o \
@@ -254,6 +257,16 @@ $(OBJDIR)/AudioComponent_521bd9c9.o: ../../Source/Audio/AudioComponent.cpp
@echo "Compiling AudioComponent.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/PhaseDetector_7193f7dc.o: ../../Source/Processors/PhaseDetector.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling PhaseDetector.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/AudioResamplingNode_3dbffa2d.o: ../../Source/Processors/AudioResamplingNode.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling AudioResamplingNode.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/Channel_33a3e5fe.o: ../../Source/Processors/Channel.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling Channel.cpp"
@@ -384,6 +397,11 @@ $(OBJDIR)/EventNode_95c842b7.o: ../../Source/Processors/EventNode.cpp
@echo "Compiling EventNode.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+$(OBJDIR)/ResamplingNodeEditor_f2d6f061.o: ../../Source/Processors/Editors/ResamplingNodeEditor.cpp
+ -@mkdir -p $(OBJDIR)
+ @echo "Compiling ResamplingNodeEditor.cpp"
+ @$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
$(OBJDIR)/FPGAOutputEditor_cfe00f8a.o: ../../Source/Processors/Editors/FPGAOutputEditor.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling FPGAOutputEditor.cpp"

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -142,6 +142,8 @@
<ClCompile Include="..\..\Source\Dsp\RootFinder.cpp"/>
<ClCompile Include="..\..\Source\Dsp\State.cpp"/>
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\PhaseDetector.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\AudioResamplingNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\Channel.cpp"/>
<ClCompile Include="..\..\Source\Processors\Serial\ofArduino.cpp"/>
<ClCompile Include="..\..\Source\Processors\Serial\ofSerial.cpp"/>
@@ -168,6 +170,7 @@
<ClCompile Include="..\..\Source\Processors\SpikeDetector.cpp"/>
<ClCompile Include="..\..\Source\Processors\AudioNode.cpp"/>
<ClCompile Include="..\..\Source\Processors\EventNode.cpp"/>
+ <ClCompile Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\FPGAOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.cpp"/>
<ClCompile Include="..\..\Source\Processors\Editors\ChannelSelector.cpp"/>
@@ -245,6 +248,8 @@
<ClInclude Include="..\..\Source\Dsp\Types.h"/>
<ClInclude Include="..\..\Source\Dsp\Utilities.h"/>
<ClInclude Include="..\..\Source\Audio\AudioComponent.h"/>
+ <ClInclude Include="..\..\Source\Processors\PhaseDetector.h"/>
+ <ClInclude Include="..\..\Source\Processors\AudioResamplingNode.h"/>
<ClInclude Include="..\..\Source\Processors\Channel.h"/>
<ClInclude Include="..\..\Source\Processors\Serial\ofArduino.h"/>
<ClInclude Include="..\..\Source\Processors\Serial\ofConstants.h"/>
@@ -274,6 +279,7 @@
<ClInclude Include="..\..\Source\Processors\SpikeDetector.h"/>
<ClInclude Include="..\..\Source\Processors\AudioNode.h"/>
<ClInclude Include="..\..\Source\Processors\EventNode.h"/>
+ <ClInclude Include="..\..\Source\Processors\Editors\ResamplingNodeEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\FPGAOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ArduinoOutputEditor.h"/>
<ClInclude Include="..\..\Source\Processors\Editors\ChannelSelector.h"/>
@@ -295,6 +295,12 @@
<ClCompile Include="..\..\Source\Audio\AudioComponent.cpp">
<Filter>open-ephys\Source\Audio</Filter>
</ClCompile>
+ <ClCompile Include="..\..\Source\Processors\PhaseDetector.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\Channel.cpp">
<Filter>open-ephys\Source\Processors</Filter>
</ClCompile>
@@ -373,6 +379,9 @@
<ClCompile Include="..\..\Source\Processors\EventNode.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\Editors\FPGAOutputEditor.cpp">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClCompile>
@@ -600,6 +609,12 @@
<ClInclude Include="..\..\Source\Audio\AudioComponent.h">
<Filter>open-ephys\Source\Audio</Filter>
</ClInclude>
+ <ClInclude Include="..\..\Source\Processors\PhaseDetector.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\Channel.h">
<Filter>open-ephys\Source\Processors</Filter>
</ClInclude>
@@ -687,6 +702,9 @@
<ClInclude Include="..\..\Source\Processors\EventNode.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\Editors\FPGAOutputEditor.h">
<Filter>open-ephys\Source\Processors\Editors</Filter>
</ClInclude>
@@ -42,7 +42,7 @@ AudioProcessorEditor* ArduinoOutput::createEditor()
return editor;
}
-void ArduinoOutput::handleEvent(int eventType, MidiMessage& event)
+void ArduinoOutput::handleEvent(int eventType, MidiMessage& event, int sampleNum)
{
if (eventType == TTL)
{
@@ -57,7 +57,7 @@ class ArduinoOutput : public GenericProcessor
void setParameter (int parameterIndex, float newValue);
- void handleEvent(int eventType, MidiMessage& event);
+ void handleEvent(int eventType, MidiMessage& event, int sampleNum);
bool enable();
bool disable();
Oops, something went wrong.

0 comments on commit 832b88f

Please sign in to comment.