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

Builds/MacOSX/Info.plist

@@ -16,9 +16,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.2.3</string>
+    <string>0.2.4</string>
     <key>CFBundleVersion</key>
-    <string>0.2.3</string>
+    <string>0.2.4</string>
     <key>NSHumanReadableCopyright</key>
     <string>Open Ephys</string>
     <key>NSHighResolutionCapable</key>

Builds/VisualStudio2012/resources.rc

@@ -7,7 +7,7 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  0,2,3,0
+FILEVERSION  0,2,4,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -15,9 +15,9 @@ BEGIN
     BEGIN
       VALUE "CompanyName",  "Open Ephys\0"
       VALUE "FileDescription",  "open-ephys\0"
-      VALUE "FileVersion",  "0.2.3\0"
+      VALUE "FileVersion",  "0.2.4\0"
       VALUE "ProductName",  "open-ephys\0"
-      VALUE "ProductVersion",  "0.2.3\0"
+      VALUE "ProductVersion",  "0.2.4\0"
     END
   END
 

JuceLibraryCode/JuceHeader.h

@@ -39,8 +39,8 @@
 namespace ProjectInfo
 {
     const char* const  projectName    = "open-ephys";
-    const char* const  versionString  = "0.2.3";
-    const int          versionNumber  = 0x203;
+    const char* const  versionString  = "0.2.4";
+    const int          versionNumber  = 0x204;
 }
 
 #endif   // __APPHEADERFILE_YNSYIRR__

Source/MainWindow.cpp

@@ -92,9 +92,10 @@ void MainWindow::closeButtonPressed()
     if (audioComponent->callbacksAreActive())
     {
         audioComponent->endCallbacks();
-        processorGraph->disableProcessors();
     }
 
+	processorGraph->disableProcessors();
+
     JUCEApplication::getInstance()->systemRequestedQuit();
 
 }
@@ -112,6 +113,10 @@ void MainWindow::saveWindowBounds()
 
     XmlElement* xml = new XmlElement("MAINWINDOW");
 
+    xml->setAttribute("version", JUCEApplication::getInstance()->getApplicationVersion());
+
+    JUCEApplication::getInstance()->systemRequestedQuit();
+
     XmlElement* bounds = new XmlElement("BOUNDS");
     bounds->setAttribute("x",getScreenX());
     bounds->setAttribute("y",getScreenY());
@@ -121,6 +126,21 @@ void MainWindow::saveWindowBounds()
 
     xml->addChildElement(bounds);
 
+    XmlElement* recentDirectories = new XmlElement("RECENTDIRECTORYNAMES");
+
+    UIComponent* ui = (UIComponent*) getContentComponent();
+
+    StringArray dirs = ui->getRecentlyUsedFilenames();
+
+    for (int i = 0; i < dirs.size(); i++)
+    {
+        XmlElement* directory = new XmlElement("DIRECTORY");
+        directory->setAttribute("name", dirs[i]);
+        recentDirectories->addChildElement(directory);
+    }
+
+    xml->addChildElement(recentDirectories);
+
     String error;
 
     if (! xml->writeToFile(file, String::empty))
@@ -177,6 +197,23 @@ void MainWindow::loadWindowBounds()
 #endif
             getContentComponent()->setBounds(0,0,w-10,h-33);
             //setFullScreen(fs);
+            } else if (e->hasTagName("RECENTDIRECTORYNAMES"))
+            {
+
+                StringArray filenames;
+
+                forEachXmlChildElement(*e, directory)
+                {
+                
+                    if (directory->hasTagName("DIRECTORY"))
+                    {
+                        filenames.add(directory->getStringAttribute("name"));
+                    }
+                }
+
+                UIComponent* ui = (UIComponent*) getContentComponent();
+                ui->setRecentlyUsedFilenames(filenames);
+
             }
 
         }

Source/Processors/Editors/FilterEditor.cpp

