int sac_index = 0;
int delta = sac - avg_sac + 7000;
- sac_index = delta / 2000;
- if (sac_index < 0)
- sac_index = 0;
- if (sac_index > SAC_COLORS - 1)
- sac_index = SAC_COLORS - 1;
- set_source_rgb_struct(gc, &sac_color[sac_index]);
+ if (!gc->printer) {
+ sac_index = delta / 2000;
+ if (sac_index < 0)
+ sac_index = 0;
+ if (sac_index > SAC_COLORS - 1)
+ sac_index = SAC_COLORS - 1;
+ set_source_rgb_struct(gc, &sac_color[sac_index]);
+ } else {
+ set_source_rgb(gc, 1.0, 1.0, 1.0);
+ }
}
/* calculate the current SAC in ml/min and convert to int */
if (!last_entry) {
last = i;
last_entry = entry;
- if (first_plot) {
- /* don't start with a sac of 0 */
- int fe = i + 1;
- struct plot_data *future_entry = pi->entry + fe;
- while (fe < pi->nr && future_entry->sec - entry->sec < SAC_WINDOW) {
- fe++;
- future_entry = pi->entry + fe;
- }
- sac = GET_LOCAL_SAC(entry, future_entry, dive);
+ sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
+ } else {
+ int j;
+ sac = 0;
+ for (j = last; j < i; j++)
+ sac += GET_LOCAL_SAC(pi->entry + j, pi->entry + j + 1, dive);
+ sac /= (i - last);
+ if (entry->sec - last_entry->sec >= SAC_WINDOW) {
+ last++;
+ last_entry = pi->entry + last;
}
- } else if (entry->sec - last_entry->sec >= SAC_WINDOW) {
- sac = GET_LOCAL_SAC(last_entry, entry, dive);
- last++;
- last_entry = pi->entry + last;
}
set_sac_color(gc, sac, dive->sac);
if (lift_pen) {
free(list);
}
+static void dump_pr_track(pr_track_t **track_pr)
+{
+ int cyl;
+ pr_track_t *list;
+
+ for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
+ list = track_pr[cyl];
+ while (list) {
+ printf("cyl%d: start %d end %d t_start %d t_end %d pt %6.3f\n", cyl,
+ list->start, list->end, list->t_start, list->t_end, list->pressure_time);
+ list = list->next;
+ }
+ }
+}
+
static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
pr_track_t **track_pr)
{
struct plot_data *entry;
int cur_pr[MAX_CYLINDERS];
+ if (0) {
+ /* another great debugging tool */
+ dump_pr_track(track_pr);
+ }
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
cur_pr[cyl] = track_pr[cyl]->start;
}
list = NULL;
continue;
}
- magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt; }
+ magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt;
+ }
if (pt != 0.0) {
double cur_pt = (entry->sec - (entry-1)->sec) *
- (1 + entry->depth / 10000.0);
+ (1 + (entry->depth + (entry-1)->depth) / 20000.0);
INTERPOLATED_PRESSURE(entry) =
- cur_pr[entry->cylinderindex] + cur_pt * magic;
+ cur_pr[entry->cylinderindex] + cur_pt * magic + 0.5;
cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry);
} else
INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex];
while (ev && ev->time.seconds < sample->time.seconds) {
/* insert two fake plot info structures for the end of
* the old tank and the start of the new tank */
- entry->sec = ev->time.seconds;
- (entry+1)->sec = ev->time.seconds + 1;
+ if (ev->time.seconds == sample->time.seconds - 1) {
+ entry->sec = ev->time.seconds - 1;
+ (entry+1)->sec = ev->time.seconds;
+ } else {
+ entry->sec = ev->time.seconds;
+ (entry+1)->sec = ev->time.seconds + 1;
+ }
/* we need a fake depth - let's interpolate */
if (i) {
entry->depth = sample->depth.mm -
}
/* finally, do the discrete integration to get the SAC rate equivalent */
current->pressure_time += (entry->sec - (entry-1)->sec) *
- (1 + entry->depth / 10000.0);
+ (1 + (entry->depth + (entry-1)->depth) / 20000.0);
missing_pr |= !SENSOR_PRESSURE(entry);
}