Skip to content

Commit

Permalink
Merge pull request #127 from colin-combe/master
Browse files Browse the repository at this point in the history
added citation, incremented version number
  • Loading branch information
colin-combe authored Nov 15, 2017
2 parents 86c9b2f + c9b98c8 commit ba69c14
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
xiNET interaction viewer
========================
ComplexViewer
==============

v1.0 of the interaction viewer is deployed in EBI's Complex Portal, e.g. http://www.ebi.ac.uk/intact/complex/details/EBI-706830
[Colin W Combe, Marine (Dumousseau) Sivade, Henning Hermjakob, Joshua Heimbach, Birgit H M Meldal, Gos Micklem, Sandra Orchard, Juri Rappsilber; ComplexViewer: visualization of curated macromolecular complexes, _Bioinformatics_, Volume 33, Issue 22, 15 November 2017, Pages 3673–3675, https://doi.org/10.1093/bioinformatics/btx497](https://doi.org/10.1093/bioinformatics/btx497)

v1 of the interaction viewer is deployed in EBI's Complex Portal, e.g. http://www.ebi.ac.uk/intact/complex/details/EBI-706830

We are working towards a general purpose web component for visualising interactions between biomolecules.
The aim is to represent the data present in the PSI-MI standards.

Join us!

##Input data
## Input data

The 'MI-JSON' data format consumed by the interaction-viewer is generated by the JAMI framework.
See: https://github.com/MICommunity/psimi
Expand All @@ -17,8 +17,9 @@ JAMI is capable of converting between various MI data formats, it can convert th

JAMI was originally developed by Marine Dumousseau, who also largely determined the structure of the MI-JSON format the viewer reads.

##Build Process
## Build Process

(0. install nodejs, npm)
1. Clone the repository.
2. $ cd /interaction-viewer
3. $ npm install
Expand Down
5 changes: 5 additions & 0 deletions demo/css/demo.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
width:100%;
}

.page-header h1{
color: white;
text-decoration: underline;
}

h1 {
font-size:1.6em;
display:inline;
Expand Down
3 changes: 1 addition & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@

<div class="page-header">
<i class="fa fa-github" onclick="window.location = 'https://github.com/MICommunity/ComplexViewer';" title="Go to GitHub project" style="margin-right:5px;"></i>
<h1>ComplexViewer</h1>
<p>Colin Combe, Marine (Dumousseau) Sivade, Henning Hermjakob, Joshua Heimbach, Birgit Meldal, Gos Micklem, Sandra Orchard, Juri Rappsilber</p>
<a target="_blank" href="https://doi.org/10.1093/bioinformatics/btx497"><h1>ComplexViewer: visualization of curated macromolecular complexes</h1></a>
</div>

<div id="centre">
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "complexviewer",
"version": "1.0.8",
"version": "1.0.9",
"description": "A network visualisation that displays molecular interaction data, including detailed residue-level information such as binding sites. v1 is used in EBI's Complex Portal. The aim for v2 is a general purpose viewer for PSI-MI XML data",
"author": {
"name": "Colin Combe",
Expand Down

0 comments on commit ba69c14

Please sign in to comment.