@@ -36,35 +36,52 @@ FilterEditor::FilterEditor(GenericProcessor* parentNode, bool useDefaultParamete
     lastHighCutString = " ";
 
     highCutLabel = new Label("high cut label", "High cut:");
-    highCutLabel->setBounds(35,80,80,20);
+    highCutLabel->setBounds(10,65,80,20);
     highCutLabel->setFont(Font("Small Text", 12, Font::plain));
     highCutLabel->setColour(Label::textColourId, Colours::darkgrey);
     addAndMakeVisible(highCutLabel);
 
     lowCutLabel = new Label("low cut label", "Low cut:");
-    lowCutLabel->setBounds(35,30,80,20);
+    lowCutLabel->setBounds(10,25,80,20);
     lowCutLabel->setFont(Font("Small Text", 12, Font::plain));
     lowCutLabel->setColour(Label::textColourId, Colours::darkgrey);
     addAndMakeVisible(lowCutLabel);
 
     lowCutValue = new Label("low cut value", lastLowCutString);
-    lowCutValue->setBounds(40,50,60,20);
+    lowCutValue->setBounds(15,42,60,18);
     lowCutValue->setFont(Font("Default", 15, Font::plain));
     lowCutValue->setColour(Label::textColourId, Colours::white);
     lowCutValue->setColour(Label::backgroundColourId, Colours::grey);
     lowCutValue->setEditable(true);
     lowCutValue->addListener(this);
+    lowCutValue->setTooltip("Set the low cut for the selected channels");
     addAndMakeVisible(lowCutValue);
 
     highCutValue = new Label("high cut label", lastHighCutString);
-    highCutValue->setBounds(40,100,60,20);
+    highCutValue->setBounds(15,82,60,18);
     highCutValue->setFont(Font("Default", 15, Font::plain));
     highCutValue->setColour(Label::textColourId, Colours::white);
     highCutValue->setColour(Label::backgroundColourId, Colours::grey);
     highCutValue->setEditable(true);
     highCutValue->addListener(this);
+    highCutValue->setTooltip("Set the high cut for the selected channels");
     addAndMakeVisible(highCutValue);
 
+	applyFilterOnADC = new UtilityButton("+ADCs",Font("Default", 10, Font::plain));
+    applyFilterOnADC->addListener(this);
+    applyFilterOnADC->setBounds(90,70,40,18);
+    applyFilterOnADC->setClickingTogglesState(true);
+    applyFilterOnADC->setTooltip("When this button is off, ADC channels will not be filtered");
+    addAndMakeVisible(applyFilterOnADC);
+
+    applyFilterOnChan = new UtilityButton("+CH",Font("Default", 10, Font::plain));
+    applyFilterOnChan->addListener(this);
+    applyFilterOnChan->setBounds(95,95,30,18);
+    applyFilterOnChan->setClickingTogglesState(true);
+    applyFilterOnChan->setToggleState(true, false);
+    applyFilterOnChan->setTooltip("When this button is off, selected channels will not be filtered");
+    addAndMakeVisible(applyFilterOnChan);
+ 
 }
 
 FilterEditor::~FilterEditor()
@@ -117,11 +134,11 @@ void FilterEditor::labelTextChanged(Label* label)
 
         if (label == highCutValue)
         {
-            double minVal = fn->getLowCutValueForChannel(n);
+            double minVal = fn->getLowCutValueForChannel(chans[n]);
 
             if (requestedValue > minVal)
             {
-                fn->setCurrentChannel(n);
+                fn->setCurrentChannel(chans[n]);
                 fn->setParameter(1, requestedValue);
             }
 
@@ -130,11 +147,11 @@ void FilterEditor::labelTextChanged(Label* label)
         }
         else
         {
-            double maxVal = fn->getHighCutValueForChannel(n);
+            double maxVal = fn->getHighCutValueForChannel(chans[n]);
 
             if (requestedValue < maxVal)
             {
-                fn->setCurrentChannel(n);
+                fn->setCurrentChannel(chans[n]);
                 fn->setParameter(0, requestedValue);
             }
 
@@ -145,39 +162,42 @@ void FilterEditor::labelTextChanged(Label* label)
 
 }
 
-void FilterEditor::buttonEvent(Button* button)
+void FilterEditor::channelChanged(int chan)
 {
-    //std::cout << button->getRadioGroupId() << " " << button->getName() << std::endl;
-
-    //if (!checkDrawerButton(button) && !checkChannelSelectors(button)) {
-
-    // String value = button->getName();
-    // float val;
+    FilterNode* fn = (FilterNode*) getProcessor();
 
-    // val = value.getFloatValue();
+    highCutValue->setText(String(fn->getHighCutValueForChannel(chan)), dontSendNotification);
+    lowCutValue->setText(String(fn->getLowCutValueForChannel(chan)), dontSendNotification);
+    applyFilterOnChan->setToggleState(fn->getBypassStatusForChannel(chan), false);
 
-    // Array<int> chans = getActiveChannels();
+}
 
