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.

Sign up for GitHub

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

Fix axes display when shapes are present #323

Merged
merged 4 commits into from
Dec 18, 2023
Merged

Fix axes display when shapes are present #323

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd5a952
Fix axes display when shapes are present
ceriottm Dec 16, 2023
0a820ed
lint
ceriottm Dec 16, 2023
e73305f
Fixed horizontal scrollbar appearing in chrome
ceriottm Dec 17, 2023
6a2e971
restored app.css
ceriottm Dec 17, 2023
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
78 changes: 42 additions & 36 deletions src/structure/viewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,42 +704,7 @@ export class MoleculeViewer {
}
});

this._options.axes.onchange.push((value) => {
if (this._axes !== undefined) {
this._viewer.removeShape(this._axes[0].arrow);
this._viewer.removeLabel(this._axes[0].label);
this._viewer.removeShape(this._axes[1].arrow);
this._viewer.removeLabel(this._axes[1].label);
this._viewer.removeShape(this._axes[2].arrow);
this._viewer.removeLabel(this._axes[2].label);
this._axes = undefined;
}

if (value === 'off') {
// nothing to do
} else if (value === 'xyz') {
this._axes = [
this._addLabeledArrow([2, 0, 0], 'red', 'X'),
this._addLabeledArrow([0, 2, 0], 'green', 'Y'),
this._addLabeledArrow([0, 0, 2], 'blue', 'Z'),
];
} else if (value === 'abc') {
if (this._current === undefined || this._current.structure.cell === undefined) {
return;
}
const cell = this._current.structure.cell;
const a: [number, number, number] = [cell[0], cell[1], cell[2]];
const b: [number, number, number] = [cell[3], cell[4], cell[5]];
const c: [number, number, number] = [cell[6], cell[7], cell[8]];
this._axes = [
this._addLabeledArrow(a, 'red', 'A'),
this._addLabeledArrow(b, 'green', 'B'),
this._addLabeledArrow(c, 'blue', 'C'),
];
}

this._viewer.render();
});
this._options.axes.onchange.push((value) => this._addAxes(value));

this._options.rotation.onchange.push((rotate) => {
if (rotate) {
Expand Down Expand Up @@ -1093,6 +1058,43 @@ export class MoleculeViewer {
this._highlighted.model.setStyle({}, this._mainStyle());
}

private _addAxes(value: string): void {
if (this._axes !== undefined) {
this._viewer.removeShape(this._axes[0].arrow);
this._viewer.removeLabel(this._axes[0].label);
this._viewer.removeShape(this._axes[1].arrow);
this._viewer.removeLabel(this._axes[1].label);
this._viewer.removeShape(this._axes[2].arrow);
this._viewer.removeLabel(this._axes[2].label);
this._axes = undefined;
}

if (value === 'off') {
// nothing to do
} else if (value === 'xyz') {
this._axes = [
this._addLabeledArrow([2, 0, 0], 'red', 'X'),
this._addLabeledArrow([0, 2, 0], 'green', 'Y'),
this._addLabeledArrow([0, 0, 2], 'blue', 'Z'),
];
} else if (value === 'abc') {
if (this._current === undefined || this._current.structure.cell === undefined) {
return;
}
const cell = this._current.structure.cell;
const a: [number, number, number] = [cell[0], cell[1], cell[2]];
const b: [number, number, number] = [cell[3], cell[4], cell[5]];
const c: [number, number, number] = [cell[6], cell[7], cell[8]];
this._axes = [
this._addLabeledArrow(a, 'red', 'A'),
this._addLabeledArrow(b, 'green', 'B'),
this._addLabeledArrow(c, 'blue', 'C'),
];
}

this._viewer.render();
}

private _addShapes(): void {
if (this._current === undefined) {
return;
Expand All @@ -1102,6 +1104,7 @@ export class MoleculeViewer {
}

this._viewer.removeAllShapes();

// removeAllShapes also removes the unit cell, so let's add it back
if (this._options.unitCell.value) {
this._viewer.addUnitCell(this._current.model, {
Expand All @@ -1112,6 +1115,9 @@ export class MoleculeViewer {
});
}

// removeAllShapes also removes the axes, so let's add them back
this._addAxes(this._options.axes.value);

assert(this._current.atomLabels.length === 0);

const structure = this._current.structure;
Expand Down