mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve visual appearance of horizontal marker lines

Browse source 
This changes two things to improve the appearance of the profile:
- the partial pressure scale is now in 0.5 increments if the total is <= 4
  and in 1.0 increments if it is > 4.
- the depth marker lines end slightly below the depth chart so that we no
  longer have overlap between the depth scale and the partial pressure
  scale.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-16 22:02:42 -10:00
parent 33ae98c96f
commit a691a8e5a3
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
profile.c
View file

@ -552,7 +552,7 @@ static void plot_pp_text(struct graphics_context *gc, struct plot_info *pi)
setup_pp_limits(gc, pi); setup_pp_limits(gc, pi);
pp = floor(pi->maxpp * 10.0) / 10.0 + 0.2; pp = floor(pi->maxpp * 10.0) / 10.0 + 0.2;
dpp = floor(2.0 * pp) / 10.0; dpp = pp > 4 ? 1.0 : 0.5;
hpos = pi->entry[pi->nr - 1].sec; hpos = pi->entry[pi->nr - 1].sec;
set_source_rgba(gc, PP_LINES); set_source_rgba(gc, PP_LINES);
for (m = 0.0; m <= pp; m += dpp) { for (m = 0.0; m <= pp; m += dpp) {
@ -653,7 +653,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
cairo_t *cr = gc->cr; cairo_t *cr = gc->cr;
int sec, depth; int sec, depth;
struct plot_data *entry; struct plot_data *entry;
int maxtime, maxdepth, marker; int maxtime, maxdepth, marker, maxline;
int increments[8] = { 10, 20, 30, 60, 5*60, 10*60, 15*60, 30*60 }; int increments[8] = { 10, 20, 30, 60, 5*60, 10*60, 15*60, 30*60 };
/* Get plot scaling limits */ /* Get plot scaling limits */
@ -705,9 +705,9 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
case METERS: marker = 10000; break; case METERS: marker = 10000; break;
case FEET: marker = 9144; break; /* 30 ft */ case FEET: marker = 9144; break; /* 30 ft */
} }
maxline = MAX(pi->maxdepth + marker, maxdepth * 2 / 3);
set_source_rgba(gc, DEPTH_GRID); set_source_rgba(gc, DEPTH_GRID);
for (i = marker; i < maxdepth; i += marker) { for (i = marker; i < maxline; i += marker) {
move_to(gc, 0, i); move_to(gc, 0, i);
line_to(gc, 1, i); line_to(gc, 1, i);
} }