ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-05-16 07:22:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code cleaned up

Browse Source
This commit is contained in:
Piotr Pekala 2019-10-25 04:22:02 -07:00
parent cb7ec182d3
commit 8e97a71696
2 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/cartography/components/d3-map/d3-map.component.ts
View File

@ -56,7 +56,6 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy {
private onChangesDetected: Subscription;
private subscriptions: Subscription[] = [];
private drawLinkTool: boolean;
protected settings = {
@ -191,6 +190,8 @@ export class D3MapComponent implements OnInit, OnChanges, OnDestroy {
this.graphLayout.draw(this.svg, this.context);
this.textEditor.activateTextEditingForDrawings();
this.textEditor.activateTextEditingForNodeLabels();
console.log("DONE!!!")
}
@HostListener('window:resize', ['$event'])

34
src/app/components/project-map/project-map.component.ts
View File

@ -507,12 +507,6 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
minY = minY - margin;
maxY = maxY + margin;
console.log(maxX);
console.log(minX);
console.log(maxY);
console.log(minY);
console.log('-----------------------------');
let windowWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
let windowHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
let widthOfAreaToShow = maxX - minX;
@ -520,33 +514,25 @@ export class ProjectMapComponent implements OnInit, OnDestroy {
let widthToSceneWidthRatio = widthOfAreaToShow / windowWidth;
let heightToSceneHeightRatio = heightOfAreaToShow / windowHeight;
console.log(widthOfAreaToShow);
console.log(heightOfAreaToShow);
console.log(widthToSceneWidthRatio);
console.log(heightToSceneHeightRatio);
console.log('-----------------------------');
let scale = 1 / Math.max(widthToSceneWidthRatio, heightToSceneHeightRatio);
if (scale !== this.mapScaleService.currentScale) {
this.mapScaleService.setScale(scale);
this.project.scene_width = this.project.scene_width * scale;
this.project.scene_height = this.project.scene_height * scale;
let scrollX: number = (minX * scale) + this.project.scene_width/2;
let scrollY: number = (minY * scale) + this.project.scene_height/2;
// console.log(scrollX);
// console.log(scrollY);
// let scrollY = (this.project.scene_height - windowHeight)/2;
// let scrollX = (this.project.scene_width - windowWidth)/2;
window.scrollTo(scrollX, scrollY);
let scrollX: number = 0;
let scrollY: number = 0;
if (heightToSceneHeightRatio < widthOfAreaToShow) {
scrollX = (minX * scale) - ((windowWidth - widthOfAreaToShow*scale)/2) + this.project.scene_width/2;
scrollY = (minY * scale) + this.project.scene_height/2;
} else {
scrollX = (minX * scale) + this.project.scene_width/2;
scrollY = (minY * scale) - ((windowHeight - heightOfAreaToShow*scale)/2) + this.project.scene_height/2;
}
setTimeout(function(){window.scrollTo(scrollX, scrollY)}, 100);
} else {
let scrollX: number = (minX * scale) + this.project.scene_width/2;
let scrollY: number = (minY * scale) + this.project.scene_height/2;
// console.log(scrollX);
// console.log(scrollY);
// let scrollY = (this.project.scene_height - windowHeight)/2;
// let scrollX = (this.project.scene_width - windowWidth)/2;
window.scrollTo(scrollX, scrollY);
}
}