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

Removing utils.get to fetch pdb files

Browse Source
This commit is contained in:
anuprulez
2017-02-15 14:11:55 +01:00
parent 6864bc30b4
commit 48639028df
4 changed files with 54 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/charts/static/repository/build/ngl_viewer.js
+26 -34
View File
@@ -49,42 +49,34 @@ define(function() { return /******/ (function(modules) { // webpackBootstrap
initialize: function( options ) {
var dataset = options.dataset,
settings = options.chart.settings,
stage = new ngl.Stage( options.targets[ 0 ], { backgroundColor: settings.get( 'backcolor' ) } );
stage = new ngl.Stage( options.targets[ 0 ], { backgroundColor: settings.get( 'backcolor' ) } ),
viewer_options = {},
representation_parameters = {},
stage_parameters = {};
Utils.get( {
url : dataset.download_url,
cache : true,
success : function( response ) {
var viewer_options = {},
representation_parameters = {};
_.each( settings.attributes, function( value, key ) {
if ( key.startsWith( 'viewer|' ) ) {
viewer_options[ key.replace( 'viewer|', '' ) ] = value;
}
} );
representation_parameters = {
radius: settings.get( 'radius' ),
scale: settings.get( 'scale' ),
assembly: settings.get( 'assembly' ),
color: settings.get( 'colorscheme' ),
opacity: settings.get( 'opacity' )
};
stage.loadFile( dataset.download_url, {ext: dataset.extension, name: dataset.name, defaultRepresentation: true} ).then( function( o ) {
o.addRepresentation( viewer_options.mode, representation_parameters );
o.centerView();
} );
stage.setQuality( settings.get( 'quality' ) );
if( settings.get( 'spin' ) === true || settings.get( 'spin' ) === 'true' ) {
stage.setSpin( [ 0, 1, 0 ], 0.01 );
}
options.chart.state( 'ok', 'Chart drawn.' );
options.process.resolve();
},
error : function() {
options.chart.state( 'ok', 'Failed to load pdb file.' );
options.process.resolve();
_.each( settings.attributes, function( value, key ) {
if ( key.startsWith( 'viewer|' ) ) {
viewer_options[ key.replace( 'viewer|', '' ) ] = value;
}
});
} );
representation_parameters = {
radius: settings.get( 'radius' ),
scale: settings.get( 'scale' ),
assembly: settings.get( 'assembly' ),
color: settings.get( 'colorscheme' ),
opacity: settings.get( 'opacity' )
};
stage_parameters = { ext: dataset.extension, name: dataset.name, defaultRepresentation: true };
stage.loadFile( dataset.download_url, stage_parameters ).then( function( component ) {
component.addRepresentation( viewer_options.mode, representation_parameters );
component.centerView();
options.chart.state( 'ok', 'Chart drawn.' );
options.process.resolve();
} );
stage.setQuality( settings.get( 'quality' ) );
if( settings.get( 'spin' ) === true || settings.get( 'spin' ) === 'true' ) {
stage.setSpin( [ 0, 1, 0 ], 0.01 );
}
// Re-renders the molecule view when window is resized
$( window ).resize( function() { stage.viewer.handleResize() } );
}
config/plugins/visualizations/charts/static/repository/build/ngl_viewer.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
config/plugins/visualizations/charts/static/repository/build/registry.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
config/plugins/visualizations/charts/static/repository/visualizations/ngl/viewer/wrapper.js
+26 -34
View File
@@ -3,42 +3,34 @@ define( [ 'utilities/utils', "plugins/ngl/viewer" ], function( Utils, ngl ) {
initialize: function( options ) {
var dataset = options.dataset,
settings = options.chart.settings,
stage = new ngl.Stage( options.targets[ 0 ], { backgroundColor: settings.get( 'backcolor' ) } );
stage = new ngl.Stage( options.targets[ 0 ], { backgroundColor: settings.get( 'backcolor' ) } ),
viewer_options = {},
representation_parameters = {},
stage_parameters = {};
Utils.get( {
url : dataset.download_url,
cache : true,
success : function( response ) {
var viewer_options = {},
representation_parameters = {};
_.each( settings.attributes, function( value, key ) {
if ( key.startsWith( 'viewer|' ) ) {
viewer_options[ key.replace( 'viewer|', '' ) ] = value;
}
} );
representation_parameters = {
radius: settings.get( 'radius' ),
scale: settings.get( 'scale' ),
assembly: settings.get( 'assembly' ),
color: settings.get( 'colorscheme' ),
opacity: settings.get( 'opacity' )
};
stage.loadFile( dataset.download_url, {ext: dataset.extension, name: dataset.name, defaultRepresentation: true} ).then( function( o ) {
o.addRepresentation( viewer_options.mode, representation_parameters );
o.centerView();
} );
stage.setQuality( settings.get( 'quality' ) );
if( settings.get( 'spin' ) === true || settings.get( 'spin' ) === 'true' ) {
stage.setSpin( [ 0, 1, 0 ], 0.01 );
}
options.chart.state( 'ok', 'Chart drawn.' );
options.process.resolve();
},
error : function() {
options.chart.state( 'ok', 'Failed to load pdb file.' );
options.process.resolve();
_.each( settings.attributes, function( value, key ) {
if ( key.startsWith( 'viewer|' ) ) {
viewer_options[ key.replace( 'viewer|', '' ) ] = value;
}
});
} );
representation_parameters = {
radius: settings.get( 'radius' ),
scale: settings.get( 'scale' ),
assembly: settings.get( 'assembly' ),
color: settings.get( 'colorscheme' ),
opacity: settings.get( 'opacity' )
};
stage_parameters = { ext: dataset.extension, name: dataset.name, defaultRepresentation: true };
stage.loadFile( dataset.download_url, stage_parameters ).then( function( component ) {
component.addRepresentation( viewer_options.mode, representation_parameters );
component.centerView();
options.chart.state( 'ok', 'Chart drawn.' );
options.process.resolve();
} );
stage.setQuality( settings.get( 'quality' ) );
if( settings.get( 'spin' ) === true || settings.get( 'spin' ) === 'true' ) {
stage.setSpin( [ 0, 1, 0 ], 0.01 );
}
// Re-renders the molecule view when window is resized
$( window ).resize( function() { stage.viewer.handleResize() } );
}