Merge pull request #259 from tne-lab/filternode-restore-labels

FilterNode: Make restoring high and low cut text work consistently
open-ephys · Sep 23, 2018 · 5f3186d · 5f3186d
2 parents 4ccc617 + 58b3f23
commit 5f3186d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/Source/Plugins/FilterNode/FilterEditor.cpp b/Source/Plugins/FilterNode/FilterEditor.cpp
@@ -94,6 +94,11 @@ void FilterEditor::setDefaults(double lowCut, double highCut)
     lastHighCutString = String(roundFloatToInt(highCut));
     lastLowCutString = String(roundFloatToInt(lowCut));
 
+    resetToSavedText();
+}
+
+void FilterEditor::resetToSavedText()
+{
     highCutValue->setText(lastHighCutString, dontSendNotification);
     lowCutValue->setText(lastLowCutString, dontSendNotification);
 }
@@ -219,8 +224,10 @@ void FilterEditor::loadCustomParameters(XmlElement* xml)
     {
         if (xmlNode->hasTagName("VALUES"))
         {
-            highCutValue->setText(xmlNode->getStringAttribute("HighCut"),dontSendNotification);
-            lowCutValue->setText(xmlNode->getStringAttribute("LowCut"),dontSendNotification);
+            lastHighCutString = xmlNode->getStringAttribute("HighCut", lastHighCutString);
+            lastLowCutString = xmlNode->getStringAttribute("LowCut", lastLowCutString);
+            resetToSavedText();
+
             applyFilterOnADC->setToggleState(xmlNode->getBoolAttribute("ApplyToADC",false), sendNotification);
         }
     }

diff --git a/Source/Plugins/FilterNode/FilterEditor.h b/Source/Plugins/FilterNode/FilterEditor.h
@@ -51,6 +51,7 @@ class FilterEditor : public GenericEditor,
     void loadCustomParameters(XmlElement* xml);
 
     void setDefaults(double lowCut, double highCut);
+    void resetToSavedText();
 
     void channelChanged (int chan, bool newState);
 

diff --git a/Source/Plugins/FilterNode/FilterNode.cpp b/Source/Plugins/FilterNode/FilterNode.cpp
@@ -310,6 +310,9 @@ void FilterNode::loadCustomChannelParametersFromXml(XmlElement* channelInfo, Inf
 
     if (channelType == InfoObjectCommon::DATA_CHANNEL)
     {
+        // restore high and low cut text in case they were changed by channelChanged
+        static_cast<FilterEditor*>(getEditor())->resetToSavedText();
+
         forEachXmlChildElement (*channelInfo, subNode)
         {
             if (subNode->hasTagName ("PARAMETERS"))

diff --git a/Source/Plugins/FilterNode/FilterNode.h b/Source/Plugins/FilterNode/FilterNode.h
@@ -50,8 +50,8 @@ class FilterNode : public GenericProcessor
 
     void updateSettings() override;
 
-	void saveCustomChannelParametersToXml(XmlElement* channelInfo, int channelNumber, InfoObjectCommon::InfoObjectType channelTypel) override;
-	void loadCustomChannelParametersFromXml(XmlElement* channelInfo, InfoObjectCommon::InfoObjectType channelType)  override;
+    void saveCustomChannelParametersToXml(XmlElement* channelInfo, int channelNumber, InfoObjectCommon::InfoObjectType channelTypel) override;
+    void loadCustomChannelParametersFromXml(XmlElement* channelInfo, InfoObjectCommon::InfoObjectType channelType)  override;
 
     double getLowCutValueForChannel  (int chan) const;
     double getHighCutValueForChannel (int chan) const;