Skip to content

Commit

Permalink
graph comparison only showing genes in intersection
Browse files Browse the repository at this point in the history
  • Loading branch information
proost committed Jan 25, 2018
1 parent 6df2725 commit 5c4455d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion conekt/helpers/cytoscape.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def merge_networks(network_one, network_two, prune=True):
# Prune is enabled, only return nodes which are in both lists (and compound nodes)
nodes_to_keep = list(set(nodes_to_keep))
return {'nodes': [n for n in nodes if n["data"]["id"] in nodes_to_keep],
'edges': [e for e in edges if e["data"]["source"] in nodes_to_keep and e["data"]["target"]]}
'edges': [e for e in edges if e["data"]["source"] in nodes_to_keep and e["data"]["target"]in nodes_to_keep]}

@staticmethod
def get_families(network):
Expand Down
11 changes: 11 additions & 0 deletions conekt/static/js/cytoscape.cycss
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ node:unselected {
border-opacity:0.5;
}

node:parent {
background-color: #AAD8FF;
background-opacity:0.2;
}

node#compound_node_two {
background-color: #AAFFD8;
background-opacity:0.2;
}


node.hidden {
visibility: hidden;
}
Expand Down
2 changes: 2 additions & 0 deletions config.template.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
CACHE_DEFAULT_TIMEOUT = 120
CACHE_THRESHOLD = 10000

WTF_CSRF_TIME_LIMIT = None

# Minify pages when debug is off
MINIFY_PAGE = not DEBUG

Expand Down

0 comments on commit 5c4455d

Please sign in to comment.