Skip to content

Commit

Permalink
Embedding Projector: fix switching projections
Browse files Browse the repository at this point in the history
rename params
  • Loading branch information
alicialics committed Apr 20, 2023
1 parent 4f0cd50 commit 0b962c1
Showing 1 changed file with 14 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -402,9 +402,8 @@ class ProjectionsPanel extends LegacyElementMixin(PolymerElement) {
this.customSelectedSearchByMetadataOption =
this.searchByMetadataOptions[Math.max(0, searchByMetadataIndex)];
}
public showTab(id: ProjectionType) {
this.currentProjection = id;
const tab = this.$$('.ink-tab[data-tab="' + id + '"]') as HTMLElement;
public showTab(projection: ProjectionType) {
const tab = this.$$('.ink-tab[data-tab="' + projection + '"]') as HTMLElement;
const allTabs = this.root?.querySelectorAll('.ink-tab');
if (allTabs) {
for (let i = 0; i < allTabs.length; i++) {
Expand All @@ -419,7 +418,7 @@ class ProjectionsPanel extends LegacyElementMixin(PolymerElement) {
}
}
util.classed(
this.$$('.ink-panel-content[data-panel="' + id + '"]') as HTMLElement,
this.$$('.ink-panel-content[data-panel="' + projection + '"]') as HTMLElement,
'active',
true
);
Expand All @@ -432,25 +431,29 @@ class ProjectionsPanel extends LegacyElementMixin(PolymerElement) {
this.style.height = main.clientHeight + 'px';
});
}
this.beginProjection(id);
this.beginProjection(projection);
}
private beginProjection(projection: ProjectionType) {
if (this.polymerChangesTriggerReprojection === false) {
return;
}
if (projection === 'pca') {
if (this.currentProjection !== projection) {
this.currentProjection = projection;
if (this.dataSet != null) {
this.dataSet.stopTSNE();
if (projection === 'tsne') {
this.dataSet.tSNEShouldPause = false;
} else {
this.dataSet.tSNEShouldPause = true;
}
}
}
if (projection === 'pca') {
this.showPCA();
} else if (projection === 'tsne') {
this.showTSNE();
} else if (projection === 'umap') {
this.showUmap();
} else if (projection === 'custom') {
if (this.dataSet != null) {
this.dataSet.stopTSNE();
}
this.computeAllCentroids();
this.reprojectCustom();
}
Expand Down Expand Up @@ -493,6 +496,7 @@ class ProjectionsPanel extends LegacyElementMixin(PolymerElement) {
(iteration: number) => {
if (iteration != null) {
this.runTsneButton.disabled = false;
this.pauseTsneButton.innerText = 'Pause';
this.pauseTsneButton.disabled = false;
this.iterationLabelTsne.innerText = '' + iteration;
this.projector.notifyProjectionPositionsUpdated();
Expand Down

0 comments on commit 0b962c1

Please sign in to comment.