Skip to content
Snippets Groups Projects
Commit 745b03e5 authored by Stuart Layton's avatar Stuart Layton
Browse files

Slightly altered the layout of the SpikeDisplayEditor, also I changed the...

Slightly altered the layout of the SpikeDisplayEditor, also I changed the waveform line width from 1 to 2 pixels
parent abb75aa5
No related branches found
No related tags found
No related merge requests found
...@@ -46,28 +46,30 @@ void SpikeDisplayEditor::initializeButtons(){ ...@@ -46,28 +46,30 @@ void SpikeDisplayEditor::initializeButtons(){
x = xInitial; x = xInitial;
y += h + yPad/2; 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 = new ChannelSelectorButton("-", titleFont);
panDownBtn->setBounds(x, y, w, h); panDownBtn->setBounds(x, y, w, h);
panDownBtn->setClickingTogglesState(false); panDownBtn->setClickingTogglesState(false);
panDownBtn->addListener(this); panDownBtn->addListener(this);
x+= w+xPad*2; x+= w+xPad;
zoomInBtn = new ChannelSelectorButton("+", titleFont); panUpBtn = new ChannelSelectorButton("+", titleFont);
zoomInBtn->setBounds(x,y,w,h); panUpBtn->setBounds(x, y, w, h);
zoomInBtn->setClickingTogglesState(false); panUpBtn->setClickingTogglesState(false);
zoomInBtn->addListener(this); panUpBtn->addListener(this);
x += w + xPad; x+= w+xPad*2;
zoomOutBtn = new ChannelSelectorButton("-", titleFont); zoomOutBtn = new ChannelSelectorButton("-", titleFont);
zoomOutBtn->setBounds(x,y,w,h); zoomOutBtn->setBounds(x,y,w,h);
zoomOutBtn->setClickingTogglesState(false); zoomOutBtn->setClickingTogglesState(false);
zoomOutBtn->addListener(this); 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; x += w + xPad*3;
...@@ -77,8 +79,6 @@ void SpikeDisplayEditor::initializeButtons(){ ...@@ -77,8 +79,6 @@ void SpikeDisplayEditor::initializeButtons(){
clearBtn->addListener(this); clearBtn->addListener(this);
x += (w + xPad) *2; x += (w + xPad) *2;
/* /*
x = xInitial; x = xInitial;
y += h + yPad; y += h + yPad;
...@@ -125,15 +125,14 @@ void SpikeDisplayEditor::initializeButtons(){ ...@@ -125,15 +125,14 @@ void SpikeDisplayEditor::initializeButtons(){
} }
addAndMakeVisible(panUpBtn);
addAndMakeVisible(panDownBtn); addAndMakeVisible(panDownBtn);
addAndMakeVisible(panUpBtn);
addAndMakeVisible(panLabel); addAndMakeVisible(panLabel);
addAndMakeVisible(zoomInBtn);
addAndMakeVisible(zoomOutBtn); addAndMakeVisible(zoomOutBtn);
addAndMakeVisible(zoomInBtn);
addAndMakeVisible(zoomLabel); addAndMakeVisible(zoomLabel);
addAndMakeVisible(clearBtn); addAndMakeVisible(clearBtn);
//addAndMakeVisible(saveImgBtn); //addAndMakeVisible(saveImgBtn);
......
...@@ -37,7 +37,6 @@ class ProjectionAxes: public GenericAxes{ ...@@ -37,7 +37,6 @@ class ProjectionAxes: public GenericAxes{
void createFBO(); void createFBO();
void drawSpikesToTexture(bool allSpikes); void drawSpikesToTexture(bool allSpikes);
// void updateTexture();
void drawTexturedQuad(); void drawTexturedQuad();
void plotOldSpikes(bool allSpikes); void plotOldSpikes(bool allSpikes);
void plotNewestSpike(); void plotNewestSpike();
......
...@@ -82,7 +82,7 @@ void WaveAxes::plot(){ ...@@ -82,7 +82,7 @@ void WaveAxes::plot(){
//Draw the individual waveform points connected with a line //Draw the individual waveform points connected with a line
glColor3fv(waveColor); glColor3fv(waveColor);
glLineWidth(1); glLineWidth(2);
glBegin( GL_LINE_STRIP ); glBegin( GL_LINE_STRIP );
int dSamples = 1; int dSamples = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment