Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Showing symbols rather than label in Circuit Browser when available #1324

Merged
merged 20 commits into from
Apr 4, 2022
Merged

Showing symbols rather than label in Circuit Browser when available #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6b82ef1
Merge pull request #1136 from VirtualFlyBrain/feature/1114
Robbie1977 May 28, 2021
62e66af
reverting to paths
Robbie1977 May 28, 2021
f8b2df1
Merge branch 'pipeline2' into pipeline2-sync-1e8d
Robbie1977 Jun 22, 2021
1967e39
Merge pull request #1149 from VirtualFlyBrain/pipeline2-sync-1e8d
Robbie1977 Jun 22, 2021
0d42f48
Merge pull request #1156 from VirtualFlyBrain/pipeline2-sync-5c32
Robbie1977 Jul 6, 2021
6413e11
Merge pull request #1189 from VirtualFlyBrain/pipeline2-sync-da98
Robbie1977 Oct 14, 2021
4eaedeb
Merge pull request #1201 from VirtualFlyBrain/pipeline2-sync-6c33
Robbie1977 Oct 14, 2021
f6d21be
Merge pull request #1246 from VirtualFlyBrain/pipeline2-sync-244a
Robbie1977 Nov 8, 2021
89bc79f
Merge pull request #1256 from VirtualFlyBrain/pipeline2-sync-6ec1
Robbie1977 Nov 22, 2021
54b20b6
Merge pull request #1272 from VirtualFlyBrain/development
Robbie1977 Jan 10, 2022
9cfc9d1
Merge pull request #1321 from VirtualFlyBrain/pipeline2-sync-0806
Robbie1977 Mar 14, 2022
aa08f1a
defaulting to symbol vs label if available
Robbie1977 Mar 28, 2022
f9d6ce8
updating cluster report to latest Individual + related_individuals fr…
Robbie1977 Mar 31, 2022
747bd08
update from https://github.com/VirtualFlyBrain/VFB_json_schema/runs/5…
Robbie1977 Mar 31, 2022
3398265
naming pub query for comparison
Robbie1977 Apr 1, 2022
e58b325
updating xmi from https://github.com/VirtualFlyBrain/VFB_json_schema/…
Robbie1977 Apr 1, 2022
f2cdd8d
removing any channels
Robbie1977 Apr 1, 2022
7ecdadd
Revert "updating xmi from https://github.com/VirtualFlyBrain/VFB_json…
Robbie1977 Apr 1, 2022
8762085
updating pub query with name
Robbie1977 Apr 1, 2022
99c68ea
update to match https://github.com/VirtualFlyBrain/VFB_json_schema/ru…
Robbie1977 Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/configuration/VFBCircuitBrowser/circuitBrowserConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var locationCypherQuery = ( instances, paths, weight ) => ({
+ " WITH * ORDER BY index DESC"
+ " UNWIND relationships(path) as sr"
+ " OPTIONAL MATCH cp=(x:Neuron:has_neuron_connectivity)-[:synapsed_to]-(y:Neuron:has_neuron_connectivity) WHERE x=apoc.rel.startNode(sr) AND y=apoc.rel.endNode(sr) OPTIONAL MATCH fp=(x)-[r:synapsed_to]->(y) WHERE r.weight[0] >= " + weight?.toString()
+ " OPTIONAL MATCH (x)-[xio:INSTANCEOF]->(xpc:Class) OPTIONAL MATCH (y)-[yio:INSTANCEOF]->(ypc:Class) WITH *,'\"'+ x.short_form+'\":{\"'+xpc.short_form+'\":\"' + xpc.label + '\"},\"'+ y.short_form+'\":{\"'+ypc.short_form+'\":\"' + ypc.label + '\"}' as Class"
+ " OPTIONAL MATCH (x)-[xio:INSTANCEOF]->(xpc:Class) OPTIONAL MATCH (y)-[yio:INSTANCEOF]->(ypc:Class) WITH *,'\"'+ x.short_form+'\":{\"'+xpc.short_form+'\":\"' + coalesce(xpc.symbol[0], xpc.label) + '\"},\"'+ y.short_form+'\":{\"'+ypc.short_form+'\":\"' + coalesce(ypc.symbol[0], ypc.label) + '\"}' as Class"
+ " RETURN distinct a as root, collect(distinct fp) as pp, collect(distinct cp) as p, collect(distinct id(r)) as fr, sourceNode as source, targetNode as target, max(length(path)) as maxHops, collect(distinct toString(id(r))+':'+toString(index)) as relationshipY, "
+ " apoc.convert.fromJsonMap('{' + apoc.text.join(collect(Class),',') + '}') as class ",
"resultDataContents": ["row", "graph"]
Expand Down
2 changes: 1 addition & 1 deletion components/configuration/VFBMain/searchConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ var datasourceConfiguration = {
"start": "0",
"pf":"true",
"fq": [
"short_form:VFB* OR short_form:FB* OR facets_annotation:DataSet OR facets_annotation:pub"
"(short_form:VFB* OR short_form:FB* OR facets_annotation:DataSet OR facets_annotation:pub) AND NOT short_form:VFBc_*"
],
"rows": "100",
"wt": "json",
Expand Down
Loading