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.

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

Merged interaction #103

Merged
merged 17 commits into from
Dec 20, 2018
Merged

Merged interaction #103

merged 17 commits into from
Dec 20, 2018

Conversation

asadeg02
Copy link
Member

@asadeg02 asadeg02 commented Dec 20, 2018

Addresses #99 #97 #85.
The purpose of this pull request was to remove the redundancy from interaction diagrams.
With this new approach all the interaction happening on top of a circuit are merged together and are rendered in one diagram; if the nonDNA part participating in the interaction is degraded then degradation is not shown in a separate diagram either, other wise it has to be shown separately.
Also interactions are sorted so that inhibitions and stimulation are always rendered to the left of genetic productions.
below is a segment of VisBOL rendering for a SBOL file
final

For that SBOL, file these interactions are rendered separately. please note that since some of these proteins in that SBOL file don't participate in any other interaction with circuits, their degradation interactions has to be rendered separately, even though degradation interactions are merged into the circuit interactions.
rest

Merge interactions algorithm is in "lib/displayList.js" and it merges interactions using a segment id which has been given to the segments using componentDefinitions uri in "lib/getDisplayList.js".

@cjmyers
Copy link
Collaborator

cjmyers commented Dec 20, 2018

This looks great. I'm going to test this out now.

@cjmyers
Copy link
Collaborator

cjmyers commented Dec 20, 2018

Looks like something is not checked in:

Error: Cannot find module './stimulatorArrow' from '/Users/myers/git/visbol-js/font/sbolv/interaction-arrows'
at /Users/myers/git/synbiohub/node_modules/browser-resolve/node_modules/resolve/lib/async.js:55:21
at load (/Users/myers/git/synbiohub/node_modules/browser-resolve/node_modules/resolve/lib/async.js:69:43)
at onex (/Users/myers/git/synbiohub/node_modules/browser-resolve/node_modules/resolve/lib/async.js:92:31)
at /Users/myers/git/synbiohub/node_modules/browser-resolve/node_modules/resolve/lib/async.js:22:47
at FSReqCallback.oncomplete (fs.js:161:21)

@cjmyers
Copy link
Collaborator

cjmyers commented Dec 20, 2018

Ah, I think I see the issue. You likely moved simulatorArrow to stimulatorArrow, but then did not commit stimulatorArrow

@asadeg02
Copy link
Member Author

Just Added it.

@cjmyers
Copy link
Collaborator

cjmyers commented Dec 20, 2018

Looks great. Merging.

@cjmyers cjmyers merged commit a736aaa into master Dec 20, 2018
@cjmyers cjmyers deleted the merged-interaction branch December 20, 2018 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants