Skip to content
Snippets Groups Projects
Commit a1aa6658 authored by Cédric Roux's avatar Cédric Roux
Browse files

flip vertically XY plot, it was plotted the other way around

parent 71b5c59f
No related branches found
No related tags found
No related merge requests found
...@@ -22,10 +22,17 @@ static void paint(gui *_gui, widget *_this) ...@@ -22,10 +22,17 @@ static void paint(gui *_gui, widget *_this)
float center; float center;
int i; int i;
# define FLIP(v) (-(v) + allocated_plot_height-1)
printf("PAINT xy plot xywh %d %d %d %d\n", this->common.x, this->common.y, this->common.width, this->common.height); printf("PAINT xy plot xywh %d %d %d %d\n", this->common.x, this->common.y, this->common.width, this->common.height);
//x_draw_rectangle(g->x, g->xwin, 1, this->common.x, this->common.y, this->common.width, this->common.height); //x_draw_rectangle(g->x, g->xwin, 1, this->common.x, this->common.y, this->common.width, this->common.height);
wanted_plot_width = this->wanted_width;
allocated_plot_width = this->common.width - this->vrule_width;
wanted_plot_height = this->wanted_height;
allocated_plot_height = this->common.height - this->label_height * 2;
/* plot zone */ /* plot zone */
/* TODO: refine height - height of hrule text may be != from label */ /* TODO: refine height - height of hrule text may be != from label */
x_draw_rectangle(g->x, g->xwin, 1, x_draw_rectangle(g->x, g->xwin, 1,
...@@ -35,8 +42,6 @@ printf("PAINT xy plot xywh %d %d %d %d\n", this->common.x, this->common.y, this- ...@@ -35,8 +42,6 @@ printf("PAINT xy plot xywh %d %d %d %d\n", this->common.x, this->common.y, this-
this->common.height - this->label_height * 2); this->common.height - this->label_height * 2);
/* horizontal tics */ /* horizontal tics */
wanted_plot_width = this->wanted_width;
allocated_plot_width = this->common.width - this->vrule_width;
pxsize = (this->xmax - this->xmin) / wanted_plot_width; pxsize = (this->xmax - this->xmin) / wanted_plot_width;
ticdist = 100; ticdist = 100;
tic = floor(log10(ticdist * pxsize)); tic = floor(log10(ticdist * pxsize));
...@@ -83,8 +88,6 @@ printf("tic k %d val %g x %g\n", k, k * ticstep, x); ...@@ -83,8 +88,6 @@ printf("tic k %d val %g x %g\n", k, k * ticstep, x);
} }
/* vertical tics */ /* vertical tics */
wanted_plot_height = this->wanted_height;
allocated_plot_height = this->common.height - this->label_height * 2;
pxsize = (this->ymax - this->ymin) / wanted_plot_height; pxsize = (this->ymax - this->ymin) / wanted_plot_height;
ticdist = 30; ticdist = 30;
tic = floor(log10(ticdist * pxsize)); tic = floor(log10(ticdist * pxsize));
...@@ -115,12 +118,12 @@ printf("ymin/max %g %g height wanted allocated %d %d alloc ymin/max %g %g ticste ...@@ -115,12 +118,12 @@ printf("ymin/max %g %g height wanted allocated %d %d alloc ymin/max %g %g ticste
x_text_get_dimensions(g->x, v, &vwidth, &dummy, &dummy); x_text_get_dimensions(g->x, v, &vwidth, &dummy, &dummy);
x_draw_line(g->x, g->xwin, FOREGROUND_COLOR, x_draw_line(g->x, g->xwin, FOREGROUND_COLOR,
this->common.x + this->vrule_width, this->common.x + this->vrule_width,
this->common.y + y, this->common.y + FLIP(y),
this->common.x + this->vrule_width + 5, this->common.x + this->vrule_width + 5,
this->common.y + y); this->common.y + FLIP(y));
x_draw_string(g->x, g->xwin, FOREGROUND_COLOR, x_draw_string(g->x, g->xwin, FOREGROUND_COLOR,
this->common.x + this->vrule_width - vwidth - 2, this->common.x + this->vrule_width - vwidth - 2,
this->common.y + y - this->label_height / 2 + this->label_baseline, this->common.y + FLIP(y) - this->label_height/2+this->label_baseline,
v); v);
} }
...@@ -145,7 +148,7 @@ printf("ymin/max %g %g height wanted allocated %d %d alloc ymin/max %g %g ticste ...@@ -145,7 +148,7 @@ printf("ymin/max %g %g height wanted allocated %d %d alloc ymin/max %g %g ticste
y >= 0 && y < allocated_plot_height) y >= 0 && y < allocated_plot_height)
x_add_point(g->x, x_add_point(g->x,
this->common.x + this->vrule_width + x, this->common.x + this->vrule_width + x,
this->common.y + y); this->common.y + FLIP(y));
} }
x_plot_points(g->x, g->xwin, FOREGROUND_COLOR); x_plot_points(g->x, g->xwin, FOREGROUND_COLOR);
} }
......
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