src/hg/hgTracks/hgTracks.c 1.1580
1.1580 2009/07/07 16:40:45 tdreszer
Very minor work towards making the imgBox portal. Mostly just want to check in some format changes before too much dust gathers
Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1579
retrieving revision 1.1580
diff -b -B -U 4 -r1.1579 -r1.1580
--- src/hg/hgTracks/hgTracks.c 29 Jun 2009 18:14:46 -0000 1.1579
+++ src/hg/hgTracks/hgTracks.c 7 Jul 2009 16:40:45 -0000 1.1580
@@ -1573,9 +1573,8 @@
int dataSliceOffsetX = 0;
int sliceHeight = 0;
int sliceOffsetY = 0;
char *rulerTtl = (dragZooming?"drag select or click to zoom":"click to zoom 3x");//"click or drag mouse in base position track to zoom in" : NULL);
-char *sideTtl = "Drag to reorder tracks";
#endif//def IMAGEv2_UI
if (rulerMode != tvFull)
{
@@ -1712,8 +1711,10 @@
sideSliceOffsetX = (revCmplDisp?(tl.picWidth - sideSliceWidth): 0);
}
dataSliceWidth = tl.picWidth - sideSliceWidth;
dataSliceOffsetX = (revCmplDisp?0:sideSliceWidth);
+// FIXME: Up top I could create new beg/end and then widen winStart, winEnd and pixWidth. It will take some playing with.
+imgBoxDefinePortal(theImgBox,winStart,winEnd,dataSliceWidth);
#endif//def IMAGEv2_UI
/* Draw mini-buttons. */
if (withLeftLabels && psOutput == NULL)
@@ -1866,9 +1867,9 @@
// But as soon as subtracks are individual image tracks: problems with buttons, left labels, center labels, drag and drop, etc.
sliceHeight = trackPlusLabelHeight(track, fontHeight);
sliceOffsetY = y;
curImgTrack = imgBoxTrackFindOrAdd(theImgBox,track->tdb,NULL,track->limitedVis,isWithCenterLabels(track),IMG_ANYORDER);
- curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,isSide,theOneImg,sideTtl,sideSliceWidth,sliceHeight,sideSliceOffsetX,sliceOffsetY);
+ curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,isSide,theOneImg,NULL,sideSliceWidth,sliceHeight,sideSliceOffsetX,sliceOffsetY);
curMap = sliceMapFindOrStart(curSlice,track->tdb->tableName,NULL); // No common linkRoot
}
#endif//def IMAGEv2_UI
if (trackIsCompositeWithSubtracks(track)) //TODO: Change when tracks->subtracks are always set for composite
@@ -2256,9 +2257,9 @@
// But as soon as subtracks are individual image tracks: problems with buttons, left labels, center labels, drag and drop, etc.
sliceHeight = trackPlusLabelHeight(track, fontHeight);
sliceOffsetY = y;
curImgTrack = imgBoxTrackFindOrAdd(theImgBox,track->tdb,NULL,track->limitedVis,isWithCenterLabels(track),IMG_ANYORDER);
- curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,isSide,theOneImg,sideTtl,sideSliceWidth,sliceHeight,sideSliceOffsetX,sliceOffsetY);
+ curSlice = imgTrackSliceUpdateOrAdd(curImgTrack,isSide,theOneImg,NULL,sideSliceWidth,sliceHeight,sideSliceOffsetX,sliceOffsetY);
curMap = sliceMapFindOrStart(curSlice,track->tdb->tableName,NULL); // No common linkRoot
}
#endif//def IMAGEv2_UI
if (trackIsCompositeWithSubtracks(track)) //TODO: Change when tracks->subtracks are always set for composite
@@ -4475,9 +4476,9 @@
&& (defaultPosition != NULL))
position = cloneString(defaultPosition);
if (sameString(position, ""))
{
- errAbort("Please go back and enter a coordinate range in the \"position\" field.<br>For example: chr22:20100000-20200000.\n");
+ errAbort("Please go back and enter a coordinate rangeor a search term in the \"position\" field.<br>For example: chr22:20100000-20200000.\n");
}
chromName = NULL;
winStart = 0;