-    // GenericProcessor* p = (GenericProcessor*) getAudioProcessor();
+void FilterEditor::buttonEvent(Button* button)
+{
 
-    // for (int n = 0; n < chans.size(); n++)
-    // {
+    if (button == applyFilterOnADC)
+    {
+        FilterNode* fn = (FilterNode*) getProcessor();
+        fn->setApplyOnADC(applyFilterOnADC->getToggleState());
 
-    //     p->setCurrentChannel(chans[n]);
+    } else if (button == applyFilterOnChan)
+    {
+        FilterNode* fn = (FilterNode*) getProcessor();
 
-    //     if (button->getRadioGroupId() == 1)
-    //         getAudioProcessor()->setParameter(0,val);
-    //     else
-    //         getAudioProcessor()->setParameter(1,val*1000.0f);
+        Array<int> chans = getActiveChannels();
 
-    // }
-    //std::cout << button->getRadioGroupId() << " " << val << std::endl;
-    //	}
+        for (int n = 0; n < chans.size(); n++)
+        {
+            float newValue = button->getToggleState() ? 1.0 : 0.0;
 
+            fn->setCurrentChannel(chans[n]);
+            fn->setParameter(2, newValue);
+        }
+    }
 }
 
 
-void FilterEditor::saveEditorParameters(XmlElement* xml)
+void FilterEditor::saveCustomParameters(XmlElement* xml)
 {
 
     xml->setAttribute("Type", "FilterEditor");
@@ -185,9 +205,10 @@ void FilterEditor::saveEditorParameters(XmlElement* xml)
     XmlElement* textLabelValues = xml->createNewChildElement("VALUES");
     textLabelValues->setAttribute("HighCut",lastHighCutString);
     textLabelValues->setAttribute("LowCut",lastLowCutString);
+	textLabelValues->setAttribute("ApplyToADC",	applyFilterOnADC->getToggleState());
 }
 
-void FilterEditor::loadEditorParameters(XmlElement* xml)
+void FilterEditor::loadCustomParameters(XmlElement* xml)
 {
 
     forEachXmlChildElement(*xml, xmlNode)
@@ -196,6 +217,7 @@ void FilterEditor::loadEditorParameters(XmlElement* xml)
         {
             highCutValue->setText(xmlNode->getStringAttribute("HighCut"),dontSendNotification);
             lowCutValue->setText(xmlNode->getStringAttribute("LowCut"),dontSendNotification);
+			applyFilterOnADC->setToggleState(xmlNode->getBoolAttribute("ApplyToADC",false),true);
         }
     }
 }

Source/Processors/Editors/FilterEditor.h

@@ -39,20 +39,22 @@ class FilterViewport;
 */
 
 class FilterEditor : public GenericEditor,
-    public Label::Listener
+	public Label::Listener
 {
 public:
     FilterEditor(GenericProcessor* parentNode, bool useDefaultParameterEditors);
     virtual ~FilterEditor();
-    void buttonEvent(Button* button);
 
+    void buttonEvent(Button* button);
     void labelTextChanged(Label* label);
 
-    void saveEditorParameters(XmlElement* xml);
-    void loadEditorParameters(XmlElement* xml);
+    void saveCustomParameters(XmlElement* xml);
+    void loadCustomParameters(XmlElement* xml);
 
     void setDefaults(double lowCut, double highCut);
 
+    void channelChanged(int chan);
+
 private:
 
     String lastHighCutString;
@@ -63,6 +65,8 @@ private:
 
     ScopedPointer<Label> highCutValue;
     ScopedPointer<Label> lowCutValue;
+	ScopedPointer<UtilityButton> applyFilterOnADC;
+    ScopedPointer<UtilityButton> applyFilterOnChan;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(FilterEditor);
 

Source/Processors/Editors/PhaseDetectorEditor.cpp

@@ -161,7 +161,7 @@ void PhaseDetectorEditor::addDetector()
 
 }
 
-void PhaseDetectorEditor::saveEditorParameters(XmlElement* xml)
+void PhaseDetectorEditor::saveCustomParameters(XmlElement* xml)
 {
 
     xml->setAttribute("Type", "PhaseDetectorEditor");
@@ -176,7 +176,7 @@ void PhaseDetectorEditor::saveEditorParameters(XmlElement* xml)
     }
 }
 
