84752f0ce3a33bfcc5dc2fc7b1f5cc8892657bc3 larrym Sun Apr 29 10:45:05 2012 -0700 fix things broken by changes in jsHelper diff --git src/hg/hgTracks/imageV2.h src/hg/hgTracks/imageV2.h index be36b97..f52e48d 100644 --- src/hg/hgTracks/imageV2.h +++ src/hg/hgTracks/imageV2.h @@ -50,36 +50,36 @@ void flatTracksAdd(struct flatTracks **flatTracks,struct track *track,struct cart *cart); /* Adds one track into the flatTracks list */ int flatTracksCmp(const void *va, const void *vb); /* Compare to sort on flatTrack->order */ void flatTracksSort(struct flatTracks **flatTracks); /* This routine sorts the imgTracks then forces tight ordering, so new tracks wil go to the end */ void flatTracksFree(struct flatTracks **flatTracks); /* Frees all memory used to support flatTracks (underlying tracks are untouched) */ ///////////////////////// // JSON support. Eventually the whole imgTbl could be written out as JSON -void jsonTdbSettingsBuild(struct jsonHashElement *settings, struct track *track, boolean configurable); +void jsonTdbSettingsBuild(struct jsonElement *settings, struct track *track, boolean configurable); // Creates then successively adds trackDb settings to the jsonTdbSettingsString // Initially pass in NULL pointer to a dyString to properly begin building -void jsonTdbSettingsUse(struct jsonHashElement *settings); +void jsonTdbSettingsUse(struct jsonElement *settings); // Closes and returns the contents of the jsonTdbSettingsString ///////////////////////// // IMAGEv2 // The new way to do images // Terms: // "image box": The new version of the image on the html page. It is a table with rows that contain tracks which are made up of parts of images. // "imgBox": The C struct that contains all information to render the image box on the html page. // "imgTbl": The HTML structure that contains individual track images. The javascript client controls the imgTbl. // Thus cgi knows imgBox while html/js knows imgTbl. // "image": A single gif. An image may contain mutilple tracks. // Even as a single track and image may contain a data image, sideLabel and centerLabel // "map" or "mapSet": The image map for providing links to items in a data image. // An image and map are a 1 to 1 pair and pixel coordinates are alway image relative. // "slice" or "imgSlice": The cgi concept of the portion of an image that is sent to the html/js side.