Skip to content

BUG: Strain Lineage zoom, pan, selected node with saving session, empty source #682 #823

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

Open
AlfiyaRF wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

BUG: Strain Lineage zoom, pan, selected node with saving session, empty source #682 #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions client/client/app/components/ngbStrainLineage/ngbCytoscape/ngbCytoscape.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ export default class ngbCytoscapeController {
Cytoscape.use(dagre);
Cytoscape.use(dom_node);

const resizeHandler = () => {
if (this.resizeCytoscape()) {
this.centerCytoscape();
}
};
angular.element($window).on('resize', resizeHandler);
const cytoscapeActiveEventHandler = this.reloadCytoscape.bind(this);
this.dispatcher.on('cytoscape:panel:active', cytoscapeActiveEventHandler);
const handleSelectionChange = (e) => {
Expand All @@ -65,7 +59,6 @@ export default class ngbCytoscapeController {
$scope.$on('$destroy', () => {
this.dispatcher.removeListener('cytoscape:panel:active', cytoscapeActiveEventHandler);
this.dispatcher.removeListener('cytoscape:selection:change', handleSelectionChange);
angular.element($window).off('resize', resizeHandler);
});
}

Expand Down Expand Up @@ -186,6 +179,12 @@ export default class ngbCytoscapeController {
}
});
layout.run();
if (this.zoomLevel) {
this.viewer.zoom(this.zoomLevel);
}
if (this.panPosition) {
this.viewer.pan(this.panPosition);
}
const viewerContext = this;
this.actionsManager = {
ZOOM_STEP: 0.25,
Expand All @@ -194,14 +193,12 @@ export default class ngbCytoscapeController {
zoomIn() {
const zoom = this.zoom() + this.ZOOM_STEP;
viewerContext.viewer.zoom(zoom);
viewerContext.centerCytoscape();
this.canZoomIn = zoom < viewerContext.viewer.maxZoom();
this.canZoomOut = zoom > viewerContext.viewer.minZoom();
},
zoomOut() {
const zoom = this.zoom() - this.ZOOM_STEP;
viewerContext.viewer.zoom(zoom);
viewerContext.centerCytoscape();
this.canZoomIn = zoom < viewerContext.viewer.maxZoom();
this.canZoomOut = zoom > viewerContext.viewer.minZoom();
},
Expand All @@ -214,6 +211,11 @@ export default class ngbCytoscapeController {
ready: true
};
});
} else {
if (this.viewer) {
this.zoomLevel = this.viewer._private.zoom;
this.panPosition = this.viewer.pan();
}
}
}

Expand Down
7 changes: 7 additions & 0 deletions client/client/app/components/ngbStrainLineage/ngbStrainLineage.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ export default class ngbStrainLineageController extends baseController {

this.initialize();
this.initEvents();
$scope.$on('$destroy', () => {
this.ngbStrainLineageService.selectedElementId = null;
});
}

static get UID() {
Expand All @@ -72,6 +75,10 @@ export default class ngbStrainLineageController extends baseController {
this.error = error;
}
this.lineageTreeList = this.constructTreeList(referenceData, allData);
if (this.error && !this.selectedTreeId) {
this.selectedTreeId = this.lineageTreeList[0].id;
await this.onTreeSelect();
}
this.loading = false;
} else {
const {allData, referenceData} = await this.ngbStrainLineageService.loadStrainLineages(null);
Expand Down