X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=be52dbd979c1b81558b892bad4664e45691acd21;hb=d6c2236b8a9e20d22d78de7432f7017a18235619;hp=6da386ccd6c8d02b12bc2d697450721b917e1c1f;hpb=5c4cc39c56470b0a01274e69be703f0d4fc3080b;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index 6da386c..be52dbd 100644
--- a/main.c
+++ b/main.c
@@ -1,36 +1,20 @@
+/* main.c */
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
-#include "dive.h"
-
-static void show_dive(int nr, struct dive *dive)
-{
-	int i;
-	struct tm *tm;
+#include <gconf/gconf-client.h>
 
-	tm = gmtime(&dive->when);
-
-	printf("At %02d:%02d:%02d %04d-%02d-%02d  (%d ft max, %d minutes)\n",
-		tm->tm_hour, tm->tm_min, tm->tm_sec,
-		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-		to_feet(dive->maxdepth), dive->duration.seconds / 60);
-
-	if (!verbose)
-		return;
+#include "dive.h"
+#include "divelist.h"
 
-	for (i = 0; i < dive->samples; i++) {
-		struct sample *s = dive->sample + i;
+GConfClient *gconf;
+struct units output_units;
 
-		printf("%4d:%02d: %3d ft, %2d C, %4d PSI\n",
-			s->time.seconds / 60,
-			s->time.seconds % 60,
-			to_feet(s->depth),
-			to_C(s->temperature),
-			to_PSI(s->tankpressure));
-	}
-}
+#define GCONF_NAME(x) "/apps/subsurface/" #x
 
+/* random helper functions, used here or elsewhere */
 static int sortfn(const void *_a, const void *_b)
 {
 	const struct dive *a = *(void **)_a;
@@ -43,13 +27,120 @@ static int sortfn(const void *_a, const void *_b)
 	return 0;
 }
 
-static void report_dives(void)
+const char *weekday(int wday)
+{
+	static const char wday_array[7][4] = {
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+	};
+	return wday_array[wday];
+}
+
+const char *monthname(int mon)
+{
+	static const char month_array[12][4] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+	};
+	return month_array[mon];
+}
+
+/*
+ * When adding dives to the dive table, we try to renumber
+ * the new dives based on any old dives in the dive table.
+ *
+ * But we only do it if:
+ *
+ *  - the last dive in the old dive table was numbered
+ *
+ *  - all the new dives are strictly at the end (so the
+ *    "last dive" is at the same location in the dive table
+ *    after re-sorting the dives.
+ *
+ *  - none of the new dives have any numbers
+ *
+ * This catches the common case of importing new dives from
+ * a dive computer, and gives them proper numbers based on
+ * your old dive list. But it tries to be very conservative
+ * and not give numbers if there is *any* question about
+ * what the numbers should be - in which case you need to do
+ * a manual re-numbering.
+ */
+static void try_to_renumber(struct dive *last, int preexisting)
+{
+	int i, nr;
+
+	/*
+	 * If the new dives aren't all strictly at the end,
+	 * we're going to expect the user to do a manual
+	 * renumbering.
+	 */
+	if (get_dive(preexisting-1) != last)
+		return;
+
+	/*
+	 * If any of the new dives already had a number,
+	 * we'll have to do a manual renumbering.
+	 */
+	for (i = preexisting; i < dive_table.nr; i++) {
+		struct dive *dive = get_dive(i);
+		if (dive->number)
+			return;
+	}
+
+	/*
+	 * Ok, renumber..
+	 */
+	nr = last->number;
+	for (i = preexisting; i < dive_table.nr; i++) {
+		struct dive *dive = get_dive(i);
+		dive->number = ++nr;
+	}
+}
+
+/*
+ * This doesn't really report anything at all. We just sort the
+ * dives, the GUI does the reporting
+ */
+void report_dives(void)
 {
 	int i;
+	int preexisting = dive_table.preexisting;
+	struct dive *last;
+
+	/* This does the right thing for -1: NULL */
+	last = get_dive(preexisting-1);
 
 	qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
-	for (i = 0; i < dive_table.nr; i++)
-		show_dive(i+1, dive_table.dives[i]);
+
+	for (i = 1; i < dive_table.nr; i++) {
+		struct dive **pp = &dive_table.dives[i-1];
+		struct dive *prev = pp[0];
+		struct dive *dive = pp[1];
+		struct dive *merged;
+
+		if (prev->when + prev->duration.seconds < dive->when)
+			continue;
+
+		merged = try_to_merge(prev, dive);
+		if (!merged)
+			continue;
+
+		free(prev);
+		free(dive);
+		*pp = merged;
+		dive_table.nr--;
+		memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
+
+		/* Redo the new 'i'th dive */
+		i--;
+	}
+
+	/* Was the previous dive table state numbered? */
+	if (last && last->number)
+		try_to_renumber(last, preexisting);
+
+	dive_table.preexisting = dive_table.nr;
+	dive_list_update_dives();
 }
 
 static void parse_argument(const char *arg)
@@ -68,12 +159,43 @@ static void parse_argument(const char *arg)
 	} while (*++p);
 }
 
+void update_dive(struct dive *new_dive)
+{
+	static struct dive *buffered_dive;
+	struct dive *old_dive = buffered_dive;
+
+	if (old_dive) {
+		flush_dive_info_changes(old_dive);
+		flush_dive_equipment_changes(old_dive);
+		flush_divelist(old_dive);
+	}
+	if (new_dive) {
+		show_dive_info(new_dive);
+		show_dive_equipment(new_dive);
+	}
+	buffered_dive = new_dive;
+}
+
+void renumber_dives(int nr)
+{
+	int i;
+
+	for (i = 0; i < dive_table.nr; i++) {
+		struct dive *dive = dive_table.dives[i];
+		dive->number = nr + i;
+	}
+}
+
 int main(int argc, char **argv)
 {
 	int i;
 
+	output_units = SI_units;
+
 	parse_xml_init();
 
+	init_ui(argc, argv);
+	
 	for (i = 1; i < argc; i++) {
 		const char *a = argv[i];
 
@@ -81,9 +203,19 @@ int main(int argc, char **argv)
 			parse_argument(a);
 			continue;
 		}
-		parse_xml_file(a);
+		GError *error = NULL;
+		parse_xml_file(a, &error);
+		
+		if (error != NULL)
+		{
+			report_error(error);
+			g_error_free(error);
+			error = NULL;
+		}
 	}
+
 	report_dives();
+
+	run_ui();
 	return 0;
 }
-