fixed ovbious inefficiency previous overlap bump fix

src/zmapWindow/zmapWindowColBump.c

@@ -29,7 +29,7 @@
  * HISTORY:
  * Last edited: Jan 11 09:16 2010 (edgrif)
  * Created: Tue Sep  4 10:52:09 2007 (edgrif)
- * CVS info:   $Id: zmapWindowColBump.c,v 1.58 2010-01-20 17:17:19 mh17 Exp $
+ * CVS info:   $Id: zmapWindowColBump.c,v 1.59 2010-01-21 08:48:55 mh17 Exp $
  *-------------------------------------------------------------------
  */
 
@@ -163,8 +163,8 @@ typedef struct
 static void bumpColCB(gpointer data, gpointer user_data) ;
 
 
-static void compareListOverlapCB(gpointer data, gpointer user_data) ;
-static gint overlap_cmp(gconstpointer a,gconstpointer b);
+//static void compareListOverlapCB(gpointer data, gpointer user_data) ;
+//static gint overlap_cmp(gconstpointer a,gconstpointer b);
 
 static gboolean featureListCB(gpointer data, gpointer user_data) ;
 
@@ -826,6 +826,36 @@ static void invoke_realize_and_map(FooCanvasItem *item)
   return ;
 }
 
+static double bump_overlap(BumpCol bump_data,BumpColRange new_range)
+{
+  GList *l;
+  BumpColRange curr_range;
+
+  // pos list is sorted by column
+  for(l = g_list_first(bump_data->pos_list);l;l = g_list_next(l))
+    {
+      curr_range = (BumpColRange) l->data;
+
+      if(new_range->column == curr_range->column)
+        {
+           // can overlap with this feature: same column
+           if(!(new_range->y1 > curr_range->y2 || new_range->y2 < curr_range->y1))
+             {
+               new_range->column++;
+               new_range->offset += new_range->incr;
+               // got an overlap, try next column
+             }
+        }
+      else if(new_range->column < curr_range->column)
+           break;
+    }
+    // either we found a space or ran out of features ie no overlap
+
+    bump_data->pos_list = g_list_insert_before(bump_data->pos_list, l, (gpointer) new_range) ;
+
+    return(new_range->offset);
+}
+
 /* Is called once for each item in a column and sets the horizontal position of that
  * item under various "bumping" modes. */
 static void bumpColCB(gpointer data, gpointer user_data)
@@ -922,7 +952,6 @@ static void bumpColCB(gpointer data, gpointer user_data)
 	  {
 	    /* Bump features over if they overlap at all. */
 	    BumpColRange new_range ;
-          GList *l;
 	    
 	    new_range         = g_new0(BumpColRangeStruct, 1) ;
 	    new_range->y1     = y1 ;
@@ -932,30 +961,7 @@ static void bumpColCB(gpointer data, gpointer user_data)
           new_range->column = 0;
 	    
 //        g_list_foreach(bump_data->pos_list, compareListOverlapCB, new_range) ;
-
-            // pos list is sorted by column
-          for(l = g_list_first(bump_data->pos_list);l;l = g_list_next(l))
-          {
-            BumpColRange curr_range = (BumpColRange) l->data;
-
-            if(new_range->column == curr_range->column)
-              {
-                  // can overlap with this feature: same column
-                if(!(new_range->y1 > curr_range->y2 || new_range->y2 < curr_range->y1))
-                {
-                  new_range->column++;
-                  new_range->offset += new_range->incr;
-                  // got an overlap, try next column
-                }
-              }
-            else if(new_range->column < curr_range->column)
-                  break;
-          }
-          // either we found a space or ran out of features ie no overlap
-
-	    bump_data->pos_list = g_list_insert_sorted(bump_data->pos_list, (gpointer) new_range , overlap_cmp) ;
-
-          offset = new_range->offset;
+          offset = bump_overlap(bump_data,new_range);
 	    break ;
 	  }
 	case ZMAPBUMP_NAME:
@@ -997,19 +1003,18 @@ static void bumpColCB(gpointer data, gpointer user_data)
 	  {
 	    /* Bump features over if they overlap at all. */
 	    BumpColRange new_range ;
-	    
+
 	    new_range         = g_new0(BumpColRangeStruct, 1) ;
 	    new_range->y1     = y1 ;
 	    new_range->y2     = y2 ;
 	    new_range->offset = 0.0 ;
 	    new_range->incr   = x2 - x1 + 1.0;
-	    
-	    g_list_foreach(bump_data->pos_list, compareListOverlapCB, new_range) ;
-	    
+
+/*	    g_list_foreach(bump_data->pos_list, compareListOverlapCB, new_range) ;
 	    bump_data->pos_list = g_list_append(bump_data->pos_list, new_range) ;
-	    
 	    offset = new_range->offset ;
-	    
+ */
+	    offset = bump_overlap(bump_data,new_range);
 	    break ;
 	  }
 	  break;
@@ -1062,6 +1067,7 @@ static void hashDataDestroyCB(gpointer data)
 }
 
 
+#if MH17_NOT_USED
 /* GFunc callback func, called from g_list_foreach_find() to test whether current
  * element matches supplied overlap coords. */
 static void compareListOverlapCB(gpointer data, gpointer user_data)
@@ -1088,6 +1094,8 @@ static gint overlap_cmp(gconstpointer a,gconstpointer b)
       return(1);
 }
 
+#endif
+
 /* GFunc callback func, called from g_list_foreach_find() to free list resources. */
 static void listDataDestroyCB(gpointer data, gpointer user_data)
 {