From 040fdf5bb22c396d764b24dae075b908c4b75e3d Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Tue, 20 Mar 2012 17:34:36 -0400
Subject: [PATCH] Fixed char pointer problems
---
.../Visualization/SpikeDisplayCanvas.cpp | 19 ++++++++++++-------
.../Visualization/SpikePlotting/PlotUtils.cpp | 2 +-
.../Visualization/SpikePlotting/PlotUtils.h | 2 +-
.../SpikePlotting/StereotrodePlot.cpp | 2 +-
.../SpikePlotting/StereotrodePlot.h | 4 ++--
.../Visualization/SpikePlotting/TitleBox.cpp | 2 +-
.../Visualization/SpikePlotting/TitleBox.h | 4 ++--
7 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/Source/Processors/Visualization/SpikeDisplayCanvas.cpp b/Source/Processors/Visualization/SpikeDisplayCanvas.cpp
index ec856f57d..eb51fdb66 100644
--- a/Source/Processors/Visualization/SpikeDisplayCanvas.cpp
+++ b/Source/Processors/Visualization/SpikeDisplayCanvas.cpp
@@ -68,19 +68,24 @@ void SpikeDisplayCanvas::initializeSpikePlots(){
int plotWidth = (totalWidth - (nPlots + 1 ) * xBuffer) / nCols + .5;
int plotHeight = plotWidth / 2 + .5;
int rowCount = 0;
+
for (int i=0; i<nPlots; i++)
{
+
+ String name = "ST";
+ name+= i;
+
StereotrodePlot p = StereotrodePlot(
xBuffer + i%nCols * (plotWidth + xBuffer) ,
yBuffer + rowCount * (plotHeight + yBuffer),
plotWidth,
- plotHeight, ""); // deprecated conversion from string constant to char
+ plotHeight, name.toUTF8()); // deprecated conversion from string constant to char
plots.push_back(p);
if (i%nCols == nCols-1)
rowCount++;
- }
+ }
// Set the total height of the Canvas to the top of the top most plot
totalHeight = yBuffer + (rowCount + 1) * (plotHeight + yBuffer);
@@ -180,11 +185,11 @@ void SpikeDisplayCanvas::renderOpenGL()
SpikeObject tmpSpike;
- for (int i=0; i<plots.size(); i++){
- generateSimulatedSpike(&tmpSpike, 0, 100);
- plots[i].processSpikeObject(tmpSpike);
- plots[i].redraw();
- }
+ for (int i=0; i<plots.size(); i++){
+ generateSimulatedSpike(&tmpSpike, 0, 100);
+ plots[i].processSpikeObject(tmpSpike);
+ plots[i].redraw();
+ }
//}
//std::cout << getHeight()<<" "<< getTotalHeight()<<" "<<std::endl;
diff --git a/Source/Processors/Visualization/SpikePlotting/PlotUtils.cpp b/Source/Processors/Visualization/SpikePlotting/PlotUtils.cpp
index 766d2d5a3..4008a93bd 100644
--- a/Source/Processors/Visualization/SpikePlotting/PlotUtils.cpp
+++ b/Source/Processors/Visualization/SpikePlotting/PlotUtils.cpp
@@ -12,7 +12,7 @@ void checkGlError(){
else
std::cout<<"OpenGL Okay!"<<std::endl;
}
-void drawString(float x, float y, void *f, char *string){
+void drawString(float x, float y, void *f, const char *string){
// glRasterPos2f(x, y);
// int len = strlen(string);
// // glColor3f(1.0, 1.0, 1.0);
diff --git a/Source/Processors/Visualization/SpikePlotting/PlotUtils.h b/Source/Processors/Visualization/SpikePlotting/PlotUtils.h
index 43d7560e9..d2e0bd2d1 100644
--- a/Source/Processors/Visualization/SpikePlotting/PlotUtils.h
+++ b/Source/Processors/Visualization/SpikePlotting/PlotUtils.h
@@ -29,7 +29,7 @@
void checkGlError();
void setViewportRange(int xMin,int xMax,int yMin,int yMax);
-void drawString(float x, float y, void *f, char *string);
+void drawString(float x, float y, void *f, const char *string);
void strokeString(void*f, char *string);
void drawViewportEdge();
diff --git a/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.cpp b/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.cpp
index 5579fad26..238cae02b 100644
--- a/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.cpp
+++ b/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.cpp
@@ -9,7 +9,7 @@ StereotrodePlot::StereotrodePlot():
}
-StereotrodePlot::StereotrodePlot(int x, int y, int w, int h, char *n):
+StereotrodePlot::StereotrodePlot(int x, int y, int w, int h, const char *n):
BaseUIElement(x,y,w,h,1), titleHeight(0), enableTitle(true), limitsChanged(true)
{
plotTitle = n;
diff --git a/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.h b/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.h
index dfbef0732..46570b481 100644
--- a/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.h
+++ b/Source/Processors/Visualization/SpikePlotting/StereotrodePlot.h
@@ -20,7 +20,7 @@
class StereotrodePlot : public BaseUIElement{
- char *plotTitle;
+ const char *plotTitle;
TitleBox titleBox;
@@ -50,7 +50,7 @@ class StereotrodePlot : public BaseUIElement{
public:
StereotrodePlot();
- StereotrodePlot(int x, int y,int w,int h, char *n);
+ StereotrodePlot(int x, int y,int w,int h, const char *n);
~StereotrodePlot();
void initAxes();
diff --git a/Source/Processors/Visualization/SpikePlotting/TitleBox.cpp b/Source/Processors/Visualization/SpikePlotting/TitleBox.cpp
index 0f9a9ed81..ffd3586c0 100644
--- a/Source/Processors/Visualization/SpikePlotting/TitleBox.cpp
+++ b/Source/Processors/Visualization/SpikePlotting/TitleBox.cpp
@@ -11,7 +11,7 @@ BaseUIElement(0,0,15,100,0)
title = (char *) "Tetrode:00 abcdefghijkl";
}
-TitleBox::TitleBox(int x, int y,int w,int h, char *n):
+TitleBox::TitleBox(int x, int y,int w,int h, const char *n):
BaseUIElement(x,y,w,h,0)
{
setColor(.15, .15, .50);
diff --git a/Source/Processors/Visualization/SpikePlotting/TitleBox.h b/Source/Processors/Visualization/SpikePlotting/TitleBox.h
index c3c35553a..03585869a 100644
--- a/Source/Processors/Visualization/SpikePlotting/TitleBox.h
+++ b/Source/Processors/Visualization/SpikePlotting/TitleBox.h
@@ -12,7 +12,7 @@
class TitleBox : public BaseUIElement{
- char *title;
+ const char *title;
bool selected;
void drawTitle();
@@ -21,7 +21,7 @@ class TitleBox : public BaseUIElement{
public:
TitleBox();
- TitleBox(int x, int y,int w,int h, char *n);
+ TitleBox(int x, int y,int w,int h, const char *n);
void redraw();
void setTitle(char *n);
--
GitLab