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

Adding Depth First Search for cytoscape graphs

Browse Source
This commit is contained in:
anuprulez
2017-03-17 18:10:57 +01:00
parent 9f42821f57
commit a2affcc618
6 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/charts/static/repository/build/cytoscape_viewer.js
+19 -10
View File
@@ -94,9 +94,9 @@ define(function() { return /******/ (function(modules) { // webpackBootstrap
}
},
{
selector: '.bfspath',
selector: '.searchpath',
style: {
'background-color': '#336699', // #61bffc
'background-color': '#336699',
'line-color': '#336699',
'target-arrow-color': '#336699',
'transition-property': 'background-color, line-color, target-arrow-color',
@@ -108,9 +108,10 @@ define(function() { return /******/ (function(modules) { // webpackBootstrap
// Register tap event on graph nodes
// Right now on tapping on any node, BFS starts from that node
cytoscape.$('node').on('tap', function( e ) {
var ele = e.cyTarget;
self.run_bfs(cytoscape, ele.id());
cytoscape.$( 'node' ).on('tap', function( e ) {
var ele = e.cyTarget,
search_algorithm = settings.get( 'search_algorithm' );
self.run_search_algorithm(cytoscape, ele.id(), search_algorithm);
});
chart.state( 'ok', 'Chart drawn.' );
@@ -127,13 +128,21 @@ define(function() { return /******/ (function(modules) { // webpackBootstrap
}
});
},
run_bfs: function( cytoscape, root_id ) {
var bfs = cytoscape.elements().bfs('#' + root_id, function(){}, true);
var i = 0, timeOut = 1500;
run_search_algorithm: function( cytoscape, root_id, type ) {
var algorithm = "", i = 0, timeOut = 1500;
if( type === "bfs" ) {
algorithm = cytoscape.elements().bfs('#' + root_id, function(){}, true);
}
else if( type === "dfs" ) {
algorithm = cytoscape.elements().dfs('#' + root_id, function(){}, true);
}
else {
return;
}
var selectNextElement = function() {
if( i < bfs.path.length ) {
if( i < algorithm.path.length ) {
// Add css class for the selected edge
bfs.path[i].addClass('bfspath');
algorithm.path[i].addClass('searchpath');
i++;
setTimeout(selectNextElement, timeOut);
}
config/plugins/visualizations/charts/static/repository/build/cytoscape_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
+11
View File
@@ -861,6 +861,17 @@ define(function() { return /******/ (function(modules) { // webpackBootstrap
data : [ { label : 'Directed', value : 'triangle' },
{ label : 'Undirected', value : '' } ]
},
search_algorithm : {
label : 'Graph search algorithm',
help : 'Select a search algorithm.',
type : 'select',
display : 'radio',
value : '',
data : [ { label : 'Breadth First Search', value : 'bfs' },
{ label : 'Depth First Search', value : 'dfs' },
{ label : 'None', value : '' } ]
},
min_zoom : {
name : 'min_zoom',
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/cytoscape/viewer/config.js
+11
View File
@@ -41,6 +41,17 @@ define( [], function() {
data : [ { label : 'Directed', value : 'triangle' },
{ label : 'Undirected', value : '' } ]
},
search_algorithm : {
label : 'Graph search algorithm',
help : 'Select a search algorithm.',
type : 'select',
display : 'radio',
value : '',
data : [ { label : 'Breadth First Search', value : 'bfs' },
{ label : 'Depth First Search', value : 'dfs' },
{ label : 'None', value : '' } ]
},
min_zoom : {
name : 'min_zoom',
config/plugins/visualizations/charts/static/repository/visualizations/cytoscape/viewer/wrapper.js
+19 -10
View File
@@ -48,9 +48,9 @@ define( [ 'utilities/utils', 'utilities/sifjson', 'plugins/cytoscape/cytoscape'
}
},
{
selector: '.bfspath',
selector: '.searchpath',
style: {
'background-color': '#336699', // #61bffc
'background-color': '#336699',
'line-color': '#336699',
'target-arrow-color': '#336699',
'transition-property': 'background-color, line-color, target-arrow-color',
@@ -62,9 +62,10 @@ define( [ 'utilities/utils', 'utilities/sifjson', 'plugins/cytoscape/cytoscape'
// Register tap event on graph nodes
// Right now on tapping on any node, BFS starts from that node
cytoscape.$('node').on('tap', function( e ) {
var ele = e.cyTarget;
self.run_bfs(cytoscape, ele.id());
cytoscape.$( 'node' ).on('tap', function( e ) {
var ele = e.cyTarget,
search_algorithm = settings.get( 'search_algorithm' );
self.run_search_algorithm(cytoscape, ele.id(), search_algorithm);
});
chart.state( 'ok', 'Chart drawn.' );
@@ -81,13 +82,21 @@ define( [ 'utilities/utils', 'utilities/sifjson', 'plugins/cytoscape/cytoscape'
}
});
},
run_bfs: function( cytoscape, root_id ) {
var bfs = cytoscape.elements().bfs('#' + root_id, function(){}, true);
var i = 0, timeOut = 1500;
run_search_algorithm: function( cytoscape, root_id, type ) {
var algorithm = "", i = 0, timeOut = 1500;
if( type === "bfs" ) {
algorithm = cytoscape.elements().bfs('#' + root_id, function(){}, true);
}
else if( type === "dfs" ) {
algorithm = cytoscape.elements().dfs('#' + root_id, function(){}, true);
}
else {
return;
}
var selectNextElement = function() {
if( i < bfs.path.length ) {
if( i < algorithm.path.length ) {
// Add css class for the selected edge
bfs.path[i].addClass('bfspath');
algorithm.path[i].addClass('searchpath');
i++;
setTimeout(selectNextElement, timeOut);
}