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

add dash-ngl #496

Merged
merged 63 commits into from
Oct 15, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
40f1790
add dash-ngl
IvoLeist Mar 5, 2020
52f0fc5
added descriptions & cleaned code
IvoLeist Mar 6, 2020
38de83b
added dcc.Loading
IvoLeist Mar 6, 2020
c692bee
Apply suggestions from code review
IvoLeist Mar 6, 2020
a7e8b95
Update tests/dashbio_demos/dash-ngl/app.py
IvoLeist Mar 8, 2020
c3f6c47
removed hardcoding of viewport & added input box & added tests
IvoLeist Mar 8, 2020
bb8e1e7
resolved merge conflict
IvoLeist Mar 8, 2020
db1eac5
removed leftover console.logs
IvoLeist Mar 8, 2020
ace79e9
fixed some merging errors
IvoLeist Mar 8, 2020
e47ceba
Merge branch 'master' into add-dash-ngl
IvoLeist Mar 9, 2020
2f3df53
renamed files, added defaultData, rewritten shouldComponentUpdate, up…
IvoLeist Mar 10, 2020
4a38872
accidentally pushed a modification - reverted it and improved on flak…
IvoLeist Mar 10, 2020
6403d3f
renamed NglMoleculeViewer.js -> NglMoleculeViewer.react.js
IvoLeist Mar 10, 2020
1248396
added prevProps to shouldComponentUpdate; added test for swith bg
IvoLeist Mar 14, 2020
ac86509
added render quality dropdown, added CoVid19 structures
IvoLeist Mar 17, 2020
a5312a2
fixed bug in shouldComponentUpdate, removed dcc.Loading
IvoLeist Mar 18, 2020
03a2c20
resolve merge conflict with master
IvoLeist Mar 18, 2020
178ce49
fixed comment in app.py
IvoLeist Mar 18, 2020
63bb986
added multiple structure upload, redesigned demo interface, added css
IvoLeist Mar 24, 2020
d029214
added ramda.js
IvoLeist Mar 25, 2020
b01e7b6
changed import syntax for equals, removed unecessary div wrapper
IvoLeist Mar 26, 2020
38bc925
removed limitation to show not more than 4 structures
IvoLeist Mar 30, 2020
1e508c3
added reset view
IvoLeist Apr 1, 2020
eba02b5
Merge branch 'master' into add-dash-ngl
IvoLeist Apr 1, 2020
399e550
added custom chain colors for multiple proteins view, added support o…
IvoLeist Apr 7, 2020
4c4695a
enabled selection by amino acid range & download output as png (tests…
IvoLeist Apr 16, 2020
f5a121d
added test for selecting amino acid range, updated demo app
IvoLeist Apr 16, 2020
a8ad940
updated placeholder value
IvoLeist Apr 16, 2020
a26509a
added molecule style selection
IvoLeist Apr 20, 2020
3377720
added possibility to highlight chosen atoms
IvoLeist Apr 22, 2020
f58739e
added possibility to highlight c alpha of chosen residues
IvoLeist Apr 24, 2020
a5d8b8a
removed console.logs and print statements
IvoLeist Apr 24, 2020
f938037
added filter for juxtaposed structures, fixed principal axis orientation
IvoLeist Apr 30, 2020
c3ee439
added dcc.store for already uploaded structures
IvoLeist Apr 30, 2020
0a6f7df
removed yarn
IvoLeist May 7, 2020
748867a
changed dash-bios congig.yml due to a change in the renderer
IvoLeist May 7, 2020
91965e7
Update config.yml
Marc-Andre-Rivet May 7, 2020
7d68e00
added default filename for image & custom molSpacing
IvoLeist May 8, 2020
aecb08a
added reset downloadImage flag to prevent constant retriggering of th…
IvoLeist May 15, 2020
011db6f
renamed range to aaRange to avoid confusion, changed all JS variables…
IvoLeist May 20, 2020
b6701ba
added spacing after // in NglMoleculeViewer.react.js
IvoLeist May 20, 2020
7cf94bb
Added several complementary protein datasets, renamed others
HammadTheOne Oct 4, 2020
e93eb85
Updating demo app structure and component name
HammadTheOne Oct 4, 2020
aca689a
Miscellaneous CSS fixes, and adding sideByside prop
HammadTheOne Oct 4, 2020
b54c3b4
Add sideByside and placeholder text to demo app
HammadTheOne Oct 5, 2020
269092f
Rebuilt package and updated CHANGELOG
HammadTheOne Oct 5, 2020
42c3447
Rebuilt R package
HammadTheOne Oct 5, 2020
12a0611
Merge branch 'master' into add-dash-ngl
HammadTheOne Oct 5, 2020
a9a3ae7
Fixes for flake8 test
HammadTheOne Oct 5, 2020
49be458
Small fix for lint
HammadTheOne Oct 5, 2020
ebc2a78
Flaky tests
HammadTheOne Oct 7, 2020
9047632
Removing unnecessary file
HammadTheOne Oct 9, 2020
1d8771c
Making component async
HammadTheOne Oct 13, 2020
a3b3128
Rebuilt with async component
HammadTheOne Oct 13, 2020
1398b0b
Fix whitespace test
HammadTheOne Oct 13, 2020
9f05326
Rebuilding R package with async update
HammadTheOne Oct 14, 2020
61ab664
Fixes typo in CONTRIBUTING.md
HammadTheOne Oct 14, 2020
184610d
Update NAMESPACE
HammadTheOne Oct 14, 2020
78fd7e9
Updating props and rebuilding
HammadTheOne Oct 14, 2020
c39b8a6
Renaming width and height, using isNumeric
HammadTheOne Oct 14, 2020
9803974
Update CHANGELOG.md version number.
HammadTheOne Oct 15, 2020
8bd68de
Rebuild packages with updated version
HammadTheOne Oct 15, 2020
41e3be8
Merge branch 'add-dash-ngl' of https://github.com/IvoLeist/dash-bio i…
HammadTheOne Oct 15, 2020
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
18 changes: 18 additions & 0 deletions R/dashbioDashNgl.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# AUTO GENERATED FILE - DO NOT EDIT

DashNglDashNgl <- function(id=NULL, viewportStyle=NULL, stageParameters=NULL, data=NULL) {
alexcjohnson marked this conversation as resolved.
Show resolved Hide resolved

props <- list(id=id, viewportStyle=viewportStyle, stageParameters=stageParameters, data=data)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'DashNgl',
namespace = 'dash_ngl',
propNames = c('id', 'viewportStyle', 'stageParameters', 'data'),
package = 'dashNgl'
)

structure(component, class = c('dash_component', 'list'))
}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ The Dash Bio components each fall into one of three categories:
- Dash Mol2D
- Dash Mol3D
- Dash Speck
- Dash Ngl (experimental)

