Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Fixed
* Fixed issue with Clustergram not reordering rows and columns after clustering.
* Fixed issue with Speck not properly handling incomplete "view" parameters.
* Fixed issue with Speck not having setProps defined.

### Removed
* Removed mentions of Dash events in OncoPrint component.
Expand Down
2 changes: 1 addition & 1 deletion dash_bio/Ideogram.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Ideogram(Component):
datasets for organisms such as human, mouse, and any other
eukaryote. The Ideogram component can be used to compare
homologous features between chromosomes, and depict
haploid, diploid, aneuploidy genomes. It can also display
haploid, diploid, aneuploid genomes. It can also display
annotations on genomic data using histograms and overlays.

Reference: https://eweitz.github.io/ideogram/
Expand Down
2 changes: 1 addition & 1 deletion dash_bio/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@
}
},
"src/lib/components/Ideogram.react.js": {
"description": "The Ideogram component is used to draw and animate genome-wide\ndatasets for organisms such as human, mouse, and any other\neukaryote. The Ideogram component can be used to compare\nhomologous features between chromosomes, and depict\nhaploid, diploid, aneuploidy genomes. It can also display\nannotations on genomic data using histograms and overlays.\n\nReference: https://eweitz.github.io/ideogram/\nComponent's props: https://github.com/eweitz/ideogram/blob/master/api.md",
"description": "The Ideogram component is used to draw and animate genome-wide\ndatasets for organisms such as human, mouse, and any other\neukaryote. The Ideogram component can be used to compare\nhomologous features between chromosomes, and depict\nhaploid, diploid, aneuploid genomes. It can also display\nannotations on genomic data using histograms and overlays.\n\nReference: https://eweitz.github.io/ideogram/\nComponent's props: https://github.com/eweitz/ideogram/blob/master/api.md",
"displayName": "Ideogram",
"methods": [
{
Expand Down
4 changes: 2 additions & 2 deletions dash_bio/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dash-bio",
"version": "0.0.8-rc13",
"version": "0.0.8-rc14",
"description": "Dash components for bioinformatics",
"main": "build/index.js",
"scripts": {
Expand Down Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.0",
"babel-loader": "^8.0.0",
"babel-loader": "^7.0.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"copyfiles": "^2.0.0",
Expand Down
119 changes: 11 additions & 108 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dash-bio",
"version": "0.0.8-rc13",
"version": "0.0.8-rc14",
"description": "Dash components for bioinformatics",
"main": "build/index.js",
"scripts": {
Expand Down Expand Up @@ -33,7 +33,7 @@
"devDependencies": {
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.0",
"babel-loader": "^8.0.0",
"babel-loader": "^7.0.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"copyfiles": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ biopython
colour==0.1.5
cython>=0.19
dash==0.37.0
dash-bio==0.0.8rc13
dash-bio==0.0.8rc14
dash-core-components==0.43.1
dash-daq==0.1.4
dash-html-components==0.13.5
Expand Down
36 changes: 25 additions & 11 deletions src/lib/components/Speck.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default class Speck extends Component {
speckSystem.calculateBonds(system);

const renderer = this.state.renderer;
const view = this.props.view;
const view = Object.assign(speckView.new(), this.props.view);

renderer.setSystem(system, view);

Expand All @@ -42,6 +42,9 @@ export default class Speck extends Component {
refreshView: false,
});
}

// fill in any missing view properties
this.props.view = Object.assign(speckView.new(), this.props.view);
this.state.renderer.render(this.props.view);
}
requestAnimationFrame(this.loop);
Expand Down Expand Up @@ -90,10 +93,13 @@ export default class Speck extends Component {
data[propertyName] !== nextProps.data[propertyName]
)
) {
this.props.setProps({
data: nextProps.data,
});

if (this.props.setProps) {
this.props.setProps({
data: nextProps.data,
});
} else {
this.props.data = nextProps.data;
}
needsUpdate = true;
}

Expand All @@ -103,9 +109,13 @@ export default class Speck extends Component {
view,
speckPresetViews[nextProps.presetView]
);
this.props.setProps({
view: v,
});
if (this.props.setProps) {
this.props.setProps({
view: v,
});
} else {
this.props.view = v;
}

needsUpdate = true;
}
Expand All @@ -119,9 +129,13 @@ export default class Speck extends Component {
)
) {
const v = Object.assign(view, nextProps.view);
this.props.setProps({
view: v,
});
if (this.props.setProps) {
this.props.setProps({
view: v,
});
} else {
this.props.view = v;
}

needsUpdate = true;
}
Expand Down