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

Snap to grid for drawings

Browse Source
This commit is contained in:
Piotr Pekala
2019-10-24 08:05:50 -07:00
parent 6b804fa525
commit b372493e51
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/services/drawing.service.ts
View File

@ -6,10 +6,14 @@ import 'rxjs/add/operator/map';
import { Server } from '../models/server'; import { Server } from '../models/server';
import { HttpServer } from './http-server.service'; import { HttpServer } from './http-server.service';
import { Project } from '../models/project'; import { Project } from '../models/project';
import { SvgToDrawingConverter } from '../cartography/helpers/svg-to-drawing-converter';
@Injectable() @Injectable()
export class DrawingService { export class DrawingService {
constructor(private httpServer: HttpServer) {} constructor(
private httpServer: HttpServer,
private svgToDrawingConverter: SvgToDrawingConverter
) {}
add(server: Server, project_id: string, x: number, y: number, svg: string) { add(server: Server, project_id: string, x: number, y: number, svg: string) {
return this.httpServer.post<Drawing>(server, `/projects/${project_id}/drawings`, { return this.httpServer.post<Drawing>(server, `/projects/${project_id}/drawings`, {
@ -35,7 +39,13 @@ export class DrawingService {
let yPosition: number = Math.round(y); let yPosition: number = Math.round(y);
if (project.snap_to_grid) { if (project.snap_to_grid) {
drawing.element = this.svgToDrawingConverter.convert(drawing.svg);
xPosition = Math.round((xPosition + drawing.element.width/2) / project.drawing_grid_size) * project.drawing_grid_size;
yPosition = Math.round((yPosition + drawing.element.width/2) / project.drawing_grid_size) * project.drawing_grid_size;
xPosition = Math.round(xPosition - drawing.element.width/2);
yPosition = Math.round(yPosition - drawing.element.height/2);
} }
return this.httpServer.put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, { return this.httpServer.put<Drawing>(server, `/projects/${drawing.project_id}/drawings/${drawing.drawing_id}`, {

4
src/app/services/node.service.ts
View File

@ -58,8 +58,8 @@ export class NodeService {
let yPosition: number = Math.round(y); let yPosition: number = Math.round(y);
if (project.snap_to_grid) { if (project.snap_to_grid) {
xPosition = Math.round(xPosition / project.grid_size) * project.grid_size; xPosition = Math.round((xPosition + node.width/2) / project.grid_size) * project.grid_size;
yPosition = Math.round(yPosition / project.grid_size) * project.grid_size; yPosition = Math.round((yPosition + node.width/2) / project.grid_size) * project.grid_size;
xPosition = Math.round(xPosition - node.width/2); xPosition = Math.round(xPosition - node.width/2);
yPosition = Math.round(yPosition - node.height/2); yPosition = Math.round(yPosition - node.height/2);