src/hg/hgTracks/imageV2.c 1.8

Index: src/hg/hgTracks/imageV2.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/imageV2.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -B -U 4 -r1.7 -r1.8
--- src/hg/hgTracks/imageV2.c	27 Aug 2009 00:10:16 -0000	1.7
+++ src/hg/hgTracks/imageV2.c	27 Aug 2009 16:38:51 -0000	1.8
@@ -430,9 +430,8 @@
 imgTrack->chromEnd   = chromEnd;
 imgTrack->plusStrand = plusStrand;
 imgTrack->showCenterLabel = showCenterLabel;
 imgTrack->vis             = vis;
-#ifdef IMAGEv2_DRAG_REORDER
 static int lastOrder = 900; // keep track of the order these images get added
 if(order == IMG_FIXEDPOS)
     {
     imgTrack->reorderable = FALSE;
@@ -442,21 +441,21 @@
         imgTrack->order = 9999;
     }
 else
     {
+#ifdef IMAGEv2_DRAG_REORDER
     imgTrack->reorderable = TRUE;
+#else//ifndef IMAGEv2_DRAG_REORDER
+    imgTrack->reorderable = FALSE;
+#endif//ndef IMAGEv2_DRAG_REORDER
     if(order == IMG_ANYORDER)
         {
         if(imgTrack->order <= 0)
             imgTrack->order = ++lastOrder;
         }
     else if(imgTrack->order != order)
         imgTrack->order = order;
     }
-#else//ifndef IMAGEv2_DRAG_REORDER
-    imgTrack->reorderable = FALSE;
-    imgTrack->order = 1;
-#endif//ndef IMAGEv2_DRAG_REORDER
 return imgTrack;
 }
 
 int imgTrackOrderCmp(const void *va, const void *vb)
@@ -826,16 +825,20 @@
 
 void imgBoxTracksNormalizeOrder(struct imgBox *imgBox)
 /* This routine sorts the imgTracks then forces tight ordering, so new tracks wil go to the end */
 {
+#ifdef IMAGEv2_DRAG_REORDER
 slSort(&(imgBox->imgTracks), imgTrackOrderCmp);
 struct imgTrack *imgTrack = NULL;
 int lastOrder = 0;
 for (imgTrack = imgBox->imgTracks; imgTrack != NULL; imgTrack = imgTrack->next )
     {
     if(imgTrack->reorderable)
         imgTrack->order = ++lastOrder;
     }
+#else//ifndef IMAGEv2_DRAG_REORDER
+slReverse(&(imgBox->imgTracks));
+#endif//ndef IMAGEv2_DRAG_REORDER
 }
 
 boolean imgBoxIsComplete(struct imgBox *imgBox,boolean verbose)
 /* Tests the completeness and consistency of an imgBox. */
@@ -1055,11 +1058,9 @@
 if(!imgBoxIsComplete(imgBox,TRUE))
     return;
 char name[128];
 
-#ifdef IMAGEv2_DRAG_REORDER
 imgBoxTracksNormalizeOrder(imgBox);
-#endif//def IMAGEv2_DRAG_REORDER
 
 hPrintf("<!---------------vvv IMAGEv2 vvv---------------->\n");
 //commonCssStyles();
 #ifdef IMAGEv2_DRAG_REORDER