494ba676944a710a244db32fdc74f8ba01ff5148 tdreszer Thu Sep 9 10:40:02 2010 -0700 Cleaned up a lot of obsolete ifdefs, now that dragReorder and flatTracks are on the RR diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 2f91ead..ae0c060 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -72,9 +72,7 @@ struct slName *browserLines = NULL; /* Custom track "browser" lines. */ boolean withNextItemArrows = FALSE; /* Display next feature (gene) navigation buttons near center labels? */ -#if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) boolean withPriorityOverride = FALSE; /* Display priority for each track to allow reordering */ -#endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) int gfxBorder = hgDefaultGfxBorder; /* Width of graphics border. */ int guidelineSpacing = 12; /* Pixels between guidelines. */ @@ -224,27 +222,23 @@ { assert(tdb->parent != NULL && tdb->parent->track); cartRemove(cart, tdb->parent->track); - #if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) if (withPriorityOverride) { safef(pname, sizeof(pname), "%s.priority",tdb->parent->track); cartRemove(cart, pname); } - #endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) } track->visibility = tdb->visibility; cartRemove(cart, track->track); /* set the track priority back to the default value */ - #if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) if (withPriorityOverride) { safef(pname, sizeof(pname), "%s.priority",track->track); cartRemove(cart, pname); track->priority = track->defaultPriority; } - #endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) } else { @@ -1302,9 +1296,7 @@ { if (track->limitedVis != tvHide) { -#ifdef FLAT_TRACK_LIST if(isWithCenterLabels(track)) -#endif//def FLAT_TRACK_LIST { int trackPastTabX = (withLeftLabels ? trackTabWidth : 0); int trackPastTabWidth = tl.picWidth - trackPastTabX; @@ -1930,10 +1922,8 @@ sliceOffsetX[stData] = (revCmplDisp?0:sliceWidth[stSide] + sliceWidth[stButton]); sliceWidth[stData] = tl.picWidth - (sliceWidth[stSide] + sliceWidth[stButton]); } -#ifdef FLAT_TRACK_LIST struct flatTracks *flatTracks = NULL; struct flatTracks *flatTrack = NULL; -#endif//def FLAT_TRACK_LIST if (rulerMode != tvFull) { @@ -2027,7 +2017,6 @@ subtrack->limitedVisSet = track->limitedVisSet; } - #ifdef FLAT_TRACK_LIST #ifdef SUBTRACKS_HAVE_VIS if (subtrack->limitedVis != tvHide) #endif///def SUBTRACKS_HAVE_VIS @@ -2035,16 +2024,13 @@ subtrack->hasUi = track->hasUi; flatTracksAdd(&flatTracks,subtrack,cart); } - #endif//def FLAT_TRACK_LIST } } - #ifdef FLAT_TRACK_LIST else #ifdef SUBTRACKS_HAVE_VIS if (track->limitedVis != tvHide) #endif///def SUBTRACKS_HAVE_VIS flatTracksAdd(&flatTracks,track,cart); - #endif//def FLAT_TRACK_LIST if (maxSafeHeight < (pixHeight+trackPlusLabelHeight(track,fontHeight))) { char numBuf[SMALLBUF]; @@ -2056,13 +2042,8 @@ track->limitedVis = tvHide; track->limitedVisSet = TRUE; } - #ifndef FLAT_TRACK_LIST - else - pixHeight += trackPlusLabelHeight(track, fontHeight); - #endif//def FLAT_TRACK_LIST } } -#ifdef FLAT_TRACK_LIST flatTracksSort(&flatTracks); // Now we should have a perfectly good flat track list! for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { @@ -2081,7 +2062,6 @@ else pixHeight += trackPlusLabelHeight(track, fontHeight); } -#endif//def FLAT_TRACK_LIST imagePixelHeight = pixHeight; if (psOutput) @@ -2092,10 +2072,8 @@ else { boolean transparentImage = FALSE; - #ifdef IMAGEv2_BG_IMAGE if (theImgBox!=NULL) - transparentImage = TRUE; // transparent when BG is defined - #endif///def IMAGEv2_BG_IMAGE + transparentImage = TRUE; // transparent because BG (blue ruler lines) is separate image #ifdef USE_PNG trashDirFile(&gifTn, "hgt", "hgt", ".png"); @@ -2147,27 +2125,17 @@ { curImgTrack = imgBoxTrackFindOrAdd(theImgBox,NULL,RULER_TRACK_NAME,rulerMode,FALSE,IMG_FIXEDPOS); // No tdb, no centerlabel, not reorderable } -#ifdef FLAT_TRACK_LIST + for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST - for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST if (track->limitedVis != tvHide) { #ifdef SUBTRACKS_HAVE_VIS if(track->labelColor == track->ixColor && track->ixColor == 0) track->ixColor = hvGfxFindRgb(hvg, &track->color); #endif//def SUBTRACKS_HAVE_VIS - #ifdef FLAT_TRACK_LIST int order = flatTrack->order; - #else//ifndef FLAT_TRACK_LIST - char var[256]; - safef(var,sizeof(var),"%s_%s",track->tdb->track,IMG_ORDER_VAR); - int order = cartUsualInt(cart, var,IMG_ANYORDER); - #endif//ndef FLAT_TRACK_LIST curImgTrack = imgBoxTrackFindOrAdd(theImgBox,track->tdb,NULL,track->limitedVis,isWithCenterLabels(track),order); } } @@ -2193,25 +2161,17 @@ sliceHeight = height + 1; sliceOffsetY = 0; curImgTrack = imgBoxTrackFind(theImgBox,NULL,RULER_TRACK_NAME); - #ifdef FLAT_TRACK_LIST curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stButton,NULL,NULL,sliceWidth[stButton],sliceHeight,sliceOffsetX[stButton],sliceOffsetY); // flatTracksButton is all html, no jpg - #else//ifndef FLAT_TRACK_LIST - curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stButton,theSideImg,NULL,sliceWidth[stButton],sliceHeight,sliceOffsetX[stButton],sliceOffsetY); - #endif//ndef FLAT_TRACK_LIST } drawGrayButtonBox(hvgSide, trackTabX, y, trackTabWidth, height, TRUE); mapBoxTrackUi(hvgSide, trackTabX, y, trackTabWidth, height, RULER_TRACK_NAME, RULER_TRACK_LABEL, "ruler"); y += height + 1; } -#ifdef FLAT_TRACK_LIST + for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST - for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST int h, yStart = y, yEnd; if (track->limitedVis != tvHide) { @@ -2235,11 +2195,7 @@ sliceHeight = yEnd - yStart; sliceOffsetY = yStart - 1; curImgTrack = imgBoxTrackFind(theImgBox,track->tdb,NULL); - #ifdef FLAT_TRACK_LIST curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stButton,NULL,NULL,sliceWidth[stButton],sliceHeight,sliceOffsetX[stButton],sliceOffsetY); // flatTracksButton is all html, no jpg - #else//ifndef FLAT_TRACK_LIST - curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stButton,theSideImg,NULL,sliceWidth[stButton],sliceHeight,sliceOffsetX[stButton],sliceOffsetY); - #endif//ndef FLAT_TRACK_LIST } if (track->hasUi) { @@ -2330,14 +2286,9 @@ if (rulerCds) y += rulerTranslationHeight; } -#ifdef FLAT_TRACK_LIST for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST - for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST if (track->limitedVis == tvHide) continue; if(theImgBox) @@ -2349,23 +2300,6 @@ curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stSide,theSideImg,NULL,sliceWidth[stSide],sliceHeight,sliceOffsetX[stSide],sliceOffsetY); curMap = sliceMapFindOrStart(curSlice,track->tdb->track,NULL); // No common linkRoot } -#ifndef FLAT_TRACK_LIST - if (trackIsCompositeWithSubtracks(track)) - { - struct track *subtrack; - if (isWithCenterLabels(track)) - y += fontHeight; - for (subtrack = track->subtracks; subtrack != NULL;subtrack = subtrack->next) - { - if (isSubtrackVisible(subtrack)) - y = doLeftLabels(subtrack, hvgSide, font, y); - //if (track->limitedVis == tvDense) - //track->nextItemButtonable = FALSE; - } - track->nextItemButtonable = FALSE; // Composites are not NextItemButtonable (but subtracks may be) - } - else -#endif//ndef FLAT_TRACK_LIST y = doLeftLabels(track, hvgSide, font, y); } } @@ -2385,16 +2319,19 @@ // (char *)(dragZooming?"click or drag mouse in base position track to zoom in" : NULL), // pixWidth, pixHeight,FALSE); struct hvGfx *bgImg = hvg; // Default to the one image - #if defined(IMAGEv2_BG_IMAGE) && defined(USE_PNG) if(theImgBox) { struct tempName gifBg; + #ifdef USE_PNG trashDirFile(&gifBg, "hgt", "bg", ".png"); // TODO: We could have a few static files by (pixHeight*pixWidth) And I doubt pixHeight is needed! bgImg = hvGfxOpenPng(pixWidth, pixHeight, gifBg.forCgi, TRUE); + #else //ifndef + trashDirFile(&gifBg, "hgt", "bg", ".gif"); + bgImg = hvGfxOpenGif(pixWidth, pixHeight, gifBg.forCgi, TRUE); + #endif //ndef USE_PNG bgImg->rc = revCmplDisp; imgBoxImageAdd(theImgBox,gifBg.forHtml,NULL,pixWidth, pixHeight,TRUE); // Adds BG image } - #endif //defined(IMAGEv2_BG_IMAGE) && defined(USE_PNG) int height = pixHeight - 2*gfxBorder; int x; Color lightBlue = hvGfxFindRgb(bgImg, &guidelineColor); @@ -2429,14 +2366,9 @@ { hvGfxSetClip(hvg, insideX, gfxBorder, insideWidth, pixHeight - 2*gfxBorder); y = yAfterRuler; -#ifdef FLAT_TRACK_LIST for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST - for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST if (track->limitedVis == tvHide) continue; @@ -2450,33 +2382,6 @@ curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stCenter,theOneImg,NULL,sliceWidth[stData],sliceHeight,sliceOffsetX[stData],sliceOffsetY); curMap = sliceMapFindOrStart(curSlice,track->tdb->track,NULL); // No common linkRoot } -#ifndef FLAT_TRACK_LIST - if (trackIsCompositeWithSubtracks(track)) //TODO: Change when tracks->subtracks are always set for composite - { - if (isWithCenterLabels(track)) - y = doCenterLabels(track, track, hvg, font, y) - track->height; /* subtrack heights tallied below: */ - if(theImgBox) - { - // Special case: data slice of tracks - sliceHeight = trackPlusLabelHeight(track, fontHeight) - fontHeight; - sliceOffsetY = y; - curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stData,theOneImg,NULL,sliceWidth[stData],sliceHeight,sliceOffsetX[stData],sliceOffsetY); - curMap = sliceMapFindOrStart(curSlice,track->tdb->track,NULL); // No common linkRoot - } - struct track *subtrack; - for (subtrack = track->subtracks; subtrack != NULL; subtrack = subtrack->next) - { - if (isSubtrackVisible(subtrack)) - { - if (isWithCenterLabels(subtrack)) - y = doCenterLabels(subtrack, track, hvg, font, y); - else - y += subtrack->totalHeight(subtrack,subtrack->limitedVis); - } - } - } - else -#endif//ndef FLAT_TRACK_LIST y = doCenterLabels(track, track, hvg, font, y); } hvGfxUnclip(hvg); @@ -2488,14 +2393,9 @@ y = yAfterRuler; if (measureTiming) lastTime = clock1000(); -#ifdef FLAT_TRACK_LIST for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST - for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST if (track->limitedVis == tvHide) continue; @@ -2514,26 +2414,10 @@ curMap = sliceMapFindOrStart(curSlice,track->tdb->track,NULL); // No common linkRoot } } -#ifndef FLAT_TRACK_LIST - if (trackIsCompositeWithSubtracks(track)) //TODO: Change when tracks->subtracks are always set for composite - { - struct track *subtrack; - if (isWithCenterLabels(track)) - y += fontHeight; - for (subtrack = track->subtracks; subtrack != NULL;subtrack = subtrack->next) - { - if (isSubtrackVisible(subtrack)) - y = doDrawItems(subtrack, hvg, font, y, &lastTime); - } - } - else -#endif//ndef FLAT_TRACK_LIST y = doDrawItems(track, hvg, font, y, &lastTime); -#if defined(IMAGEv2_DRAG_REORDER) && defined(FLAT_TRACK_LIST) if (theImgBox && track->limitedVis == tvDense && tdbIsCompositeChild(track->tdb)) mapBoxToggleVis(hvg, 0, yStart,tl.picWidth, sliceHeight,track); // Strange mabBoxToggleLogic handles reverse complement itself so x=0, width=tl.picWidth -#endif// defined(IMAGEv2_DRAG_REORDER) && defined(FLAT_TRACK_LIST) if(yEnd!=y) warn("Slice height does not add up. Expecting %d != %d actual",yEnd - yStart - 1,y-yStart); @@ -2546,14 +2430,9 @@ if (withLeftLabels) { y = yAfterRuler; -#ifdef FLAT_TRACK_LIST for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST - for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST if (track->limitedVis == tvHide) continue; if(theImgBox) @@ -2565,45 +2444,20 @@ curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,stSide,theSideImg,NULL,sliceWidth[stSide],sliceHeight,sliceOffsetX[stSide],sliceOffsetY); curMap = sliceMapFindOrStart(curSlice,track->tdb->track,NULL); // No common linkRoot } -#ifndef FLAT_TRACK_LIST - if (trackIsCompositeWithSubtracks(track)) //TODO: Change when tracks->subtracks are always set for composite - { - struct track *subtrack; - if (isWithCenterLabels(track)) - y += fontHeight; - for (subtrack = track->subtracks; subtrack != NULL;subtrack = subtrack->next) - { - if (isSubtrackVisible(subtrack)) - { - if (subtrack->drawLeftLabels != NULL) - y = doOwnLeftLabels(subtrack, hvgSide, font, y); - else - y += trackPlusLabelHeight(subtrack, fontHeight); - } - } - } - else -#endif//ndef FLAT_TRACK_LIST - { + if (track->drawLeftLabels != NULL) y = doOwnLeftLabels(track, hvgSide, font, y); else y += trackPlusLabelHeight(track, fontHeight); } } - } /* Make map background. */ y = yAfterRuler; -#ifdef FLAT_TRACK_LIST for (flatTrack = flatTracks; flatTrack != NULL; flatTrack = flatTrack->next) { track = flatTrack->track; -#else//ifndef FLAT_TRACK_LIST -for (track = trackList; track != NULL; track = track->next) - { -#endif//ndef FLAT_TRACK_LIST if (track->limitedVis != tvHide) { if(theImgBox) @@ -2655,9 +2509,7 @@ gifTn.forHtml, pixWidth, pixHeight, mapName, titleAttr); hPrintf("><BR>\n"); } -#ifdef FLAT_TRACK_LIST flatTracksFree(&flatTracks); -#endif//def FLAT_TRACK_LIST } static void printEnsemblAnchor(char *database, char* archive, @@ -3875,7 +3727,6 @@ { /* deal with group reordering */ float priority = grp->priority; - #if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) if (withPriorityOverride) { char cartVar[512]; @@ -3885,7 +3736,6 @@ if (priority == grp->priority) cartRemove(cart, cartVar); } - #endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) /* create group object; add to list and hash */ AllocVar(group); group->name = cloneString(grp->name); @@ -3902,7 +3752,6 @@ * If necessary make up an unknown group. */ for (track = *pTrackList; track != NULL; track = track->next) { -#if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) /* handle track reordering feature -- change group assigned to track */ if (withPriorityOverride) { @@ -3953,7 +3802,6 @@ */ track->priority = priority; } -#endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) /* assign group object to track */ if (track->groupName == NULL) @@ -4437,7 +4285,6 @@ uglyTime("getTrackList"); #endif /* SOON */ -#ifdef IMAGEv2_DRAG_REORDER // honor defaultImgOrder if(cgiVarExists("hgt.defaultImgOrder")) { @@ -4445,7 +4292,6 @@ safef(wildCard,sizeof(wildCard),"*_%s",IMG_ORDER_VAR); cartRemoveLike(cart, wildCard); } -#endif///def IMAGEv2_DRAG_REORDER #ifdef SUBTRACKS_HAVE_VIS subtrackCartCleanup(trackList,cart,oldVars); // Subtrack settings must be removed when composite/view settings are updated #endif///def SUBTRACKS_HAVE_VIS @@ -4740,12 +4586,8 @@ hPrintf("<TD COLSPAN=15 style=\"white-space:normal\">"); // allow this text to wrap hWrites("Click on a feature for details. "); hWrites(dragZooming ? "Click or drag in the base position track to zoom in. " : "Click on base position to zoom in around cursor. "); -#ifdef IMAGEv2_DRAG_REORDER hWrites("Click side bars for track options. "); hWrites("Drag side bars or labels up or down to reorder tracks. "); -#else//ifndef IMAGEv2_DRAG_REORDER - hWrites("Click gray/blue bars on left for track options and descriptions. "); -#endif//ndef IMAGEv2_DRAG_REORDER #ifdef IMAGEv2_DRAG_SCROLL hWrites("Drag tracks left or right to new position. "); #endif//def IMAGEv2_DRAG_SCROLL @@ -4773,10 +4615,8 @@ } #endif hButton("hgt.reset", "default tracks"); -#ifdef IMAGEv2_DRAG_REORDER hPrintf(" "); hButton("hgt.defaultImgOrder", "default order"); -#endif//def IMAGEv2_DRAG_REORDER // if (showTrackControls) - always show "hide all", Hiram 2008-06-26 { hPrintf(" "); @@ -5223,9 +5063,7 @@ { revCmplDisp = cartUsualBooleanDb(cart, database, REV_CMPL_DISP, FALSE); } -#if !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) withPriorityOverride = cartUsualBoolean(cart, configPriorityOverride, FALSE); -#endif/// !defined(IMAGEv2_DRAG_REORDER_NOPRIORS) || !defined(IMAGEv2_DRAG_REORDER_NOPRIORITY) insideX = trackOffsetX(); insideWidth = tl.picWidth-gfxBorder-insideX;