diff --git a/Source/Processors/Editors/SpikeDisplayEditor.cpp b/Source/Processors/Editors/SpikeDisplayEditor.cpp index f388bca12b9f986df8a81d53d6ce0083ed241b31..103351c5c2e53bc7639be58e57fc2cd609d01beb 100644 --- a/Source/Processors/Editors/SpikeDisplayEditor.cpp +++ b/Source/Processors/Editors/SpikeDisplayEditor.cpp @@ -46,28 +46,30 @@ void SpikeDisplayEditor::initializeButtons(){ x = xInitial; y += h + yPad/2; - panUpBtn = new ChannelSelectorButton("+", titleFont); - panUpBtn->setBounds(x, y, w, h); - panUpBtn->setClickingTogglesState(false); - panUpBtn->addListener(this); - x+= w+xPad; - + panDownBtn = new ChannelSelectorButton("-", titleFont); panDownBtn->setBounds(x, y, w, h); panDownBtn->setClickingTogglesState(false); panDownBtn->addListener(this); - x+= w+xPad*2; + x+= w+xPad; - zoomInBtn = new ChannelSelectorButton("+", titleFont); - zoomInBtn->setBounds(x,y,w,h); - zoomInBtn->setClickingTogglesState(false); - zoomInBtn->addListener(this); - x += w + xPad; + panUpBtn = new ChannelSelectorButton("+", titleFont); + panUpBtn->setBounds(x, y, w, h); + panUpBtn->setClickingTogglesState(false); + panUpBtn->addListener(this); + x+= w+xPad*2; + zoomOutBtn = new ChannelSelectorButton("-", titleFont); zoomOutBtn->setBounds(x,y,w,h); zoomOutBtn->setClickingTogglesState(false); zoomOutBtn->addListener(this); + x += w + xPad; + + zoomInBtn = new ChannelSelectorButton("+", titleFont); + zoomInBtn->setBounds(x,y,w,h); + zoomInBtn->setClickingTogglesState(false); + zoomInBtn->addListener(this); x += w + xPad*3; @@ -77,8 +79,6 @@ void SpikeDisplayEditor::initializeButtons(){ clearBtn->addListener(this); x += (w + xPad) *2; - - /* x = xInitial; y += h + yPad; @@ -125,15 +125,14 @@ void SpikeDisplayEditor::initializeButtons(){ } - - addAndMakeVisible(panUpBtn); addAndMakeVisible(panDownBtn); + addAndMakeVisible(panUpBtn); addAndMakeVisible(panLabel); - - addAndMakeVisible(zoomInBtn); addAndMakeVisible(zoomOutBtn); + addAndMakeVisible(zoomInBtn); addAndMakeVisible(zoomLabel); + addAndMakeVisible(clearBtn); //addAndMakeVisible(saveImgBtn); diff --git a/Source/Processors/Visualization/SpikePlotting/ProjectionAxes.h b/Source/Processors/Visualization/SpikePlotting/ProjectionAxes.h index 045ff811ffcc4494c5b4abc18ea031dcefc43601..a5270dac1b306729c03a24985cab3495655ad9f7 100644 --- a/Source/Processors/Visualization/SpikePlotting/ProjectionAxes.h +++ b/Source/Processors/Visualization/SpikePlotting/ProjectionAxes.h @@ -37,7 +37,6 @@ class ProjectionAxes: public GenericAxes{ void createFBO(); void drawSpikesToTexture(bool allSpikes); - // void updateTexture(); void drawTexturedQuad(); void plotOldSpikes(bool allSpikes); void plotNewestSpike(); diff --git a/Source/Processors/Visualization/SpikePlotting/WaveAxes.cpp b/Source/Processors/Visualization/SpikePlotting/WaveAxes.cpp index 18feacbed932645bcdf1d36a0a63ea031f7f7347..cd3b0e9cc51fdbf2523d89469a5874929b95de01 100644 --- a/Source/Processors/Visualization/SpikePlotting/WaveAxes.cpp +++ b/Source/Processors/Visualization/SpikePlotting/WaveAxes.cpp @@ -82,7 +82,7 @@ void WaveAxes::plot(){ //Draw the individual waveform points connected with a line glColor3fv(waveColor); - glLineWidth(1); + glLineWidth(2); glBegin( GL_LINE_STRIP ); int dSamples = 1;