From 745b03e55721e986c54b8e7bdc0a9f8903ce96f7 Mon Sep 17 00:00:00 2001
From: Stuart Layton <slayton@mit.edu>
Date: Tue, 10 Apr 2012 11:53:40 -0400
Subject: [PATCH] Slightly altered the layout of the SpikeDisplayEditor, also I
changed the waveform line width from 1 to 2 pixels
---
.../Processors/Editors/SpikeDisplayEditor.cpp | 35 +++++++++----------
.../SpikePlotting/ProjectionAxes.h | 1 -
.../Visualization/SpikePlotting/WaveAxes.cpp | 2 +-
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Source/Processors/Editors/SpikeDisplayEditor.cpp b/Source/Processors/Editors/SpikeDisplayEditor.cpp
index f388bca12..103351c5c 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 045ff811f..a5270dac1 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 18feacbed..cd3b0e9cc 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;
--
GitLab