GisViewer: Improve add/remove functions

- Free the data stored in the tree
- Fix how data is stored (use our own linked list handling)
- Remove function now returns the original object

diff --git a/src/gis-opengl.c b/src/gis-opengl.c
index 0545eb9c86a05df3bddaa158de1a4e456879d7e9..420e21332fb968ffd16761cde456c96a012e6ec4 100644 (file)
--- a/src/gis-opengl.c
+++ b/src/gis-opengl.c
@@ -555,29 +555,49 @@ static gpointer gis_opengl_add(GisViewer *_self, GisObject *object,
                g_tree_insert(self->objects, (gpointer)key, level);
        }
        GList *list = sort ? &level->sorted : &level->unsorted;
                g_tree_insert(self->objects, (gpointer)key, level);
        }
        GList *list = sort ? &level->sorted : &level->unsorted;

-       list->next = g_list_prepend(list->next, object);
-       return list->next;
+       /* Put the link in the list */
+       GList *next = g_new0(GList, 1);
+       next->data = object;
+       next->prev = list;
+       next->next = list->next;
+       list->next = next;
+       return next;

 }
 
 }
 

-static void gis_opengl_remove(GisViewer *_self, gpointer _link)
+static GisObject *gis_opengl_remove(GisViewer *_self, gpointer _link)

 {
        g_assert(GIS_IS_OPENGL(_self));
 {
        g_assert(GIS_IS_OPENGL(_self));

-       GList *link = _link;

        GisOpenGL *self = GIS_OPENGL(_self);
        GisOpenGL *self = GIS_OPENGL(_self);

-       _unload_object(self, link->data);
-       /* Just unlink and free it (blowup link to avoid warnings) */
-       link = g_list_delete_link(NULL, link);
+       GList *link = _link;
+       GisObject *object = link->data;
+       _unload_object(self, object);
+       /* Just unlink and free it, link->prev is assured */
+       link->prev->next = link->next;
+       if (link->next)
+               link->next->prev = link->prev;
+       g_free(link);
+       g_object_unref(object);
+       return object;

 }
 
 /****************
  * GObject code *
  ****************/
 }
 
 /****************
  * GObject code *
  ****************/

-static int _objects_cmp(gconstpointer _a, gconstpointer _b)
+static int _objects_cmp(gconstpointer _a, gconstpointer _b, gpointer _)

 {
        gint a = (int)_a, b = (int)_b;
        return a < b ? -1 :
               a > b ?  1 : 0;
 }
 {
        gint a = (int)_a, b = (int)_b;
        return a < b ? -1 :
               a > b ?  1 : 0;
 }

+static void _objects_free(gpointer value)
+{
+       struct RenderLevel *level = value;
+       if (level->sorted.next)
+               g_list_free(level->sorted.next);
+       if (level->unsorted.next)
+               g_list_free(level->unsorted.next);
+       g_free(level);
+}

 
 G_DEFINE_TYPE(GisOpenGL, gis_opengl, GIS_TYPE_VIEWER);
 static void gis_opengl_init(GisOpenGL *self)
 
 G_DEFINE_TYPE(GisOpenGL, gis_opengl, GIS_TYPE_VIEWER);
 static void gis_opengl_init(GisOpenGL *self)


@@ -601,7 +621,7 @@ static void gis_opengl_init(GisOpenGL *self)
                        GDK_KEY_PRESS_MASK);
        g_object_set(self, "can-focus", TRUE, NULL);
 
                        GDK_KEY_PRESS_MASK);
        g_object_set(self, "can-focus", TRUE, NULL);
 

-       self->objects = g_tree_new(_objects_cmp);
+       self->objects = g_tree_new_full(_objects_cmp, NULL, NULL, _objects_free);

        self->sphere = roam_sphere_new(self);
        self->sphere_lock = g_mutex_new();
 
        self->sphere = roam_sphere_new(self);
        self->sphere_lock = g_mutex_new();
 


@@ -631,7 +651,6 @@ static void gis_opengl_dispose(GObject *_self)
                g_source_remove(self->sm_source[1]);
                self->sm_source[1] = 0;
        }
                g_source_remove(self->sm_source[1]);
                self->sm_source[1] = 0;
        }

