From 0b962c1d46fdf70eec260ca3ff04295b1dee40fd Mon Sep 17 00:00:00 2001 From: Zoey Li <31378877+alicialics@users.noreply.github.com> Date: Tue, 4 Apr 2023 18:16:04 +0000 Subject: [PATCH] Embedding Projector: fix switching projections rename params --- .../vz-projector-projections-panel.ts | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts b/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts index 3a3df69ec26..baf513d12c3 100644 --- a/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts +++ b/tensorboard/plugins/projector/vz_projector/vz-projector-projections-panel.ts @@ -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++) { @@ -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 ); @@ -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(); } @@ -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();