FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change plot routine to take a drawing_area as argument

Browse Source 
Previously we passed in width and height and the routine itself decided to
keep 5% margin around each edge - oddly doing this with double precision,
even though this is all integer coordinates.

Instead we are now passing in a drawing_area. We are kind of abusing the
cairo_rectangle_int_t data type here - but it seemed silly to redefine a
new data type for this.
Width and height give the size of the TOTAL drawing area (as before).
x and y give the offset from the edges - so the EFFECTIVE drawing area is
width-2x and height-2y
This is in preparation for adding tooltips - those need to know the
coordinate offsets from the edges - so having this hard coded inside the
plot function didn't make sense anymore.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel
2011-10-04 12:14:26 -07:00
parent d7e35c512c
commit b72ade0e78
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
profile.c
View File

@@ -722,14 +722,11 @@ static struct plot_info *create_plot_info(struct dive *dive)
return analyze_plot_info(pi);
}
void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, struct dive *dive)
{
double topx, topy;
struct plot_info *pi = create_plot_info(dive);
topx = w / 20.0;
topy = h / 20.0;
cairo_translate(gc->cr, topx, topy);
cairo_translate(gc->cr, drawing_area->x, drawing_area->y);
cairo_set_line_width(gc->cr, 2);
cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND);
cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND);
@@ -741,8 +738,8 @@ void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
*
* Snif. What a pity.
*/
gc->maxx = (w - 2*topx);
gc->maxy = (h - 2*topy);
gc->maxx = (drawing_area->width - 2*drawing_area->x);
gc->maxy = (drawing_area->height - 2*drawing_area->y);
/* Temperature profile */
plot_temperature_profile(gc, pi);