From 70b9a635eade59024ee9e0039fafffb4040073ee Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Sat, 21 Apr 2012 17:04:20 -0400
Subject: [PATCH] Fixed problem with UtilityButton labels
---
Source/Processors/Editors/GenericEditor.h | 2 +-
Source/Processors/SpikeDisplayNode.cpp | 4 ++--
Source/Processors/SpikeDisplayNode.h | 18 +++++++-----------
.../Visualization/SpikeDisplayCanvas.cpp | 19 ++++++++++---------
.../Visualization/SpikeDisplayCanvas.h | 2 +-
Source/UI/ProcessorList.cpp | 4 ++--
6 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/Source/Processors/Editors/GenericEditor.h b/Source/Processors/Editors/GenericEditor.h
index d7b187ab8..3f4f1af73 100644
--- a/Source/Processors/Editors/GenericEditor.h
+++ b/Source/Processors/Editors/GenericEditor.h
@@ -170,7 +170,7 @@ class UtilityButton : public Button
{
public:
UtilityButton(const String& label_, Font font_) :
- Button("Utility"), label(label_), font(font_) {}
+ Button(label_), label(label_), font(font_) {}
~UtilityButton() {}
private:
void paintButton(Graphics& g, bool isMouseOver, bool isButtonDown);
diff --git a/Source/Processors/SpikeDisplayNode.cpp b/Source/Processors/SpikeDisplayNode.cpp
index 471a8267f..b48c32e57 100644
--- a/Source/Processors/SpikeDisplayNode.cpp
+++ b/Source/Processors/SpikeDisplayNode.cpp
@@ -28,7 +28,7 @@
SpikeDisplayNode::SpikeDisplayNode()
: GenericProcessor("Spike Viewer"),
- bufferSize(0), abstractFifo(100)
+ bufferSize(0)
{
// displayBuffer = new AudioSampleBuffer(8, 100);
@@ -43,7 +43,7 @@ SpikeDisplayNode::~SpikeDisplayNode()
AudioProcessorEditor* SpikeDisplayNode::createEditor()
{
- std::cout<<"SpikeDisplayNode Created!"<<std::endl;
+ std::cout<<"Creating SpikeDisplayCanvas."<<std::endl;
editor = new SpikeDisplayEditor(this);
return editor;
diff --git a/Source/Processors/SpikeDisplayNode.h b/Source/Processors/SpikeDisplayNode.h
index 02092c5a0..7b48706e4 100644
--- a/Source/Processors/SpikeDisplayNode.h
+++ b/Source/Processors/SpikeDisplayNode.h
@@ -31,22 +31,21 @@
#include "Visualization/SpikeObject.h"
-
-#define SPIKE_CMD_CLEAR_ALL 10000
-#define SPIKE_CMD_CLEAR_SEL 10001
-#define SPIKE_CMD_PAN_AXES 10002
-#define SPIKE_CMD_ZOOM_AXES 10003
-
-
/**
- Takes in MidiEvents and extracts SpikeObjects from the MidiEvent buffers. Those Events are then held in a queue until they are pulled by the spikeviewer
+ Takes in MidiEvents and extracts SpikeObjects from the MidiEvent buffers.
+ Those Events are then held in a queue until they are pulled by the SpikeDisplayCanvas.
@see GenericProcessor, SpikeDisplayEditor, SpikeDisplayCanvas
*/
+#define SPIKE_CMD_CLEAR_ALL 10000
+#define SPIKE_CMD_CLEAR_SEL 10001
+#define SPIKE_CMD_PAN_AXES 10002
+#define SPIKE_CMD_ZOOM_AXES 10003
+
class DataViewport;
@@ -77,15 +76,12 @@ public:
private:
int numberOfSources;
- AbstractFifo abstractFifo;
- ScopedPointer<AudioSampleBuffer> displayBuffer;
ScopedPointer<MidiBuffer> eventBuffer;
//std::queue<SpikeObject> spikebuffer;
int bufferSize;
- //bool resizeBuffer();
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SpikeDisplayNode);
diff --git a/Source/Processors/Visualization/SpikeDisplayCanvas.cpp b/Source/Processors/Visualization/SpikeDisplayCanvas.cpp
index 93bf967df..4e98409f6 100644
--- a/Source/Processors/Visualization/SpikeDisplayCanvas.cpp
+++ b/Source/Processors/Visualization/SpikeDisplayCanvas.cpp
@@ -30,8 +30,8 @@ SpikeDisplayCanvas::SpikeDisplayCanvas(SpikeDisplayNode* n) : processor(n),
- nPlots = 8;
- nCols = 2; //processor->getNumInputs();
+ nPlots = 1; //8;
+ nCols = 3; //processor->getNumInputs();
std::cout<<"SpikeDisplayNode has :"<<nPlots<<" outputs!"<<std::endl;
for (int i=0; i<nPlots; i++)
@@ -111,10 +111,10 @@ void SpikeDisplayCanvas::newOpenGLContextCreated()
{
std::cout<<"SpikeDisplayCanvas::newOpenGLContextCreated()"<<std::endl;
setUp2DCanvas();
-// activateAntiAliasing();
- disableAntiAliasing();
+ activateAntiAliasing();
+ disablePointSmoothing();
- glClearColor (0.667, 0.698, 0.718, 1.0);
+ glClearColor (0.667, 0.698, 0.918, 1.0);
resized();
endAnimation();
}
@@ -222,7 +222,7 @@ void SpikeDisplayCanvas::renderOpenGL()
// Identify which plot the spike should go to
- // Distribute those spike to the appropriate plot object
+ // Distribute thoses spike to the appropriate plot object
SpikeObject tmpSpike;
@@ -364,11 +364,12 @@ void SpikeDisplayCanvas::zoomPlot(int p, int c, bool in){
plots[p].zoom(c, in);
}
-void SpikeDisplayCanvas::disableAntiAliasing(){
+void SpikeDisplayCanvas::disablePointSmoothing(){
- glDisable(GL_LINE_SMOOTH);
+// glDisable(GL_LINE_SMOOTH);
glDisable(GL_POINT_SMOOTH);
- glDisable(GL_POLYGON_SMOOTH);
+// glDisable(GL_POLYGON_SMOOTH);
+
}
// void SpikeDisplayCanvas::resized()
diff --git a/Source/Processors/Visualization/SpikeDisplayCanvas.h b/Source/Processors/Visualization/SpikeDisplayCanvas.h
index 5de07d01c..e2bb49101 100644
--- a/Source/Processors/Visualization/SpikeDisplayCanvas.h
+++ b/Source/Processors/Visualization/SpikeDisplayCanvas.h
@@ -112,7 +112,7 @@ private:
void initializeSpikePlots();
void repositionSpikePlots();
- void disableAntiAliasing();
+ void disablePointSmoothing();
void canvasWasResized();
void mouseDownInCanvas(const MouseEvent& e);
// void mouseDrag(const MouseEvent& e);
diff --git a/Source/UI/ProcessorList.cpp b/Source/UI/ProcessorList.cpp
index df249380f..c0025b1e5 100644
--- a/Source/UI/ProcessorList.cpp
+++ b/Source/UI/ProcessorList.cpp
@@ -45,8 +45,8 @@ ProcessorList::ProcessorList() : isDragging(false),
};
setColour(PROCESSOR_COLOR, Colour(59, 59, 59));
- setColour(FILTER_COLOR, Colour(27, 86, 224));//Colour(255, 89, 0));
- setColour(SINK_COLOR, Colour(41, 76, 158));//Colour(255, 149, 0));
+ setColour(FILTER_COLOR, Colour(41, 76, 158));//Colour(255, 89, 0));
+ setColour(SINK_COLOR, Colour(93, 125, 199));//Colour(255, 149, 0));
setColour(SOURCE_COLOR, Colour(48, 67, 112)); //Colour(255, 0, 0));
setColour(UTILITY_COLOR, Colour(90, 80, 80));
--
GitLab