-void PhaseDetectorEditor::loadEditorParameters(XmlElement* xml)
+void PhaseDetectorEditor::loadCustomParameters(XmlElement* xml)
 {
 
     int i = 0;

Source/Processors/Editors/PhaseDetectorEditor.h

@@ -56,8 +56,8 @@ public:
 
     void updateSettings();
 
-    void saveEditorParameters(XmlElement* xml);
-    void loadEditorParameters(XmlElement* xml);
+    void saveCustomParameters(XmlElement* xml);
+    void loadCustomParameters(XmlElement* xml);
 
 private:
 

Source/Processors/Editors/PulsePalOutputEditor.cpp

@@ -55,7 +55,7 @@ PulsePalOutputEditor::~PulsePalOutputEditor()
 
 }
 
-void PulsePalOutputEditor::saveEditorParameters(XmlElement* xml)
+void PulsePalOutputEditor::saveCustomParameters(XmlElement* xml)
 {
 
     xml->setAttribute("Type", "PulsePalOutputEditor");
@@ -71,7 +71,7 @@ void PulsePalOutputEditor::saveEditorParameters(XmlElement* xml)
     
 }
 
-void PulsePalOutputEditor::loadEditorParameters(XmlElement* xml)
+void PulsePalOutputEditor::loadCustomParameters(XmlElement* xml)
 {
 
     forEachXmlChildElement(*xml, xmlNode)

Source/Processors/Editors/PulsePalOutputEditor.h

@@ -54,8 +54,8 @@ private:
 
     PulsePal* pulsePal;
 
-    void saveEditorParameters(XmlElement* xml);
-    void loadEditorParameters(XmlElement* xml);
+    void saveCustomParameters(XmlElement* xml);
+    void loadCustomParameters(XmlElement* xml);
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PulsePalOutputEditor);
 

Source/Processors/Editors/SpikeDetectorEditor.cpp

@@ -489,9 +489,12 @@ void SpikeDetectorEditor::comboBoxChanged(ComboBox* comboBox)
 void SpikeDetectorEditor::checkSettings()
 {
     electrodeList->setSelectedItemIndex(0);
+    drawElectrodeButtons(0);
 
     getEditorViewport()->makeEditorVisible(this, true, true);
 
+
+
 }
 
 void SpikeDetectorEditor::drawElectrodeButtons(int ID)

Source/Processors/Editors/VisualizerEditor.cpp

@@ -190,7 +190,7 @@ void VisualizerEditor::buttonEvent(Button* button)
                 tabIndex = -1;
             }
 
-            if (dataWindow == nullptr)
+            if (dataWindow == nullptr) // have we created a window already?
             {
 
                 dataWindow = new DataWindow(windowSelector, tabText);
@@ -256,7 +256,7 @@ void VisualizerEditor::buttonEvent(Button* button)
 
 }
 
-void VisualizerEditor::saveEditorParameters(XmlElement* xml)
+void VisualizerEditor::saveCustomParameters(XmlElement* xml)
 {
 
     xml->setAttribute("Type", "Visualizer");
@@ -282,7 +282,7 @@ void VisualizerEditor::saveEditorParameters(XmlElement* xml)
 
 }
 
-void VisualizerEditor::loadEditorParameters(XmlElement* xml)
+void VisualizerEditor::loadCustomParameters(XmlElement* xml)
 {
 
     forEachXmlChildElement(*xml, xmlNode)
@@ -305,10 +305,13 @@ void VisualizerEditor::loadEditorParameters(XmlElement* xml)
             if (windowState)
             {
                 windowSelector->setToggleState(true,true);
-                dataWindow->setBounds(xmlNode->getIntAttribute("x"),
-                                      xmlNode->getIntAttribute("y"),
-                                      xmlNode->getIntAttribute("width"),
-                                      xmlNode->getIntAttribute("height"));
+				if (dataWindow != nullptr)
+				{
+					dataWindow->setBounds(xmlNode->getIntAttribute("x"),
+						                  xmlNode->getIntAttribute("y"),
+							              xmlNode->getIntAttribute("width"),
+								          xmlNode->getIntAttribute("height"));
+				}
 
             }
 

Source/Processors/Editors/VisualizerEditor.h

@@ -80,8 +80,8 @@ public:
 
     void updateVisualizer();
 
-    void saveEditorParameters(XmlElement* xml);
-    void loadEditorParameters(XmlElement* xml);
+    void saveCustomParameters(XmlElement* xml);
+    void loadCustomParameters(XmlElement* xml);
 
     virtual void saveVisualizerParameters(XmlElement* xml);
     virtual void loadVisualizerParameters(XmlElement* xml);

Source/Processors/FilterNode.cpp

@@ -46,7 +46,7 @@ FilterNode::FilterNode()
     // highCutValues.add(9000.0f);
 
     // parameters.add(Parameter("high cut",highCutValues, 2, 1));
-
+	applyOnADC = false;
 }
 
 FilterNode::~FilterNode()
