Popupmenu mvc: fix anchor target in renderOptions; Visualizations registry: default link target to galaxy_main; Scatterplot (in registry): general refactoring and cleanup, paginate data instead of loading all, allow zoom and pan; pack scripts

This commit is contained in:
Carl Eberhard
2013-11-08 11:02:23 -05:00
parent a55fab57f8
commit 108f30d541
24 changed files with 1200 additions and 1403 deletions
@@ -23,45 +23,43 @@
<script type="text/javascript" src="/static/scripts/utils/LazyDataLoader.js"></script>
<script type="text/javascript" src="/static/scripts/mvc/base-mvc.js"></script>
<script type="text/javascript" src="/plugins/visualizations/scatterplot/static/scatterplot.js"></script>
<script type="text/javascript" src="/plugins/visualizations/scatterplot/static/scatterplot-edit.js"></script>
</head>
## ----------------------------------------------------------------------------
<body>
%if not embedded:
## dataset info: only show if on own page
<div id="chart-header" class="header">
<h2 class="title">Scatterplot of '${hda.name}'</h2>
<p class="subtitle">${hda.info}</p>
<div class="chart-header">
<h2>Scatterplot of '${hda.name}'</h2>
<p>${hda.info}</p>
</div>
%endif
<div id="scatterplot" class="scatterplot-control-form"></div>
<div class="scatterplot-editor"></div>
<script type="text/javascript">
$(function(){
<%
# optionally, bootstrap data from dprov
data = None
##data = list( hda.datatype.dataset_column_dataprovider( hda, limit=10000 ) )
%>
var hda = ${h.to_json_string( trans.security.encode_dict_ids( hda.to_dict() ) )},
data = ${h.to_json_string( data )},
querySettings = ${h.to_json_string( query_args )},
chartConfig = _.extend( querySettings, {
config = _.extend( querySettings, {
containerSelector : '#chart',
//TODO: move to ScatterplotControlForm.initialize
marginTop : ( querySettings.marginTop > 20 )?( querySettings.marginTop ):( 20 ),
xColumn : querySettings.xColumn,
yColumn : querySettings.yColumn,
idColumn : querySettings.idColumn
dataset : hda,
});
//console.debug( querySettings );
var settingsForm = new ScatterplotControlForm({
dataset : hda,
apiDatasetsURL : "${h.url_for( controller='/api/datasets', action='index' )}",
el : $( '#scatterplot' ),
chartConfig : chartConfig
var editor = new ScatterplotConfigEditor({
el : $( '.scatterplot-editor' ).attr( 'id', 'scatterplot-editor-hda-' + hda.id ),
config : config
}).render();
// uncomment to auto render for development
//$( '.render-button:visible' ).click();
});
</script>
%endif
</body>