1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/72a381a4f692/
Changeset: 72a381a4f692
User: jgoecks
Date: 2013-05-02 15:41:17
Summary: Trackster: whitespace fixes.
Affected #: 1 file
diff -r fadc4b334f3e3cca07238f86d30053318215486e -r 72a381a4f692feb906e85f6cfed99c7407640282 static/scripts/viz/trackster/tracks.js
--- a/static/scripts/viz/trackster/tracks.js
+++ b/static/scripts/viz/trackster/tracks.js
@@ -2722,6 +2722,7 @@
}
};
extend(TiledTrack.prototype, Drawable.prototype, Track.prototype, {
+
action_icons_def: Track.prototype.action_icons_def.concat( [
// Show more rows when all features are not slotted.
{
@@ -2737,6 +2738,7 @@
hide: true
}
] ),
+
/**
* Returns a copy of the track. The copy uses the same data manager so that the tracks can share data.
*/
@@ -2752,6 +2754,7 @@
new_track.enabled = this.enabled;
return new_track;
},
+
/**
* Set filters manager + HTML elements.
*/
@@ -2759,6 +2762,7 @@
this.filters_manager = filters_manager;
this.header_div.after(this.filters_manager.parent_div);
},
+
/**
* Returns representation of object in a dictionary for easy saving.
* Use from_dict to recreate object.
@@ -2777,6 +2781,7 @@
tool_state: (this.tool ? this.tool.state_dict() : {})
};
},
+
/**
* Change track's mode.
*/
@@ -2789,7 +2794,8 @@
track.request_draw();
this.action_icons.mode_icon.attr("title", "Set display mode (now: " + track.mode + ")");
return track;
- },
+ },
+
/**
* Update track's buttons.
*/
@@ -2921,6 +2927,7 @@
}
});
},
+
/**
* Actions to be taken after draw has been completed. Draw is completed when all tiles have been
* drawn/fetched and shown.
@@ -3160,6 +3167,7 @@
region_str = (region !== undefined ? region.toString() : "all");
return " - region=[" + region_str + "], parameters=[" + track.tool.get_param_values().join(", ") + "]";
},
+
/**
* Returns true if data is compatible with a given mode. Defaults to true because, for many tracks,
* all data is compatible with all modes.
@@ -3167,12 +3175,14 @@
data_and_mode_compatible: function(data, mode) {
return true;
},
+
/**
* Returns true if data can be subsetted. Defaults to false to ensure data is fetched when needed.
*/
can_subset: function(data) {
return false;
},
+
/**
* Set up track to receive tool data.
*/
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/3294bcdca48f/
Changeset: 3294bcdca48f
User: jgoecks
Date: 2013-05-01 21:08:25
Summary: Trackster: make composite track draw helper compatible with dd4b953.
Affected #: 1 file
diff -r b3338ccd9c793bb44cab686645e6cdeef8976ee8 -r 3294bcdca48fad92dbc9349da0dcd5ee6721b3bc static/scripts/viz/trackster/tracks.js
--- a/static/scripts/viz/trackster/tracks.js
+++ b/static/scripts/viz/trackster/tracks.js
@@ -3349,18 +3349,26 @@
draw_helper: function(force, region, resolution, parent_element, w_scale, kwargs) {
// FIXME: this function is similar to TiledTrack.draw_helper -- can the two be merged/refactored?
+
+ // SHARED block with TiledTrack.draw_helper():
+
var track = this,
- key = this._gen_tile_cache_key(w_scale, region);
+ key = this._gen_tile_cache_key(w_scale, region),
+ is_tile = function(o) { return (o && 'track' in o); };
// Init kwargs if necessary to avoid having to check if kwargs defined.
if (!kwargs) { kwargs = {}; }
// Check tile cache, if found show existing tile in correct position
var tile = (force ? undefined : track.tile_cache.get_elt(key));
- if (tile) {
- track.show_tile(tile, parent_element, w_scale);
+ if (tile) {
+ if (is_tile(tile)) {
+ track.show_tile(tile, parent_element, w_scale);
+ }
return tile;
}
+
+ // UNIQUE block.
// Try to get drawables' data.
var all_data = [],
@@ -3447,17 +3455,20 @@
this.show_tile(tile, parent_element, w_scale);
return tile;
}
-
- // Can't draw now, so trigger another redraw when the data is ready
- var can_draw = $.Deferred(),
- track = this;
+
+ // SHARED (somewhat) block with TiledTrack.draw_helper()
+
+ // Can't draw now, so put Deferred in cache and draw tile when data is available.
+ var tile_drawn = $.Deferred();
+ track = this;
+ track.tile_cache.set_elt(key, tile_drawn);
$.when.apply($, all_data).then(function() {
- view.request_redraw(false, false, false, track);
- can_draw.resolve();
+ // Draw tile--force to clear Deferred from cache--and resolve.
+ tile = track.draw_helper(true, region, resolution, parent_element, w_scale, kwargs);
+ tile_drawn.resolve(tile);
});
- // Returned Deferred that is resolved when tile can be drawn.
- return can_draw;
+ return tile_drawn;
},
/**
@@ -3534,7 +3545,7 @@
for (var i = 0; i < tiles.length; i++) {
var tile = tiles[i];
if (tile.html_elt.find("canvas").height() !== max_height) {
- this.draw_helper(true, tile.index, tile.resolution, tile.html_elt.parent(), w_scale, { height: max_height } );
+ this.draw_helper(true, tile.region, tile.resolution, tile.html_elt.parent(), w_scale, { height: max_height } );
tile.html_elt.remove();
}
}
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/4fce5cfe8be5/
Changeset: 4fce5cfe8be5
User: inithello
Date: 2013-05-01 16:23:13
Summary: Update repository metadata generation to provide the file path for tool functional test output files. Update script that checks for tool functional tests and test data to use the updated metadata structure.
Affected #: 2 files
diff -r cd6c9cc0079ce10685c04d003e735d6054a4a8c6 -r 4fce5cfe8be5724f27a1a909dac135c3f010fe30 lib/tool_shed/scripts/check_repositories_for_functional_tests.py
--- a/lib/tool_shed/scripts/check_repositories_for_functional_tests.py
+++ b/lib/tool_shed/scripts/check_repositories_for_functional_tests.py
@@ -387,16 +387,9 @@
missing_test_files = []
required_test_files = []
for test_dict in test_definition:
- for input_file in test_dict[ 'required_files' ]:
- if input_file not in required_test_files:
- required_test_files.append( input_file )
- for output in test_dict[ 'outputs' ]:
- fieldname, filename = output
- # In rare cases, the filename may be None. If that is the case, skip that output definition.
- if filename is None:
- continue
- if filename not in required_test_files:
- required_test_files.append( filename )
+ for required_file in test_dict[ 'required_files' ]:
+ if required_file not in required_test_files:
+ required_test_files.append( required_file )
# Make sure each specified file actually does exist in the test data path of the cloned repository.
for required_file in required_test_files:
required_file_full_path = os.path.join( test_data_path, required_file )
diff -r cd6c9cc0079ce10685c04d003e735d6054a4a8c6 -r 4fce5cfe8be5724f27a1a909dac135c3f010fe30 lib/tool_shed/util/metadata_util.py
--- a/lib/tool_shed/util/metadata_util.py
+++ b/lib/tool_shed/util/metadata_util.py
@@ -825,6 +825,8 @@
for output in ttb.outputs:
name, file_name, extra = output
outputs.append( ( name, suc.strip_path( file_name ) if file_name else None ) )
+ if file_name not in required_files and file_name is not None:
+ required_files.append( file_name )
test_dict = dict( name=ttb.name,
required_files=required_files,
inputs=inputs,
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/56e7a8b08234/
Changeset: 56e7a8b08234
User: greg
Date: 2013-05-01 02:49:20
Summary: Filter out deleted and deprecated repositories from the new tool shed lists for reviewing repositories with tool, and filter out repositories with missing tool components from the list that shows failing tool tests.
Affected #: 1 file
diff -r 6dc37563b0b744d8b571b0075110da54fd120df4 -r 56e7a8b0823434bd1458a31da4b35cec8acf88a8 lib/tool_shed/grids/repository_grids.py
--- a/lib/tool_shed/grids/repository_grids.py
+++ b/lib/tool_shed/grids/repository_grids.py
@@ -537,7 +537,9 @@
def build_initial_query( self, trans, **kwd ):
# Filter by latest installable revisions that contain tools with missing tool test components.
revision_clause_list = []
- for repository in trans.sa_session.query( model.Repository ):
+ for repository in trans.sa_session.query( model.Repository ) \
+ .filter( and_( model.Repository.table.c.deprecated == False,
+ model.Repository.table.c.deleted == False ) ):
changeset_revision = filter_by_latest_downloadable_changeset_revision_that_has_missing_tool_test_components( trans, repository )
if changeset_revision:
revision_clause_list.append( model.RepositoryMetadata.table.c.changeset_revision == changeset_revision )
@@ -614,7 +616,9 @@
def build_initial_query( self, trans, **kwd ):
# Filter by latest installable revisions that contain tools with at least 1 failing tool test.
revision_clause_list = []
- for repository in trans.sa_session.query( model.Repository ):
+ for repository in trans.sa_session.query( model.Repository ) \
+ .filter( and_( model.Repository.table.c.deprecated == False,
+ model.Repository.table.c.deleted == False ) ):
changeset_revision = filter_by_latest_downloadable_changeset_revision_that_has_failing_tool_tests( trans, repository )
if changeset_revision:
revision_clause_list.append( model.RepositoryMetadata.table.c.changeset_revision == changeset_revision )
@@ -692,7 +696,9 @@
# We have the list of repositories that the current user is authorized to update, so filter further by latest installable revisions that contain
# tools with at least 1 failing tool test.
revision_clause_list = []
- for repository in trans.sa_session.query( model.Repository ):
+ for repository in trans.sa_session.query( model.Repository ) \
+ .filter( and_( model.Repository.table.c.deprecated == False,
+ model.Repository.table.c.deleted == False ) ):
changeset_revision = filter_by_latest_downloadable_changeset_revision_that_has_no_failing_tool_tests( trans, repository )
if changeset_revision:
revision_clause_list.append( model.RepositoryMetadata.table.c.changeset_revision == changeset_revision )
@@ -1345,7 +1351,7 @@
repo = hg.repository( suc.get_configured_ui(), repository.repo_path( trans.app ) )
tip_ctx = str( repo.changectx( repo.changelog.tip() ) )
repository_metadata = get_latest_installable_repository_metadata_if_it_includes_tools( trans, repository )
- if repository_metadata and not repository_metadata.tools_functionally_correct:
+ if repository_metadata and not repository_metadata.missing_test_components and not repository_metadata.tools_functionally_correct:
return repository_metadata.changeset_revision
return None
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.