@@ -126,13 +126,20 @@ AudioProcessorEditor* FilterNode::createEditor()
 
 void FilterNode::updateSettings()
 {
-
-    if (getNumInputs() < 1024 && getNumInputs() != filters.size())
+	int id = nodeId;
+	int numInputs = getNumInputs();
+	int numfilt = filters.size();
+    if (numInputs < 1024 && numInputs != numfilt)
     {
+		// SO fixed this. I think values were never restored correctly because you cleared lowCuts.
+	    Array<double> oldlowCuts, oldhighCuts;
+		oldlowCuts = lowCuts;
+		oldhighCuts = highCuts;
 
         filters.clear();
         lowCuts.clear();
         highCuts.clear();
+        shouldFilterChannel.clear();
 
         for (int n = 0; n < getNumInputs(); n++)
         {
@@ -154,12 +161,14 @@ void FilterNode::updateSettings()
 
             // restore defaults
 
+            shouldFilterChannel.add(true);
+
             float lc, hc;
 
-            if (lowCuts.size() > n)
+            if (oldlowCuts.size() > n)
             {
-                lc = lowCuts[n];
-                hc = highCuts[n];
+                lc = oldlowCuts[n];
+                hc = oldhighCuts[n];
             } else {
                 lc = defaultLowCut;
                 hc = defaultHighCut;
@@ -173,6 +182,8 @@ void FilterNode::updateSettings()
 
     }
 
+    setApplyOnADC(applyOnADC);
+
 }
 
 double FilterNode::getLowCutValueForChannel(int chan)
@@ -185,6 +196,11 @@ double FilterNode::getHighCutValueForChannel(int chan)
     return highCuts[chan];
 }
 
+bool FilterNode::getBypassStatusForChannel(int chan)
+{
+    return shouldFilterChannel[chan];
+}
+
 void FilterNode::setFilterParameters(double lowCut, double highCut, int chan)
 {
 
@@ -202,52 +218,41 @@ void FilterNode::setFilterParameters(double lowCut, double highCut, int chan)
 void FilterNode::setParameter(int parameterIndex, float newValue)
 {
 
-    if (newValue <= 0.01 || newValue >= 10000.0f)
-        return;
+    if (parameterIndex < 2) // change filter settings
+    {
 
-    //std::cout << "Setting channel " << currentChannel;// << std::endl;
+        if (newValue <= 0.01 || newValue >= 10000.0f)
+            return;
 
-    if (parameterIndex == 0)
-    {
-       // std::cout << " low cut to " << newValue << std::endl;
-        lowCuts.set(currentChannel,newValue);
-    }
-    else
-    {
-        //std::cout << " high cut to " << newValue << std::endl;
-        highCuts.set(currentChannel,newValue);
-    }
+        //std::cout << "Setting channel " << currentChannel;// << std::endl;
 
-    //std::cout << newValue << std::endl;
+        if (parameterIndex == 0)
+        {
+           // std::cout << " low cut to " << newValue << std::endl;
+            lowCuts.set(currentChannel,newValue);
+        }
+        else if (parameterIndex == 1)
+        {
+            //std::cout << " high cut to " << newValue << std::endl;
+            highCuts.set(currentChannel,newValue);
+        }
 
-    setFilterParameters(lowCuts[currentChannel],
+          setFilterParameters(lowCuts[currentChannel],
                         highCuts[currentChannel],
                         currentChannel);
 
+        editor->updateParameterButtons(parameterIndex);
 
-    // Deprecated code:
-    //if (parameterIndex)
-    //
-    // Parameter& p =  parameters.getReference(parameterIndex);
-
-    // p.setValue(newValue, currentChannel);
-
-    // Parameter& p1 =  parameters.getReference(0);
-    // Parameter& p2 =  parameters.getReference(1);
-
-    // std::cout << float(p1[currentChannel]) << " ";
-    // std::cout << float(p2[currentChannel]) << std::endl;
-
-    // if (parameterIndex == 0) {
-    // 	parameters[0].setValue(newValue, currentChannel);
-    // 	setFilterParameters(newValue, parameters[0][currentChannel], currentChannel);
-    // } else {
-    // 	parameters[1].setValue(newValue, currentChannel);
-    // 	setFilterParameters(lowCuts[currentChannel], newValue, currentChannel);
-    // }
-
-    editor->updateParameterButtons(parameterIndex);
-
+    } else // change channel bypass state
+    {
+        if (newValue == 0)
+        {
+            shouldFilterChannel.set(currentChannel, false);
+        } else {
+            shouldFilterChannel.set(currentChannel, true);
+        }
+        
+    }
 }
 
 void FilterNode::process(AudioSampleBuffer& buffer,
@@ -257,12 +262,32 @@ void FilterNode::process(AudioSampleBuffer& buffer,
 
     for (int n = 0; n < getNumOutputs(); n++)
     {
-        float* ptr = buffer.getSampleData(n);
-        filters[n]->process(nSamples, &ptr);
+		if (shouldFilterChannel[n])
+		{
+			float* ptr = buffer.getSampleData(n);
+			filters[n]->process(nSamples, &ptr);
+		}
     }
 
 }
 
+void FilterNode::setApplyOnADC(bool state)
+{
+
+    for (int n = 0; n < channels.size(); n++)
+    {
+        if (channels[n]->isADCchannel)
+        {
+            setCurrentChannel(n);
+
+            if (state)
+                setParameter(2,1.0);
+            else
+                setParameter(2,0.0);
+        }
+    }
+}
+
 void FilterNode::saveCustomChannelParametersToXml(XmlElement* channelInfo, int channelNumber, bool isEventChannel)
 {
 
@@ -275,6 +300,7 @@ void FilterNode::saveCustomChannelParametersToXml(XmlElement* channelInfo, int c
         XmlElement* channelParams = channelInfo->createNewChildElement("PARAMETERS");
         channelParams->setAttribute("highcut",highCuts[channelNumber]);
         channelParams->setAttribute("lowcut",lowCuts[channelNumber]);
+        channelParams->setAttribute("shouldFilter",shouldFilterChannel[channelNumber]);
     }
 
 }
@@ -292,6 +318,7 @@ void FilterNode::loadCustomChannelParametersFromXml(XmlElement* channelInfo, boo
             {
                 highCuts.set(channelNum, subNode->getDoubleAttribute("highcut",defaultHighCut));
                 lowCuts.set(channelNum, subNode->getDoubleAttribute("lowcut",defaultLowCut));
+                shouldFilterChannel.set(channelNum, subNode->getBoolAttribute("shouldFilter",true));
 
                 setFilterParameters(lowCuts[channelNum],
                                     highCuts[channelNum],

Source/Processors/FilterNode.h

@@ -58,18 +58,22 @@ public:
 
     double getLowCutValueForChannel(int chan);
     double getHighCutValueForChannel(int chan);
+    bool getBypassStatusForChannel(int chan);
 
     void updateSettings();
 
     void saveCustomChannelParametersToXml(XmlElement* channelInfo, int channelNumber, bool isEventChannel);
 
     void loadCustomChannelParametersFromXml(XmlElement* channelInfo, bool isEventChannel);
-
+	
+	void setApplyOnADC(bool state);
 private:
 
     Array<double> lowCuts, highCuts;
     OwnedArray<Dsp::Filter> filters;
+    Array<bool> shouldFilterChannel;
 
+	bool applyOnADC;
     double defaultLowCut;
     double defaultHighCut;
 

Source/Processors/GenericProcessor.cpp

@@ -589,7 +589,8 @@ void GenericProcessor::saveToXml(XmlElement* parentElement)
     for (int i = 0; i < channels.size(); i++)
     {
 
-        saveChannelParametersToXml(parentElement, i);
+        if (!isSplitter() && !isMerger())
+            saveChannelParametersToXml(parentElement, i);
 
         // channelName = String(i);
         // channelChildNode = parentElement->createNewChildElement("CHANNEL");
@@ -599,7 +600,8 @@ void GenericProcessor::saveToXml(XmlElement* parentElement)
 
     for (int i = 0; i < eventChannels.size(); i++)
     {
-        saveChannelParametersToXml(parentElement, i, true);
+        if (!isSplitter() && !isMerger())
+            saveChannelParametersToXml(parentElement, i, true);
 
         // channelName=/**String("EventCh:")+*/String(i);
         // channelChildNode = parentElement->createNewChildElement("EVENTCHANNEL");

Source/UI/EditorViewport.cpp

@@ -1178,7 +1178,7 @@ const String EditorViewport::saveState(File fileToUse)
     XmlElement* info = xml->createNewChildElement("INFO");
 
     XmlElement* version = info->createNewChildElement("VERSION");
-    version->addTextElement("0.1");
+    version->addTextElement(JUCEApplication::getInstance()->getApplicationVersion());
 
     Time currentTime = Time::getCurrentTime();
 
@@ -1355,7 +1355,9 @@ const String EditorViewport::loadState(File fileToLoad)
         return "Not a valid file.";
     }
 
-	bool olderVersionFound = true;
+	bool sameVersion = false;
+    String versionString;
+
 	forEachXmlChildElement(*xml, element)
     {
 		  if (element->hasTagName("INFO"))
@@ -1364,20 +1366,35 @@ const String EditorViewport::loadState(File fileToLoad)
 			  {
 			   if (element2->hasTagName("VERSION")) 
 			   {
-				   String S= element2->getAllSubText();
-				   double version =S.getDoubleValue();
-				   if (version >= 0.1)
-					   olderVersionFound = false;
+				   versionString = element2->getAllSubText();
+				   // float majorVersion = versionString.upToFirstOccurrenceOf(".", false, true).getIntValue();
+       //             float minorVersion = versionString.fromFirstOccurrenceOf(".", false, true).getFloatValue();
+
+				   if (versionString.equalsIgnoreCase(JUCEApplication::getInstance()->getApplicationVersion()))
+					   sameVersion = true;
 			   }
 			  }
 			  break;
 		  }
 	}
-	if (olderVersionFound)
+	if (!sameVersion)
 	{
-		    bool response = AlertWindow::showOkCancelBox (AlertWindow::NoIcon,
-                                   "Old configuration file.",
-                                    "File may not load properly since it could lack some fields. Continute?",
+        String responseString = "Your configuration file was saved from a different version of the GUI than the one you're using. \n";
+        responseString += "The current software is version ";
+        responseString += JUCEApplication::getInstance()->getApplicationVersion();
+        responseString += ", but the file you selected ";
+        if (versionString.length() > 0)
+        {
+            responseString += " is version ";
+            responseString += versionString;
+        } else {
+            responseString += "does not have a version number";
+        }
+        
+        responseString += ".\n This file may not load properly. Continue?";
+
+		bool response = AlertWindow::showOkCancelBox (AlertWindow::NoIcon, 
+                                     "Version mismatch", responseString,
                                      "Yes", "No", 0, 0);
         if (!response)
 			return "Failed To Open " + fileToLoad.getFileName();

Source/UI/GraphViewer.cpp

@@ -235,8 +235,12 @@ void GraphViewer::paint(Graphics& g)
     g.setFont(labelFont);
     
     g.setColour(Colours::grey);
+
+    JUCEApplication* app = JUCEApplication::getInstance();
+    String text = "open ephys ";
+    text += app->getApplicationVersion();
     
-    g.drawFittedText("open ephys", 40, 40, getWidth()-50, getHeight()-50, Justification::bottomRight, 100);
+    g.drawFittedText(text, 40, 40, getWidth()-50, getHeight()-50, Justification::bottomRight, 100);
     
     // draw connections
 

open-ephys.jucer

 <?xml version="1.0" encoding="UTF-8"?>
 
-<JUCERPROJECT id="ynSYIrr" name="open-ephys" projectType="guiapp" version="0.2.3"
+<JUCERPROJECT id="ynSYIrr" name="open-ephys" projectType="guiapp" version="0.2.4"
               juceLinkage="amalg_multi" buildVST="1" buildRTAS="0" buildAU="1"
               pluginName="Juce Project" pluginDesc="Juce Project" pluginManufacturer="yourcompany"
               pluginManufacturerCode="Manu" pluginCode="Plug" pluginChannelConfigs="{1, 1}, {2, 2}"