Linus would like to be less on the bleeding edge of Gtk+

[ext/subsurface.git] / dive.c

diff --git a/dive.c b/dive.c
index 1de3759d1bd9b76bc481b13e6f98d4d21cb4c906..d934d14384f8010a8a9ee22801d06e4f86798a82 100644 (file)
--- a/dive.c
+++ b/dive.c
@@ -5,6 +5,29 @@
 
 #include "dive.h"
 
+void add_event(struct dive *dive, int time, int type, int flags, int value, const char *name)
+{
+       struct event *ev, **p;
+       unsigned int size, len = strlen(name);
+
+       size = sizeof(*ev) + len + 1;
+       ev = malloc(size);
+       if (!ev)
+               return;
+       memset(ev, 0, size);
+       memcpy(ev->name, name, len);
+       ev->time.seconds = time;
+       ev->type = type;
+       ev->flags = flags;
+       ev->value = value;
+       ev->next = NULL;
+
+       p = &dive->events;
+       while (*p)
+               p = &(*p)->next;
+       *p = ev;
+}
+
 double get_depth_units(unsigned int mm, int *frac, const char **units)
 {
        int decimals;
@@ -199,6 +222,7 @@ struct dive *fixup_dive(struct dive *dive)
 #define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
 #define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
 #define MERGE_TXT(res, a, b, n) res->n = merge_text(a->n, b->n)
+#define MERGE_NONZERO(res, a, b, n) res->n = a->n ? a->n : b->n
 
 static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
 {
@@ -296,6 +320,59 @@ static char *merge_text(const char *a, const char *b)
        return res;
 }
 
+#define SORT(a,b,field) \
+       if (a->field != b->field) return a->field < b->field ? -1 : 1
+
+static int sort_event(struct event *a, struct event *b)
+{
+       SORT(a,b,time.seconds);
+       SORT(a,b,type);
+       SORT(a,b,flags);
+       SORT(a,b,value);
+       return strcmp(a->name, b->name);
+}
+
+static void merge_events(struct dive *res, struct dive *src1, struct dive *src2, int offset)
+{
+       struct event *a, *b;
+       struct event **p = &res->events;
+
+       a = src1->events;
+       b = src2->events;
+       while (b) {
+               b->time.seconds += offset;
+               b = b->next;
+       }
+       b = src2->events;
+
+       while (a || b) {
+               int s;
+               if (!b) {
+                       *p = a;
+                       break;
+               }
+               if (!a) {
+                       *p = b;
+                       break;
+               }
+               s = sort_event(a, b);
+               /* Pick b */
+               if (s > 0) {
+                       *p = b;
+                       p = &b->next;
+                       b = b->next;
+                       continue;
+               }
+               /* Pick 'a' or neither */
+               if (s < 0) {
+                       *p = a;
+                       p = &a->next;
+               }
+               a = a->next;
+               continue;
+       }
+}
+
 /* Pick whichever has any info (if either). Prefer 'a' */
 static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylinder_type_t *b)
 {
@@ -335,6 +412,8 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
        res = alloc_dive();
 
        res->when = a->when;
+       MERGE_NONZERO(res, a, b, latitude);
+       MERGE_NONZERO(res, a, b, longitude);
        MERGE_TXT(res, a, b, location);
        MERGE_TXT(res, a, b, notes);
        MERGE_TXT(res, a, b, buddy);
@@ -348,6 +427,6 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
        MERGE_MIN(res, a, b, watertemp.mkelvin);
        for (i = 0; i < MAX_CYLINDERS; i++)
                merge_cylinder_info(res->cylinder+i, a->cylinder + i, b->cylinder + i);
-
+       merge_events(res, a, b, 0);
        return merge_samples(res, a, b, 0);
 }