## Dash

Expand Down
59 changes: 59 additions & 0 deletions dash_bio/DashNgl.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# AUTO GENERATED FILE - DO NOT EDIT

from dash.development.base_component import Component, _explicitize_args


class DashNgl(Component):
"""A DashNgl component.
Dash ngl component

Keyword arguments:
- id (string; default 'viewport'): The ID used to identify this component in Dash callbacks.
- viewportStyle (dict; default {
width: '100%',
height: '500px',
}): CSS styling for viewport container
- stageParameters (dict; default {
quality: 'medium',
backgroundColor: 'white',
}): Parameters for the stage
- data (dict; optional): Custom property. data has the following type: list of dicts containing keys 'selectedValue', 'chain', 'color', 'filename', 'ext', 'config'.
Those keys have the following types:
- selectedValue (string; required)
- chain (string; required)
- color (string; required)
- filename (string; required)
- ext (string; optional)
- config (dict; optional): config has the following type: dict containing keys 'type', 'input'.
Those keys have the following types:
- type (string; required)
- input (list | dict | string; optional) | dict containing keys 'selectedValue', 'chain', 'color', 'filename', 'ext', 'config'.
Those keys have the following types:
- selectedValue (string; required)
- chain (string; required)
- color (string; required)
- filename (string; required)
- ext (string; optional)
- config (dict; optional): config has the following type: dict containing keys 'type', 'input'.
Those keys have the following types:
- type (string; required)
- input (list | dict | string; optional)"""
@_explicitize_args
def __init__(self, id=Component.UNDEFINED, viewportStyle=Component.UNDEFINED, stageParameters=Component.UNDEFINED, data=Component.UNDEFINED, **kwargs):
self._prop_names = ['id', 'viewportStyle', 'stageParameters', 'data']
self._type = 'DashNgl'
self._namespace = 'dash_bio'
self._valid_wildcard_attributes = []
self.available_properties = ['id', 'viewportStyle', 'stageParameters', 'data']
self.available_wildcard_properties = []

_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
_locals.update(kwargs) # For wildcard attrs
args = {k: _locals[k] for k in _explicit_args if k != 'children'}

for k in []:
if k not in args:
raise TypeError(
'Required argument `' + k + '` was not specified.')
super(DashNgl, self).__init__(**args)
2 changes: 2 additions & 0 deletions dash_bio/_imports_.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from .AlignmentChart import AlignmentChart
from .Circos import Circos
from .DashNgl import DashNgl
from .FornaContainer import FornaContainer
from .Ideogram import Ideogram
from .Molecule2dViewer import Molecule2dViewer
Expand All @@ -12,6 +13,7 @@
__all__ = [
"AlignmentChart",
"Circos",
"DashNgl",
"FornaContainer",
"Ideogram",
"Molecule2dViewer",
Expand Down
6 changes: 3 additions & 3 deletions dash_bio/async-alignment.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dash_bio/async-circos.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dash_bio/async-ideogram.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/async-moleculeviewer2.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dash_bio/async-moleculeviewer3.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/async-needle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/async-onco.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dash_bio/async-sequence.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/async-speck.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

95 changes: 94 additions & 1 deletion dash_bio/bundle.js

Large diffs are not rendered by default.

Loading