diff options
| -rw-r--r-- | Makefile | 28 | ||||
| -rw-r--r-- | profile.c | 16 |
2 files changed, 23 insertions, 21 deletions
@@ -133,48 +133,48 @@ install-macosx: $(NAME) $(INSTALL) $(MACOSXFILES)/Subsurface.icns $(MACOSXINSTALL)/Contents/Resources/ parse-xml.o: parse-xml.c dive.h - $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c $(XML2CFLAGS) $(XSLT) parse-xml.c + $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) $(XSLT) -c parse-xml.c save-xml.o: save-xml.c dive.h - $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c save-xml.c + $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c save-xml.c dive.o: dive.c dive.h - $(CC) $(CFLAGS) $(GLIB2CFLAGS) -c dive.c + $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c dive.c main.o: main.c dive.h display.h divelist.h - $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(GCONF2CFLAGS) -c main.c + $(CC) $(CFLAGS) $(GLIB2CFLAGS) $(GCONF2CFLAGS) $(XML2CFLAGS) -c main.c profile.o: profile.c dive.h display.h divelist.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c profile.c + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c profile.c info.o: info.c dive.h display.h display-gtk.h divelist.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c info.c + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c info.c equipment.o: equipment.c dive.h display.h divelist.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c equipment.c + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c equipment.c statistics.o: statistics.c dive.h display.h divelist.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c statistics.c + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c statistics.c divelist.o: divelist.c dive.h display.h divelist.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c divelist.c + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c divelist.c print.o: print.c dive.h display.h display-gtk.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c print.c + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c print.c libdivecomputer.o: libdivecomputer.c dive.h display.h display-gtk.h libdivecomputer.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) \ + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \ $(LIBDIVECOMPUTERCFLAGS) \ -c libdivecomputer.c gtk-gui.o: gtk-gui.c dive.h display.h divelist.h display-gtk.h libdivecomputer.h Makefile - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(GCONF2CFLAGS) \ + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(GCONF2CFLAGS) $(XML2CFLAGS) \ $(LIBDIVECOMPUTERCFLAGS) \ -DVERSION_STRING='"v$(VERSION)"' \ -c gtk-gui.c -uemis.o: uemis.c uemis.h - $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) -c uemis.c +uemis.o: uemis.c dive.h uemis.h + $(CC) $(CFLAGS) $(GTK2CFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) -c uemis.c clean: rm -f $(OBJS) *~ $(NAME) @@ -669,10 +669,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info if (!last_entry) { last = i; last_entry = entry; - if (first_plot) { - /* don't start with a sac of 0, so just calculate the first one */ - sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive); - } + sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive); } else { int j; sac = 0; @@ -1004,7 +1001,7 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi, double cur_pt = (entry->sec - (entry-1)->sec) * (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]; @@ -1141,8 +1138,13 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str 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 - |