aboutsummaryrefslogtreecommitdiff
path: root/generic/Track.c
diff options
context:
space:
mode:
authorlecoanet2003-11-28 13:40:54 +0000
committerlecoanet2003-11-28 13:40:54 +0000
commit3a5a3ce0060e9b1fbfdd789fa9e7eaaab9be4fe6 (patch)
treec4446448f68f17d2484b51611d0bda78200a7646 /generic/Track.c
parent6c59345d847f86a101898f8e5a475501ff1de1a4 (diff)
downloadtkzinc-3a5a3ce0060e9b1fbfdd789fa9e7eaaab9be4fe6.zip
tkzinc-3a5a3ce0060e9b1fbfdd789fa9e7eaaab9be4fe6.tar.gz
tkzinc-3a5a3ce0060e9b1fbfdd789fa9e7eaaab9be4fe6.tar.bz2
tkzinc-3a5a3ce0060e9b1fbfdd789fa9e7eaaab9be4fe6.tar.xz
* (Draw, Render): Corrected a bug on visible history size
being an unsigned causing a mis-coloring of the history when -lastasfirst is on.
Diffstat (limited to 'generic/Track.c')
-rw-r--r--generic/Track.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/Track.c b/generic/Track.c
index 06b231e..d43e426 100644
--- a/generic/Track.c
+++ b/generic/Track.c
@@ -1097,7 +1097,7 @@ Draw(ZnItem item)
XGCValues values;
History hist;
unsigned int h_side_size, side_size, width=0, height=0;
- unsigned int i, nb_hist, num_acc_pos, visible_history_size;
+ unsigned int i, nb_hist, num_acc_pos;
int x, y;
/* Draw the marker */
@@ -1221,12 +1221,12 @@ Draw(ZnItem item)
XChangeGC(wi->dpy, wi->gc, GCLineWidth | GCLineStyle, &values);
}
num_acc_pos = MIN(track->visible_history_size, ZnListSize(track->history));
- visible_history_size = MIN(track->visible_history_size-1, 0);
hist = ZnListArray(track->history);
side_size = MAX(width, height);
for (i = 0, nb_hist = 0; i < num_acc_pos; i++) {
- if (ISSET(track->flags, LAST_AS_FIRST_BIT) && (i == visible_history_size)) {
+ if (ISSET(track->flags, LAST_AS_FIRST_BIT) &&
+ (i == track->visible_history_size-1)) {
values.foreground = ZnGetGradientPixel(track->symbol_color, 0.0);
XChangeGC(wi->dpy, wi->gc, GCForeground, &values);
}
@@ -1330,7 +1330,7 @@ Render(ZnItem item)
TrackItem c_item;
History hist;
unsigned int h_side_size, side_size, width=0, height=0;
- unsigned int i, j, nb_hist, num_acc_pos, visible_history_size;
+ unsigned int i, j, nb_hist, num_acc_pos;
unsigned short alpha;
XColor *color;
ZnPoint *points;
@@ -1487,7 +1487,6 @@ Render(ZnItem item)
glLineWidth(1.0);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
num_acc_pos = MIN(track->visible_history_size, ZnListSize(track->history));
- visible_history_size = MIN(track->visible_history_size-1, 0);
hist = ZnListArray(track->history);
side_size = MAX(width, height);
/*
@@ -1497,7 +1496,8 @@ Render(ZnItem item)
glDisable(GL_LINE_SMOOTH);
glDisable(GL_POINT_SMOOTH);
for (i = 0, nb_hist = 0; i < num_acc_pos; i++) {
- if (ISSET(track->flags, LAST_AS_FIRST_BIT) && (i == visible_history_size)) {
+ if (ISSET(track->flags, LAST_AS_FIRST_BIT) &&
+ (i == track->visible_history_size-1)) {
color = ZnGetGradientColor(track->symbol_color, 0.0, &alpha);
alpha = ZnComposeAlpha(alpha, wi->alpha);
glColor4us(color->red, color->green, color->blue, alpha);