Skip to content

Commit

Permalink
Alignment chart updates (#583)
Browse files Browse the repository at this point in the history
* Make relative styles.

* Tests for new properties.

* Add sequenceIds property; Add test for size add sequenceIds properties

* Fix "Select Box" functionallity

* Changing react-alignment-viewer commit

* Re-running tests

Co-authored-by: Hammad Khan <[email protected]>
  • Loading branch information
nickmelnikov82 and HammadTheOne authored Oct 27, 2021
1 parent dc25279 commit 9f98b22
Show file tree
Hide file tree
Showing 50 changed files with 418 additions and 314 deletions.
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export(dashbioOncoPrint)
export(dashbioPileup)
export(dashbioSequenceViewer)
export(dashbioSpeck)
export(dashbioVolcano)
export(dashbioManhattan)
export(dashbioVolcano)
import(manhattanly)

import(dash)
6 changes: 3 additions & 3 deletions R/dashbioAlignmentChart.R
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# AUTO GENERATED FILE - DO NOT EDIT

dashbioAlignmentChart <- function(id=NULL, colorscale=NULL, conservationcolor=NULL, conservationcolorscale=NULL, conservationmethod=NULL, conservationopacity=NULL, correctgap=NULL, data=NULL, eventDatum=NULL, extension=NULL, gapcolor=NULL, gapcolorscale=NULL, gapopacity=NULL, groupbars=NULL, height=NULL, numtiles=NULL, opacity=NULL, overview=NULL, scrollskip=NULL, showconsensus=NULL, showconservation=NULL, showgap=NULL, showid=NULL, showlabel=NULL, textcolor=NULL, textsize=NULL, tickstart=NULL, ticksteps=NULL, tileheight=NULL, tilewidth=NULL, width=NULL) {
dashbioAlignmentChart <- function(id=NULL, colorscale=NULL, conservationcolor=NULL, conservationcolorscale=NULL, conservationmethod=NULL, conservationopacity=NULL, correctgap=NULL, data=NULL, eventDatum=NULL, extension=NULL, gapcolor=NULL, gapcolorscale=NULL, gapopacity=NULL, groupbars=NULL, height=NULL, numtiles=NULL, opacity=NULL, overview=NULL, scrollskip=NULL, sequenceIds=NULL, showconsensus=NULL, showconservation=NULL, showgap=NULL, showid=NULL, showlabel=NULL, textcolor=NULL, textsize=NULL, tickstart=NULL, ticksteps=NULL, tileheight=NULL, tilewidth=NULL, width=NULL) {

props <- list(id=id, colorscale=colorscale, conservationcolor=conservationcolor, conservationcolorscale=conservationcolorscale, conservationmethod=conservationmethod, conservationopacity=conservationopacity, correctgap=correctgap, data=data, eventDatum=eventDatum, extension=extension, gapcolor=gapcolor, gapcolorscale=gapcolorscale, gapopacity=gapopacity, groupbars=groupbars, height=height, numtiles=numtiles, opacity=opacity, overview=overview, scrollskip=scrollskip, showconsensus=showconsensus, showconservation=showconservation, showgap=showgap, showid=showid, showlabel=showlabel, textcolor=textcolor, textsize=textsize, tickstart=tickstart, ticksteps=ticksteps, tileheight=tileheight, tilewidth=tilewidth, width=width)
props <- list(id=id, colorscale=colorscale, conservationcolor=conservationcolor, conservationcolorscale=conservationcolorscale, conservationmethod=conservationmethod, conservationopacity=conservationopacity, correctgap=correctgap, data=data, eventDatum=eventDatum, extension=extension, gapcolor=gapcolor, gapcolorscale=gapcolorscale, gapopacity=gapopacity, groupbars=groupbars, height=height, numtiles=numtiles, opacity=opacity, overview=overview, scrollskip=scrollskip, sequenceIds=sequenceIds, showconsensus=showconsensus, showconservation=showconservation, showgap=showgap, showid=showid, showlabel=showlabel, textcolor=textcolor, textsize=textsize, tickstart=tickstart, ticksteps=ticksteps, tileheight=tileheight, tilewidth=tilewidth, width=width)
if (length(props) > 0) {
props <- props[!vapply(props, is.null, logical(1))]
}
component <- list(
props = props,
type = 'AlignmentChart',
namespace = 'dash_bio',
propNames = c('id', 'colorscale', 'conservationcolor', 'conservationcolorscale', 'conservationmethod', 'conservationopacity', 'correctgap', 'data', 'eventDatum', 'extension', 'gapcolor', 'gapcolorscale', 'gapopacity', 'groupbars', 'height', 'numtiles', 'opacity', 'overview', 'scrollskip', 'showconsensus', 'showconservation', 'showgap', 'showid', 'showlabel', 'textcolor', 'textsize', 'tickstart', 'ticksteps', 'tileheight', 'tilewidth', 'width'),
propNames = c('id', 'colorscale', 'conservationcolor', 'conservationcolorscale', 'conservationmethod', 'conservationopacity', 'correctgap', 'data', 'eventDatum', 'extension', 'gapcolor', 'gapcolorscale', 'gapopacity', 'groupbars', 'height', 'numtiles', 'opacity', 'overview', 'scrollskip', 'sequenceIds', 'showconsensus', 'showconservation', 'showgap', 'showid', 'showlabel', 'textcolor', 'textsize', 'tickstart', 'ticksteps', 'tileheight', 'tilewidth', 'width'),
package = 'dashBio'
)

Expand Down
17 changes: 10 additions & 7 deletions dash_bio/AlignmentChart.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ class AlignmentChart(Component):
bars or to stack them as separate subplots. No effect if not both
gap and conservation are shown.
- height (number | string; default 900):
- height (number | string; default '100%'):
Width of the Viewer. Property takes precedence over tilesheight if
both are set.
Expand All @@ -104,6 +104,9 @@ class AlignmentChart(Component):
with each slider movement. Has no effect if scroll is not enabled
(such as with overview or none).
- sequenceIds (list; optional):
Sequences ids to display.
- showconsensus (boolean; default True):
Displays toggling the consensus sequence, where each nucleotide in
the consensus sequence is the argmax of its distribution at a set
Expand All @@ -130,13 +133,13 @@ class AlignmentChart(Component):
- textsize (number | string; default 10):
Size of the nucleotide labels, as a number.
- tickstart (number | string; optional):
- tickstart (number | string; default 1):
Determines where to start annotating the first tile. If let blank
will be automatically determined by Plotly. Equivalent to Plotly's
tick0 property. Does not function if overview mode 'slider' is
applied. (Current bug).
- ticksteps (number | string; optional):
- ticksteps (number | string; default 6):
Determines at what interval to keep annotating the tiles. If left
blank will be automatially determined by Plotly. Equivalent to
Plotly's dtick property. Does not function if overview mode
Expand All @@ -153,16 +156,16 @@ class AlignmentChart(Component):
Viewer width divided by the tile width. the Viewwer width divided
by the tile witdth.
- width (number | string; optional):
- width (number | string; default '100%'):
Width of the Viewer. Property takes precedence over tileswidth and
numtiles if either of them is set."""
@_explicitize_args
def __init__(self, id=Component.UNDEFINED, eventDatum=Component.UNDEFINED, data=Component.UNDEFINED, extension=Component.UNDEFINED, colorscale=Component.UNDEFINED, opacity=Component.UNDEFINED, textcolor=Component.UNDEFINED, textsize=Component.UNDEFINED, showlabel=Component.UNDEFINED, showid=Component.UNDEFINED, showconservation=Component.UNDEFINED, conservationcolor=Component.UNDEFINED, conservationcolorscale=Component.UNDEFINED, conservationopacity=Component.UNDEFINED, conservationmethod=Component.UNDEFINED, correctgap=Component.UNDEFINED, showgap=Component.UNDEFINED, gapcolor=Component.UNDEFINED, gapcolorscale=Component.UNDEFINED, gapopacity=Component.UNDEFINED, groupbars=Component.UNDEFINED, showconsensus=Component.UNDEFINED, tilewidth=Component.UNDEFINED, tileheight=Component.UNDEFINED, overview=Component.UNDEFINED, numtiles=Component.UNDEFINED, scrollskip=Component.UNDEFINED, tickstart=Component.UNDEFINED, ticksteps=Component.UNDEFINED, width=Component.UNDEFINED, height=Component.UNDEFINED, **kwargs):
self._prop_names = ['id', 'colorscale', 'conservationcolor', 'conservationcolorscale', 'conservationmethod', 'conservationopacity', 'correctgap', 'data', 'eventDatum', 'extension', 'gapcolor', 'gapcolorscale', 'gapopacity', 'groupbars', 'height', 'numtiles', 'opacity', 'overview', 'scrollskip', 'showconsensus', 'showconservation', 'showgap', 'showid', 'showlabel', 'textcolor', 'textsize', 'tickstart', 'ticksteps', 'tileheight', 'tilewidth', 'width']
def __init__(self, id=Component.UNDEFINED, eventDatum=Component.UNDEFINED, data=Component.UNDEFINED, extension=Component.UNDEFINED, colorscale=Component.UNDEFINED, opacity=Component.UNDEFINED, textcolor=Component.UNDEFINED, textsize=Component.UNDEFINED, showlabel=Component.UNDEFINED, showid=Component.UNDEFINED, showconservation=Component.UNDEFINED, conservationcolor=Component.UNDEFINED, conservationcolorscale=Component.UNDEFINED, conservationopacity=Component.UNDEFINED, conservationmethod=Component.UNDEFINED, correctgap=Component.UNDEFINED, showgap=Component.UNDEFINED, gapcolor=Component.UNDEFINED, gapcolorscale=Component.UNDEFINED, gapopacity=Component.UNDEFINED, groupbars=Component.UNDEFINED, showconsensus=Component.UNDEFINED, tilewidth=Component.UNDEFINED, tileheight=Component.UNDEFINED, overview=Component.UNDEFINED, numtiles=Component.UNDEFINED, scrollskip=Component.UNDEFINED, tickstart=Component.UNDEFINED, ticksteps=Component.UNDEFINED, width=Component.UNDEFINED, height=Component.UNDEFINED, sequenceIds=Component.UNDEFINED, **kwargs):
self._prop_names = ['id', 'colorscale', 'conservationcolor', 'conservationcolorscale', 'conservationmethod', 'conservationopacity', 'correctgap', 'data', 'eventDatum', 'extension', 'gapcolor', 'gapcolorscale', 'gapopacity', 'groupbars', 'height', 'numtiles', 'opacity', 'overview', 'scrollskip', 'sequenceIds', 'showconsensus', 'showconservation', 'showgap', 'showid', 'showlabel', 'textcolor', 'textsize', 'tickstart', 'ticksteps', 'tileheight', 'tilewidth', 'width']
self._type = 'AlignmentChart'
self._namespace = 'dash_bio'
self._valid_wildcard_attributes = []
self.available_properties = ['id', 'colorscale', 'conservationcolor', 'conservationcolorscale', 'conservationmethod', 'conservationopacity', 'correctgap', 'data', 'eventDatum', 'extension', 'gapcolor', 'gapcolorscale', 'gapopacity', 'groupbars', 'height', 'numtiles', 'opacity', 'overview', 'scrollskip', 'showconsensus', 'showconservation', 'showgap', 'showid', 'showlabel', 'textcolor', 'textsize', 'tickstart', 'ticksteps', 'tileheight', 'tilewidth', 'width']
self.available_properties = ['id', 'colorscale', 'conservationcolor', 'conservationcolorscale', 'conservationmethod', 'conservationopacity', 'correctgap', 'data', 'eventDatum', 'extension', 'gapcolor', 'gapcolorscale', 'gapopacity', 'groupbars', 'height', 'numtiles', 'opacity', 'overview', 'scrollskip', 'sequenceIds', 'showconsensus', 'showconservation', 'showgap', 'showid', 'showlabel', 'textcolor', 'textsize', 'tickstart', 'ticksteps', 'tileheight', 'tilewidth', 'width']
self.available_wildcard_properties = []
_explicit_args = kwargs.pop('_explicit_args')
_locals = locals()
Expand Down
31 changes: 14 additions & 17 deletions dash_bio/async-alignment.js

Large diffs are not rendered by default.

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

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-ideogram.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dash_bio/async-igv.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.

16 changes: 8 additions & 8 deletions dash_bio/async-moleculeviewer3.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

Loading

0 comments on commit 9f98b22

Please sign in to comment.