ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-01-31 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Activation/deactivation of selection/zoom works

Browse Source
This commit is contained in:
ziajka 2018-03-14 10:38:28 +01:00
parent 5d1783af5c
commit 5987ea8fc7
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/cartography/shared/tools/moving-tool.ts
View File

@ -1,18 +1,22 @@
import {SVGSelection} from "../../../map/models/types"; import {SVGSelection} from "../../../map/models/types";
import {Context} from "../../../map/models/context"; import {Context} from "../../../map/models/context";
import {D3ZoomEvent, zoom} from "d3-zoom"; import {D3ZoomEvent, zoom, ZoomBehavior} from "d3-zoom";
import { event } from "d3-selection"; import { event } from "d3-selection";
export class MovingTool { export class MovingTool {
private selection: SVGSelection; private selection: SVGSelection;
private context: Context; private context: Context;
private zoom: ZoomBehavior<SVGSVGElement, any>;
constructor() {
this.zoom = zoom<SVGSVGElement, any>()
.scaleExtent([1 / 2, 8]);
}
public connect(selection: SVGSelection, context: Context) { public connect(selection: SVGSelection, context: Context) {
this.selection = selection; this.selection = selection;
this.context = context; this.context = context;
this.selection.call(zoom<SVGSVGElement, any>()
.scaleExtent([1 / 2, 8]);
} }
public draw(selection: SVGSelection, context: Context) { public draw(selection: SVGSelection, context: Context) {
@ -32,10 +36,14 @@ export class MovingTool {
`${self.context.getSize().height / 2 + e.transform.y}) scale(${e.transform.k})`); `${self.context.getSize().height / 2 + e.transform.y}) scale(${e.transform.k})`);
}; };
this.selection.on('zoom', onZoom);
this.zoom.on('zoom', onZoom);
this.selection.call(this.zoom);
} }
public deactivate() { public deactivate() {
this.selection.on('zoom', null); // d3.js preserves event `mousedown.zoom` and blocks selection
this.selection.on('mousedown.zoom', null);
this.zoom.on('zoom', null);
} }
} }

2
src/app/cartography/shared/tools/selection-tool.ts
View File

@ -20,6 +20,7 @@ export class SelectionTool {
return [p[0] - transformation_point.x, p[1] - transformation_point.y]; return [p[0] - transformation_point.x, p[1] - transformation_point.y];
}; };
this.selection.on("mousedown", function() { this.selection.on("mousedown", function() {
const subject = select(window); const subject = select(window);
const parent = this.parentElement; const parent = this.parentElement;
@ -53,6 +54,7 @@ export class SelectionTool {
.attr("class", "selection") .attr("class", "selection")
.attr("visibility", "hidden"); .attr("visibility", "hidden");
} }
this.selection = selection;
} }
private startSelection(start) { private startSelection(start) {

2
src/app/project-map/project-map.component.ts
View File

@ -270,8 +270,8 @@ export class ProjectMapComponent implements OnInit {
this.mapChild.graphLayout.getSelectionTool().deactivate(); this.mapChild.graphLayout.getSelectionTool().deactivate();
this.mapChild.graphLayout.getMovingTool().activate(); this.mapChild.graphLayout.getMovingTool().activate();
} else { } else {
this.mapChild.graphLayout.getSelectionTool().activate();
this.mapChild.graphLayout.getMovingTool().deactivate(); this.mapChild.graphLayout.getMovingTool().deactivate();
this.mapChild.graphLayout.getSelectionTool().activate();
} }
} }