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

Change plot_info to use depth (instead of val) for depth value

Browse source 
Also changed a couple of corresponding local variables

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-10-22 22:40:53 -07:00
parent abaed4c275
commit bf1dc48dfe
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
profile.c
View file

@ -29,7 +29,7 @@ struct plot_info {
int sec; int sec;
int pressure, temperature; int pressure, temperature;
/* Depth info */ /* Depth info */
int val; int depth;
int smoothed; int smoothed;
velocity_t velocity; velocity_t velocity;
struct plot_data *min[3]; struct plot_data *min[3];
@ -167,7 +167,7 @@ static void plot_one_event(struct graphics_context *gc, struct plot_info *pi, st
struct plot_data *data = pi->entry + i; struct plot_data *data = pi->entry + i;
if (event->time.seconds < data->sec) if (event->time.seconds < data->sec)
break; break;
depth = data->val; depth = data->depth;
} }
/* draw a little tirangular marker and attach tooltip */ /* draw a little tirangular marker and attach tooltip */
x = SCALEX(gc, event->time.seconds); x = SCALEX(gc, event->time.seconds);
@ -207,9 +207,9 @@ static void render_depth_sample(struct graphics_context *gc, struct plot_data *e
int sec = entry->sec, decimals; int sec = entry->sec, decimals;
double d; double d;
d = get_depth_units(entry->val, &decimals, NULL); d = get_depth_units(entry->depth, &decimals, NULL);
plot_text(gc, tro, sec, entry->val, "%.*f", decimals, d); plot_text(gc, tro, sec, entry->depth, "%.*f", decimals, d);
} }
static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi) static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
@ -221,7 +221,7 @@ static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
for (i = 0; i < pi->nr; i++) { for (i = 0; i < pi->nr; i++) {
struct plot_data *entry = pi->entry + i; struct plot_data *entry = pi->entry + i;
if (entry->val < 2000) if (entry->depth < 2000)
continue; continue;
if (entry == entry->max[2]) if (entry == entry->max[2])
@ -267,13 +267,13 @@ static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_
struct plot_data *entry = pi->entry; struct plot_data *entry = pi->entry;
set_source_rgba(gc, 1, 0.2, 1, a); set_source_rgba(gc, 1, 0.2, 1, a);
move_to(gc, entry->sec, entry->min[index]->val); move_to(gc, entry->sec, entry->min[index]->depth);
for (i = 1; i < pi->nr; i++) { for (i = 1; i < pi->nr; i++) {
entry++; entry++;
line_to(gc, entry->sec, entry->min[index]->val); line_to(gc, entry->sec, entry->min[index]->depth);
} }
for (i = 1; i < pi->nr; i++) { for (i = 1; i < pi->nr; i++) {
line_to(gc, entry->sec, entry->max[index]->val); line_to(gc, entry->sec, entry->max[index]->depth);
entry--; entry--;
} }
cairo_close_path(gc->cr); cairo_close_path(gc->cr);
@ -352,7 +352,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
entry = pi->entry; entry = pi->entry;
move_to(gc, 0, 0); move_to(gc, 0, 0);
for (i = 0; i < pi->nr; i++, entry++) for (i = 0; i < pi->nr; i++, entry++)
line_to(gc, entry->sec, entry->val); line_to(gc, entry->sec, entry->depth);
cairo_close_path(gc->cr); cairo_close_path(gc->cr);
if (gc->printer) { if (gc->printer) {
set_source_rgba(gc, 1, 1, 1, 0.2); set_source_rgba(gc, 1, 1, 1, 0.2);
@ -372,9 +372,9 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
* representing the vertical velocity, so we need to * representing the vertical velocity, so we need to
* chop this into short segments */ * chop this into short segments */
rgb_t color = rgb[entry->velocity]; rgb_t color = rgb[entry->velocity];
depth = entry->val; depth = entry->depth;
set_source_rgb(gc, color.r, color.g, color.b); set_source_rgb(gc, color.r, color.g, color.b);
move_to(gc, entry[-1].sec, entry[-1].val); move_to(gc, entry[-1].sec, entry[-1].depth);
line_to(gc, sec, depth); line_to(gc, sec, depth);
cairo_stroke(cr); cairo_stroke(cr);
} }
@ -573,17 +573,17 @@ static void analyze_plot_info_minmax_minute(struct plot_data *entry, struct plot
/* Then go forward until we hit an entry past the time */ /* Then go forward until we hit an entry past the time */
min = max = p; min = max = p;
avg = p->val; avg = p->depth;
nr = 1; nr = 1;
while (++p < last) { while (++p < last) {
int val = p->val; int depth = p->depth;
if (p->sec > time + seconds) if (p->sec > time + seconds)
break; break;
avg += val; avg += depth;
nr ++; nr ++;
if (val < min->val) if (depth < min->depth)
min = p; min = p;
if (val > max->val) if (depth > max->depth)
max = p; max = p;
} }
entry->min[index] = min; entry->min[index] = min;
@ -654,22 +654,22 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
/* Smoothing function: 5-point triangular smooth */ /* Smoothing function: 5-point triangular smooth */
for (i = 2; i < nr; i++) { for (i = 2; i < nr; i++) {
struct plot_data *entry = pi->entry+i; struct plot_data *entry = pi->entry+i;
int val; int depth;
if (i < nr-2) { if (i < nr-2) {
val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val; depth = entry[-2].depth + 2*entry[-1].depth + 3*entry[0].depth + 2*entry[1].depth + entry[2].depth;
entry->smoothed = (val+4) / 9; entry->smoothed = (depth+4) / 9;
} }
/* vertical velocity in mm/sec */ /* vertical velocity in mm/sec */
/* Linus wants to smooth this - let's at least look at the samples that aren't FAST or CRAZY */ /* Linus wants to smooth this - let's at least look at the samples that aren't FAST or CRAZY */
if (entry[0].sec - entry[-1].sec) { if (entry[0].sec - entry[-1].sec) {
entry->velocity = velocity((entry[0].val - entry[-1].val) / (entry[0].sec - entry[-1].sec)); entry->velocity = velocity((entry[0].depth - entry[-1].depth) / (entry[0].sec - entry[-1].sec));
/* if our samples are short and we aren't too FAST*/ /* if our samples are short and we aren't too FAST*/
if (entry[0].sec - entry[-1].sec < 15 && entry->velocity < FAST) { if (entry[0].sec - entry[-1].sec < 15 && entry->velocity < FAST) {
int past = -2; int past = -2;
while (i+past > 0 && entry[0].sec - entry[past].sec < 15) while (i+past > 0 && entry[0].sec - entry[past].sec < 15)
past--; past--;
entry->velocity = velocity((entry[0].val - entry[past].val) / entry->velocity = velocity((entry[0].depth - entry[past].depth) /
(entry[0].sec - entry[past].sec)); (entry[0].sec - entry[past].sec));
} }
} else } else
@ -714,7 +714,7 @@ static struct plot_info *create_plot_info(struct dive *dive)
struct plot_data *entry = pi->entry + i + 2; struct plot_data *entry = pi->entry + i + 2;
sec = entry->sec = sample->time.seconds; sec = entry->sec = sample->time.seconds;
depth = entry->val = sample->depth.mm; depth = entry->depth = sample->depth.mm;
entry->same_cylinder = sample->cylinderindex == cylinderindex; entry->same_cylinder = sample->cylinderindex == cylinderindex;
cylinderindex = sample->cylinderindex; cylinderindex = sample->cylinderindex;