From 64cb71df735ee69bcb7ac0e8261b5595ae395448 Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Wed, 4 Mar 2015 03:00:16 +0100
Subject: [PATCH] Make impedance measurements appear on canvas again
---
Source/Processors/DataThreads/RHD2000Editor.cpp | 16 ++++------------
Source/Processors/DataThreads/RHD2000Editor.h | 2 --
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/Source/Processors/DataThreads/RHD2000Editor.cpp b/Source/Processors/DataThreads/RHD2000Editor.cpp
index e8043fcb2..e5048cce4 100644
--- a/Source/Processors/DataThreads/RHD2000Editor.cpp
+++ b/Source/Processors/DataThreads/RHD2000Editor.cpp
@@ -308,18 +308,10 @@ void FPGAchannelList::comboBoxChanged(ComboBox* b)
void FPGAchannelList::updateImpedance(Array<int> streams, Array<int> channels, Array<float> magnitude, Array<float> phase)
{
- for (int k=0; k<streams.size(); k++)
- {
- for (int j=k; j<stream.size(); j++)
- {
- if (stream[j] == streams[k] && types[j] == HEADSTAGE_CHANNEL && orig_number[j] == channels[k])
- {
- channelComponents[j]->setImpedanceValues(magnitude[k],phase[k]);
- break;
- }
-
- }
- }
+ for (int k = 0; k < streams.size(); k++)
+ {
+ channelComponents[k]->setImpedanceValues(magnitude[k], phase[k]);
+ }
}
diff --git a/Source/Processors/DataThreads/RHD2000Editor.h b/Source/Processors/DataThreads/RHD2000Editor.h
index ef8bea165..c3d1559f8 100644
--- a/Source/Processors/DataThreads/RHD2000Editor.h
+++ b/Source/Processors/DataThreads/RHD2000Editor.h
@@ -75,8 +75,6 @@ public:
private:
Array<float> gains;
Array<ChannelType> types;
- Array<int> stream;
- Array<int> orig_number;
bool chainUpdate;
--
GitLab