From 063c39320404bfdf25105b077245499fd010425b Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Wed, 22 Jan 2014 20:00:39 -0500
Subject: [PATCH] Make sure last string in bandpass filter is saved
---
Source/Processors/Editors/FilterEditor.cpp | 5 +++++
Source/UI/EditorViewport.cpp | 2 +-
Source/UI/SignalChainManager.cpp | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Source/Processors/Editors/FilterEditor.cpp b/Source/Processors/Editors/FilterEditor.cpp
index 9beedcc4e..7c930b76f 100755
--- a/Source/Processors/Editors/FilterEditor.cpp
+++ b/Source/Processors/Editors/FilterEditor.cpp
@@ -202,6 +202,9 @@ void FilterEditor::saveCustomParameters(XmlElement* xml)
xml->setAttribute("Type", "FilterEditor");
+ lastHighCutString = highCutValue->getText();
+ lastLowCutString = lowCutValue->getText();
+
XmlElement* textLabelValues = xml->createNewChildElement("VALUES");
textLabelValues->setAttribute("HighCut",lastHighCutString);
textLabelValues->setAttribute("LowCut",lastLowCutString);
@@ -220,4 +223,6 @@ void FilterEditor::loadCustomParameters(XmlElement* xml)
applyFilterOnADC->setToggleState(xmlNode->getBoolAttribute("ApplyToADC",false),true);
}
}
+
+
}
diff --git a/Source/UI/EditorViewport.cpp b/Source/UI/EditorViewport.cpp
index 4430d1132..660135135 100755
--- a/Source/UI/EditorViewport.cpp
+++ b/Source/UI/EditorViewport.cpp
@@ -294,7 +294,7 @@ void EditorViewport::clearSignalChain()
}
- repaint();
+ //repaint();
}
void EditorViewport::makeEditorVisible(GenericEditor* editor, bool highlight, bool updateSettings)
diff --git a/Source/UI/SignalChainManager.cpp b/Source/UI/SignalChainManager.cpp
index 6f2af4e25..e861afa90 100755
--- a/Source/UI/SignalChainManager.cpp
+++ b/Source/UI/SignalChainManager.cpp
@@ -395,8 +395,9 @@ void SignalChainManager::updateVisibleEditors(GenericEditor* activeEditor,
else
{
- if (editorToAdd->tabNumber() >= 0)
+ if (editorToAdd->tabNumber() >= 0 && editorToAdd->tabNumber() < signalChainArray.size())
signalChainArray[editorToAdd->tabNumber()]->setToggleState(true, false);
+
std::cout << "No source found." << std::endl;
editorToAdd = 0;
--
GitLab