1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/5a3c60aca201/ changeset: 5a3c60aca201 user: jgoecks date: 2012-06-13 18:29:20 summary: Updates to trackster to work with f93ecd917348 and 4fbd05095ca7. affected #: 3 files

diff -r f93ecd917348aeef6332a6d441300ab505daad73 -r 5a3c60aca201a3cefc1baef1f945043afc52a3be lib/galaxy/web/controllers/tracks.py --- a/lib/galaxy/web/controllers/tracks.py +++ b/lib/galaxy/web/controllers/tracks.py @@ -327,7 +327,7 @@ # Get datasources and check for messages. data_sources = self._get_datasources( trans, dataset ) messages_list = [ data_source_dict[ 'message' ] for data_source_dict in data_sources.values() ] - msg = _get_highest_priority_msg( messages_list ) + msg = get_highest_priority_msg( messages_list ) if msg: return msg

@@ -375,7 +375,7 @@ # Get datasources and check for messages. data_sources = self._get_datasources( trans, dataset ) messages_list = [ data_source_dict[ 'message' ] for data_source_dict in data_sources.values() ] - return_message = _get_highest_priority_msg( messages_list ) + return_message = get_highest_priority_msg( messages_list ) if return_message: return return_message

diff -r f93ecd917348aeef6332a6d441300ab505daad73 -r 5a3c60aca201a3cefc1baef1f945043afc52a3be templates/tracks/browser.mako --- a/templates/tracks/browser.mako +++ b/templates/tracks/browser.mako @@ -42,22 +42,21 @@ <script type='text/javascript' src="${h.url_for('/static/scripts/excanvas.js')}"></script><![endif]-->

-${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jstorage", "jquery.event.drag", "jquery.event.hover","jquery.mousewheel", "jquery.autocomplete", "viz/visualization", "viz/trackster", "viz/trackster_ui", "jquery.ui.sortable.slider", "farbtastic" )} +${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jstorage", "jquery.event.drag", "jquery.event.hover","jquery.mousewheel", "jquery.autocomplete", "mvc/data", "viz/visualization", "viz/trackster", "viz/trackster_ui", "jquery.ui.sortable.slider", "farbtastic" )}

<script type="text/javascript"> // // Place URLs here so that url_for can be used to generate them. // galaxy_paths.set({ - visualization_url: "${h.url_for( action='save' )}" + visualization_url: "${h.url_for( action='save' )}", + run_tool_url: "${h.url_for( controller='/api/tools' )}" }); var add_track_async_url = "${h.url_for( action='add_track_async' )}", add_datasets_url = "${h.url_for( action='list_current_history_datasets' )}", default_data_url = "${h.url_for( action='data' )}", - raw_data_url = "${h.url_for( action='raw_data' )}", - run_tool_url = "${h.url_for( action='run_tool' )}", - rerun_tool_url = "${h.url_for( action='rerun_tool' )}", + raw_data_url = "${h.url_for( action='raw_data' )}", reference_url = "${h.url_for( action='reference' )}", chrom_url = "${h.url_for( action='chroms' )}", dataset_state_url = "${h.url_for( action='dataset_state' )}",

diff -r f93ecd917348aeef6332a6d441300ab505daad73 -r 5a3c60aca201a3cefc1baef1f945043afc52a3be templates/visualization/paramamonster.mako --- a/templates/visualization/paramamonster.mako +++ b/templates/visualization/paramamonster.mako @@ -35,18 +35,42 @@ ${parent.javascripts()}

${h.templates( "tool_link", "panel_section", "tool_search" )} - ${h.js( "libs/d3", "viz/visualization", "viz/paramamonster", "mvc/tools" )} + ${h.js( "libs/d3", "mvc/data", "mvc/tools", "viz/visualization", "viz/paramamonster" )}

<script type="text/javascript"> + var tool; $(function() { // -- Viz set up. --

- var tool = new Tool(JSON.parse('${ h.to_json_string( tool ) }')), - tool_param_tree = new ToolParameterTree({ tool: tool }), - tool_param_tree_view = new ToolParameterTreeView({ model: tool_param_tree }); + tool = new Tool(JSON.parse('${ h.to_json_string( tool ) }')); + // HACK: need to replace \ with \ due to simplejson bug. + var dataset = new Dataset(JSON.parse('${ h.to_json_string( dataset.get_api_value() ).replace('\', '\\' ) }')), + paramamonster_viz = new ParamaMonsterVisualization({ + tool: tool, + dataset: dataset + }); + viz_view = new ParamaMonsterVisualizationView({ model: paramamonster_viz });

- tool_param_tree_view.render(); - $('#param-tree').append(tool_param_tree_view.$el); + viz_view.render(); + $('.unified-panel-body').append(viz_view.$el); + + // Tool testing. + var regions = [ + new GenomeRegion({ + chrom: 'chr19', + start: '10000', + end: '26000' + }), + new GenomeRegion({ + chrom: 'chr19', + start: '30000', + end: '36000' + }) + ]; + + $.when(tool.rerun(dataset, regions)).then(function(outputs) { + console.log(outputs); + }); }); </script></%def> @@ -59,7 +83,5 @@ <div style="clear: both"></div></div><div class="unified-panel-body"> - <div id="param-tree"></div> - <div id="tile-view"></div></div></%def>

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.