opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Scatterplot (plugin version): small fixes, move dataset out of config, namespace hbrs templates

Browse Source
This commit is contained in:
Carl Eberhard
2013-11-19 10:19:22 -05:00
parent b2cffd410c
commit 018f5187e8
6 changed files with 26 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/scatterplot/src/scatterplot-config-editor.js
+12 -7
View File
@@ -37,14 +37,19 @@ var ScatterplotConfigEditor = BaseView.extend( LoggableMixin ).extend({
/** initialize requires a configuration Object containing a dataset Object */
initialize : function( attributes ){
//console.log( this + '.initialize, attributes:', attributes );
if( !attributes || !attributes.config || !attributes.config.dataset ){
if( !attributes || !attributes.config || !attributes.dataset ){
throw new Error( "ScatterplotView requires a configuration and dataset" );
}
this.dataset = attributes.config.dataset;
//console.log( 'config:', attributes.config );
this.dataset = attributes.dataset;
//console.log( 'dataset:', this.dataset );
//TODO: ScatterplotView -> ScatterplotDisplay, this.plotView -> this.display
this.plotView = new ScatterplotView({
dataset : attributes.dataset,
config : attributes.config
//TODO: if data
});
},
@@ -197,8 +202,8 @@ var ScatterplotConfigEditor = BaseView.extend( LoggableMixin ).extend({
// parse the column values for both indeces (for the data fetch) and names (for the chart)
var $dataControls = this.$el.find( '#data-control' );
var settings = {
xColumn : $dataControls.find( '[name="xColumn"]' ).val(),
yColumn : $dataControls.find( '[name="yColumn"]' ).val()
xColumn : Number( $dataControls.find( '[name="xColumn"]' ).val() ),
yColumn : Number( $dataControls.find( '[name="yColumn"]' ).val() )
};
if( $dataControls.find( '#include-id-checkbox' ).prop( 'checked' ) ){
settings.idColumn = $dataControls.find( '[name="idColumn"]' ).val();
@@ -229,9 +234,9 @@ var ScatterplotConfigEditor = BaseView.extend( LoggableMixin ).extend({
});
ScatterplotConfigEditor.templates = {
mainLayout : Templates.editor,
dataControl : Templates.datacontrol,
chartControl : Templates.chartcontrol
mainLayout : scatterplot.editor,
dataControl : scatterplot.datacontrol,
chartControl : scatterplot.chartcontrol
};
//==============================================================================