-       /* TODO: Cleanup/free objects tree */

        G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self);
 }
 static void gis_opengl_finalize(GObject *_self)
        G_OBJECT_CLASS(gis_opengl_parent_class)->dispose(_self);
 }
 static void gis_opengl_finalize(GObject *_self)


@@ -639,6 +658,7 @@ static void gis_opengl_finalize(GObject *_self)
        g_debug("GisOpenGL: finalize");
        GisOpenGL *self = GIS_OPENGL(_self);
        roam_sphere_free(self->sphere);
        g_debug("GisOpenGL: finalize");
        GisOpenGL *self = GIS_OPENGL(_self);
        roam_sphere_free(self->sphere);

+       g_tree_destroy(self->objects);

        g_mutex_free(self->sphere_lock);
        G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_self);
 }
        g_mutex_free(self->sphere_lock);
        G_OBJECT_CLASS(gis_opengl_parent_class)->finalize(_self);
 }


@@ -646,6 +666,7 @@ static void gis_opengl_class_init(GisOpenGLClass *klass)
 {
        g_debug("GisOpenGL: class_init");
        GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
 {
        g_debug("GisOpenGL: class_init");
        GObjectClass *gobject_class = G_OBJECT_CLASS(klass);

+       gobject_class->finalize = gis_opengl_finalize;

        gobject_class->dispose = gis_opengl_dispose;
 
        GisViewerClass *viewer_class = GIS_VIEWER_CLASS(klass);
        gobject_class->dispose = gis_opengl_dispose;
 
        GisViewerClass *viewer_class = GIS_VIEWER_CLASS(klass);

diff --git a/src/gis-viewer.c b/src/gis-viewer.c
index 1deef53af631a1aa179d7f61d3c751d0095f9ee2..afe2655d6638ed6d34602a39633038b0eaee2d56 100644 (file)
--- a/src/gis-viewer.c
+++ b/src/gis-viewer.c
@@ -280,12 +280,12 @@ gpointer gis_viewer_add(GisViewer *self, GisObject *object,
        return klass->add(self, object, level, sort);
 }
 
        return klass->add(self, object, level, sort);
 }
 

-void gis_viewer_remove(GisViewer *self, gpointer ref)
+GisObject *gis_viewer_remove(GisViewer *self, gpointer ref)

 {
        GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self);
        if (!klass->remove)
                g_warning("GisViewer: remove - Unimplemented");
 {
        GisViewerClass *klass = GIS_VIEWER_GET_CLASS(self);
        if (!klass->remove)
                g_warning("GisViewer: remove - Unimplemented");

-       klass->remove(self, ref);
+       return klass->remove(self, ref);

 }
 
 /****************
 }
 
 /****************

diff --git a/src/gis-viewer.h b/src/gis-viewer.h
index d22b4da7c101b8e8f74f021219c3e5228a555abe..06378d76d032fdf2c488da741c5df5b9ac222c74 100644 (file)
--- a/src/gis-viewer.h
+++ b/src/gis-viewer.h
@@ -75,7 +75,7 @@ struct _GisViewerClass {
 
        gpointer (*add)          (GisViewer *viewer, GisObject *object,
                                  gint level, gboolean sort);
 
        gpointer (*add)          (GisViewer *viewer, GisObject *object,
                                  gint level, gboolean sort);

-       void (*remove)           (GisViewer *viewer, gpointer ref);
+       GisObject *(*remove)     (GisViewer *viewer, gpointer ref);

 };
 
 GType gis_viewer_get_type(void);
 };
 
 GType gis_viewer_get_type(void);


@@ -115,6 +115,6 @@ void gis_viewer_set_height_func(GisViewer *self, GisTile *tile,
 
 gpointer gis_viewer_add(GisViewer *self, GisObject *object,
                gint level, gboolean sort);
 
 gpointer gis_viewer_add(GisViewer *self, GisObject *object,
                gint level, gboolean sort);

-void gis_viewer_remove(GisViewer *self, gpointer ref);
+GisObject *gis_viewer_remove(GisViewer *self, gpointer ref);

 
 #endif
 
 #endif