From e1c47f670e4c9b49bb57e4a57ffb1fc09a4dc5e5 Mon Sep 17 00:00:00 2001
From: Christopher Stawarz <cstawarz@mit.edu>
Date: Tue, 24 May 2016 11:14:06 -0400
Subject: [PATCH] Addressed some compiler warnings
---
Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp | 6 +++---
Source/Processors/Editors/ChannelSelector.cpp | 8 ++++----
Source/Utils/ListSliceParser.cpp | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp b/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp
index f484e2c93..6adfc0928 100644
--- a/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp
+++ b/Source/Plugins/LfpDisplayNodeBeta/LfpDisplayCanvas.cpp
@@ -2066,8 +2066,8 @@ void LfpChannelDisplay::pxPaint()
int jfrom_wholechannel= (int) (getY()+center-channelHeight/2)+1 +0 ;
int jto_wholechannel= (int) (getY()+center+channelHeight/2) -0;
- int jfrom_wholechannel_almost= (int) (getY()+center-channelHeight/3)+1 +0 ; // a bit less tall, for saturation warnings
- int jto_wholechannel_almost= (int) (getY()+center+channelHeight/3) -0;
+ //int jfrom_wholechannel_almost= (int) (getY()+center-channelHeight/3)+1 +0 ; // a bit less tall, for saturation warnings
+ //int jto_wholechannel_almost= (int) (getY()+center+channelHeight/3) -0;
// max and min of channel, this is the range where actual data is drawn
@@ -2256,7 +2256,7 @@ void LfpChannelDisplay::pxPaint()
{
hfrom = (cs_next); hto = (cs_this);
}
- float hrange=hto-hfrom;
+ //float hrange=hto-hfrom;
float ha=1;
for (int l=hfrom; l<hto; l++)
{
diff --git a/Source/Processors/Editors/ChannelSelector.cpp b/Source/Processors/Editors/ChannelSelector.cpp
index 6d0f3fd78..3f4c4bdbe 100755
--- a/Source/Processors/Editors/ChannelSelector.cpp
+++ b/Source/Processors/Editors/ChannelSelector.cpp
@@ -41,12 +41,12 @@ static const int DURATION_ANIMATION_COLLAPSE_MS = 200;
ChannelSelector::ChannelSelector(bool createButtons, Font& titleFont_) :
- eventsOnly(false), paramsToggled(true), paramsActive(true),
- recActive(true), radioStatus(false), isNotSink(createButtons),
- moveRight(false), moveLeft(false), offsetLR(0), offsetUD(0), desiredOffset(0), titleFont(titleFont_), acquisitionIsActive(false)
+ eventsOnly(false)
+ , parameterSlicerChannelSelector (Channels::PARAM_CHANNELS, "Parameter slicer channel selector component")
, audioSlicerChannelSelector (Channels::AUDIO_CHANNELS, "Audio slicer channel selector component")
, recordSlicerChannelSelector (Channels::RECORD_CHANNELS, "Record slicer channel selector component")
- , parameterSlicerChannelSelector (Channels::PARAM_CHANNELS, "Parameter slicer channel selector component")
+ , paramsToggled(true), paramsActive(true), recActive(true), radioStatus(false), isNotSink(createButtons)
+ , moveRight(false), moveLeft(false), offsetLR(0), offsetUD(0), desiredOffset(0), titleFont(titleFont_), acquisitionIsActive(false)
{
// initialize buttons
audioButton = new EditorButton("AUDIO", titleFont);
diff --git a/Source/Utils/ListSliceParser.cpp b/Source/Utils/ListSliceParser.cpp
index 022821979..45ecfe0cc 100644
--- a/Source/Utils/ListSliceParser.cpp
+++ b/Source/Utils/ListSliceParser.cpp
@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
int ListSliceParser::convertStringToInteger (String s)
{
char ar[20];
- int i, j, k = 0;
+ int i, k = 0;
for (i = 0; i < s.length(); i++)
{
if (s[i] >= 48 && s[i] <= 57)
--
GitLab