summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2014-05-13 15:49:23 (GMT)
committerjoye <joye>2014-05-13 15:49:23 (GMT)
commit1be6e25d00f76f32f9771b91727da9fc2e9d9925 (patch)
tree833001663f8f478348db24b9ca675c188baea7ad
parentd86e229eed5d65b1c1c01ee599eb1c3bd0be87a8 (diff)
downloadblt-1be6e25d00f76f32f9771b91727da9fc2e9d9925.zip
blt-1be6e25d00f76f32f9771b91727da9fc2e9d9925.tar.gz
blt-1be6e25d00f76f32f9771b91727da9fc2e9d9925.tar.bz2
*** empty log message ***
-rw-r--r--src/bltGrElemBar.C1
-rw-r--r--src/bltGraph.C15
-rw-r--r--src/bltGraph.h1
-rw-r--r--src/bltGraphBar.C2
-rw-r--r--src/bltGraphBar.h1
-rw-r--r--src/bltGraphLine.C2
-rw-r--r--src/bltGraphLine.h1
7 files changed, 5 insertions, 18 deletions
diff --git a/src/bltGrElemBar.C b/src/bltGrElemBar.C
index 00387bb..7b60aa9 100644
--- a/src/bltGrElemBar.C
+++ b/src/bltGrElemBar.C
@@ -245,7 +245,6 @@ int BarElement::configure()
void BarElement::map()
{
- // cerr << "BarElement::map()" << endl;
BarGraph* barGraphPtr_ = (BarGraph*)graphPtr_;
BarElementOptions* ops = (BarElementOptions*)ops_;
BarGraphOptions* gops = (BarGraphOptions*)graphPtr_->ops_;
diff --git a/src/bltGraph.C b/src/bltGraph.C
index 3a3a740..16455cb 100644
--- a/src/bltGraph.C
+++ b/src/bltGraph.C
@@ -218,7 +218,7 @@ void Graph::configure()
void Graph::map()
{
- // cerr << "Graph::map()" << endl;
+ cerr << "Graph::map()" << endl;
if (flags & RESET_AXES)
resetAxes();
@@ -239,7 +239,7 @@ void Graph::map()
void Graph::draw()
{
- // cerr << "Graph::draw()" << endl;
+ cerr << "Graph::draw()" << endl;
GraphOptions* ops = (GraphOptions*)ops_;
flags &= ~REDRAW_PENDING;
@@ -256,12 +256,8 @@ void Graph::draw()
map();
// Create a pixmap the size of the window for double buffering
- Pixmap drawable;
- if (ops->doubleBuffer)
- drawable = Tk_GetPixmap(display_, Tk_WindowId(tkwin_),
- width_, height_, Tk_Depth(tkwin_));
- else
- drawable = Tk_WindowId(tkwin_);
+ Pixmap drawable = Tk_GetPixmap(display_, Tk_WindowId(tkwin_),
+ width_, height_, Tk_Depth(tkwin_));
if (ops->backingStore) {
if ((cache_ == None)||(cacheWidth_ != width_)||(cacheHeight_ != height_)) {
@@ -324,8 +320,7 @@ void Graph::draw()
drawGC_, 0, 0, width_, height_, 0, 0);
enableCrosshairs();
- if (ops->doubleBuffer)
- Tk_FreePixmap(display_, drawable);
+ Tk_FreePixmap(display_, drawable);
flags &= ~MAP_WORLD;
flags &= ~REDRAW_WORLD;
diff --git a/src/bltGraph.h b/src/bltGraph.h
index dd44e7e..b05185f 100644
--- a/src/bltGraph.h
+++ b/src/bltGraph.h
@@ -104,7 +104,6 @@ typedef struct {
int borderWidth;
Margin margins[4];
int backingStore;
- int doubleBuffer;
Tk_Cursor cursor;
TextStyleOptions titleTextStyle;
int reqHeight;
diff --git a/src/bltGraphBar.C b/src/bltGraphBar.C
index b5c0145..95bdc2d 100644
--- a/src/bltGraphBar.C
+++ b/src/bltGraphBar.C
@@ -96,8 +96,6 @@ static Tk_OptionSpec optionSpecs[] = {
TK_OPTION_NULL_OK, NULL, 0},
{TK_OPTION_BOOLEAN, "-bufferelements", "bufferElements", "BufferElements",
"yes", -1, Tk_Offset(BarGraphOptions, backingStore), 0, NULL, 0},
- {TK_OPTION_BOOLEAN, "-buffergraph", "bufferGraph", "BufferGraph",
- "yes", -1, Tk_Offset(BarGraphOptions, doubleBuffer), 0, NULL, 0},
{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
"crosshair", -1, Tk_Offset(BarGraphOptions, cursor),
TK_OPTION_NULL_OK, NULL, 0},
diff --git a/src/bltGraphBar.h b/src/bltGraphBar.h
index e766025..6af84d3 100644
--- a/src/bltGraphBar.h
+++ b/src/bltGraphBar.h
@@ -60,7 +60,6 @@ typedef struct {
int borderWidth;
Margin margins[4];
int backingStore;
- int doubleBuffer;
Tk_Cursor cursor;
TextStyleOptions titleTextStyle;
int reqHeight;
diff --git a/src/bltGraphLine.C b/src/bltGraphLine.C
index 6403531..0398c2b 100644
--- a/src/bltGraphLine.C
+++ b/src/bltGraphLine.C
@@ -71,8 +71,6 @@ static Tk_OptionSpec optionSpecs[] = {
TK_OPTION_NULL_OK, NULL, 0},
{TK_OPTION_BOOLEAN, "-bufferelements", "bufferElements", "BufferElements",
"yes", -1, Tk_Offset(LineGraphOptions, backingStore), 0, NULL, 0},
- {TK_OPTION_BOOLEAN, "-buffergraph", "bufferGraph", "BufferGraph",
- "yes", -1, Tk_Offset(LineGraphOptions, doubleBuffer), 0, NULL, 0},
{TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
"crosshair", -1, Tk_Offset(LineGraphOptions, cursor),
TK_OPTION_NULL_OK, NULL, 0},
diff --git a/src/bltGraphLine.h b/src/bltGraphLine.h
index ffd50dd..1c99dea 100644
--- a/src/bltGraphLine.h
+++ b/src/bltGraphLine.h
@@ -40,7 +40,6 @@ typedef struct {
int borderWidth;
Margin margins[4];
int backingStore;
- int doubleBuffer;
Tk_Cursor cursor;
TextStyleOptions titleTextStyle;
int reqHeight;