From 7dc7afc3dd88f9700ea31223acce07e161a275ef Mon Sep 17 00:00:00 2001
From: jsiegle <joshs@alleninstitute.org>
Date: Tue, 23 Dec 2014 12:30:45 -0800
Subject: [PATCH] Minor changes before merge
---
Source/Processors/DataThreads/RHD2000Editor.cpp | 2 +-
Source/Processors/DataThreads/RHD2000Thread.cpp | 2 +-
Source/Processors/GenericProcessor/GenericProcessor.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/Processors/DataThreads/RHD2000Editor.cpp b/Source/Processors/DataThreads/RHD2000Editor.cpp
index c919920f7..b40c35195 100644
--- a/Source/Processors/DataThreads/RHD2000Editor.cpp
+++ b/Source/Processors/DataThreads/RHD2000Editor.cpp
@@ -142,7 +142,7 @@ void FPGAchannelList::update()
streamActive[k] = false;
streamColumn[k] = 0;
}
- int columnWidth =330;
+ int columnWidth = 330;
for (int k=0; k<numChannels; k++)
{
diff --git a/Source/Processors/DataThreads/RHD2000Thread.cpp b/Source/Processors/DataThreads/RHD2000Thread.cpp
index 9f357018b..afb86bf43 100644
--- a/Source/Processors/DataThreads/RHD2000Thread.cpp
+++ b/Source/Processors/DataThreads/RHD2000Thread.cpp
@@ -822,7 +822,7 @@ void RHD2000Thread::setDefaultChannelNamesAndType()
stream.clear();
gains.clear();
originalChannelNumber.clear();
- int aux_counter=1;
+ int aux_counter = 1;
int channelNumber = 1;
String oldName;
int dummy;
diff --git a/Source/Processors/GenericProcessor/GenericProcessor.cpp b/Source/Processors/GenericProcessor/GenericProcessor.cpp
index b2c65ac69..8cd369d65 100755
--- a/Source/Processors/GenericProcessor/GenericProcessor.cpp
+++ b/Source/Processors/GenericProcessor/GenericProcessor.cpp
@@ -370,7 +370,7 @@ void GenericProcessor::update()
// ch->setName("ADC"+String(1+i-(numChan-numADC_Chan)));
if (i >= numChan-numADC_Chan)
- ch->setName("ADC"+String(1+i-(numChan-numADC_Chan)));
+ ch->setName("ADC" + String(1+i-(numChan-numADC_Chan)));
if (i >= numChan-numADC_Chan)
ch->setType(ADC_CHANNEL);
--
GitLab