mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use 'cairo_translate()' instead of manual translation

Browse source 
I'd like to do 'cairo_scale()' too, but that messes up line sizes.  I'll
think about it.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2011-09-06 15:41:02 -07:00
parent dbfce3035e
commit 0e3bbd4102
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
profile.c
View file

@ -113,10 +113,10 @@ static int next_minmax(struct dive *dive, int index, int minmax)
} }
/* Scale to 0,0 -> maxx,maxy */ /* Scale to 0,0 -> maxx,maxy */
#define SCALE(x,y) (x)*maxx/scalex+topx,(y)*maxy/scaley+topy #define SCALE(x,y) (x)*maxx/scalex,(y)*maxy/scaley
static void plot_depth_text(struct dive *dive, cairo_t *cr, static void plot_depth_text(struct dive *dive, cairo_t *cr,
double topx, double topy, double maxx, double maxy) double maxx, double maxy)
{ {
double scalex, scaley; double scalex, scaley;
int maxtime, maxdepth; int maxtime, maxdepth;
@ -146,7 +146,7 @@ static void plot_depth_text(struct dive *dive, cairo_t *cr,
} }
static void plot_depth_profile(struct dive *dive, cairo_t *cr, static void plot_depth_profile(struct dive *dive, cairo_t *cr,
double topx, double topy, double maxx, double maxy) double maxx, double maxy)
{ {
double scalex, scaley; double scalex, scaley;
int begins, sec, depth; int begins, sec, depth;
@ -250,7 +250,7 @@ static int get_cylinder_pressure_range(struct dive *dive, double *scalex, double
} }
static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr, static void plot_cylinder_pressure(struct dive *dive, cairo_t *cr,
double topx, double topy, double maxx, double maxy) double maxx, double maxy)
{ {
int i, sec = -1; int i, sec = -1;
double scalex, scaley; double scalex, scaley;
@ -305,7 +305,7 @@ static double calculate_airuse(struct dive *dive)
} }
static void plot_info(struct dive *dive, cairo_t *cr, static void plot_info(struct dive *dive, cairo_t *cr,
double topx, double topy, double maxx, double maxy) double maxx, double maxy)
{ {
text_render_options_t tro = {0.2, 1.0, 0.2, LEFT}; text_render_options_t tro = {0.2, 1.0, 0.2, LEFT};
const double liters_per_cuft = 28.317; const double liters_per_cuft = 28.317;
@ -317,16 +317,16 @@ static void plot_info(struct dive *dive, cairo_t *cr,
/* I really need to start addign some unit setting thing */ /* I really need to start addign some unit setting thing */
airuse /= liters_per_cuft; airuse /= liters_per_cuft;
plot_text(cr, &tro, maxx*0.95, maxy*0.9, "cuft: %4.2f", airuse); plot_text(cr, &tro, maxx*0.8, maxy*0.8, "cuft: %4.2f", airuse);
if (dive->duration.seconds) { if (dive->duration.seconds) {
double pressure = 1 + (dive->meandepth.mm / 10000.0); double pressure = 1 + (dive->meandepth.mm / 10000.0);
double sac = airuse / pressure * 60 / dive->duration.seconds; double sac = airuse / pressure * 60 / dive->duration.seconds;
plot_text(cr, &tro, maxx*0.95, maxy*0.95, "SAC: %4.2f", sac); plot_text(cr, &tro, maxx*0.8, maxy*0.85, "SAC: %4.2f", sac);
} }
} }
static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr, static void plot_cylinder_pressure_text(struct dive *dive, cairo_t *cr,
double topx, double topy, double maxx, double maxy) double maxx, double maxy)
{ {
double scalex, scaley; double scalex, scaley;
double startp,endp; double startp,endp;
@ -351,19 +351,20 @@ static void plot(cairo_t *cr, int w, int h, struct dive *dive)
topy = h / 20.0; topy = h / 20.0;
maxx = (w - 2*topx); maxx = (w - 2*topx);
maxy = (h - 2*topy); maxy = (h - 2*topy);
cairo_translate(cr, topx, topy);
/* Cylinder pressure plot */ /* Cylinder pressure plot */
plot_cylinder_pressure(dive, cr, topx, topy, maxx, maxy); plot_cylinder_pressure(dive, cr, maxx, maxy);
/* Depth profile */ /* Depth profile */
plot_depth_profile(dive, cr, topx, topy, maxx, maxy); plot_depth_profile(dive, cr, maxx, maxy);
/* Text on top of all graphs.. */ /* Text on top of all graphs.. */
plot_depth_text(dive, cr, topx, topy, maxx, maxy); plot_depth_text(dive, cr, maxx, maxy);
plot_cylinder_pressure_text(dive, cr, topx, topy, maxx, maxy); plot_cylinder_pressure_text(dive, cr, maxx, maxy);
/* And info box in the lower right corner.. */ /* And info box in the lower right corner.. */
plot_info(dive, cr, topx, topy, maxx, maxy); plot_info(dive, cr, maxx, maxy);
/* Bounding box last */ /* Bounding box last */
scalex = scaley = 1.0; scalex = scaley = 1.0;