mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2025-06-17 22:38:08 +00:00
Code optimization
This commit is contained in:
@ -1,4 +1,14 @@
|
||||
import { Component, ViewChild, ElementRef, OnInit, Input, EventEmitter, OnDestroy, Renderer2, NgZone } from '@angular/core';
|
||||
import {
|
||||
Component,
|
||||
ViewChild,
|
||||
ElementRef,
|
||||
OnInit,
|
||||
Input,
|
||||
EventEmitter,
|
||||
OnDestroy,
|
||||
Renderer2,
|
||||
NgZone,
|
||||
} from '@angular/core';
|
||||
import { DrawingsEventSource } from '../../events/drawings-event-source';
|
||||
import { TextAddedDataEvent, TextEditedDataEvent } from '../../events/event-source';
|
||||
import { ToolsService } from '../../../services/tools.service';
|
||||
@ -24,7 +34,7 @@ import { Font } from '../../models/font';
|
||||
@Component({
|
||||
selector: 'app-text-editor',
|
||||
templateUrl: './text-editor.component.html',
|
||||
styleUrls: ['./text-editor.component.scss']
|
||||
styleUrls: ['./text-editor.component.scss'],
|
||||
})
|
||||
export class TextEditorComponent implements OnInit, OnDestroy {
|
||||
@ViewChild('temporaryTextElement') temporaryTextElement: ElementRef;
|
||||
@ -73,7 +83,11 @@ export class TextEditorComponent implements OnInit, OnDestroy {
|
||||
this.leftPosition = event.pageX.toString() + 'px';
|
||||
this.topPosition = event.pageY.toString() + 'px';
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'transform', `scale(${this.mapScaleService.getScale()})`);
|
||||
this.renderer.setStyle(
|
||||
this.temporaryTextElement.nativeElement,
|
||||
'transform',
|
||||
`scale(${this.mapScaleService.getScale()})`
|
||||
);
|
||||
this.temporaryTextElement.nativeElement.focus();
|
||||
|
||||
let textListener = () => {
|
||||
@ -113,7 +127,11 @@ export class TextEditorComponent implements OnInit, OnDestroy {
|
||||
this.selectionManager.setSelected([]);
|
||||
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'transform', `scale(${this.mapScaleService.getScale()})`);
|
||||
this.renderer.setStyle(
|
||||
this.temporaryTextElement.nativeElement,
|
||||
'transform',
|
||||
`scale(${this.mapScaleService.getScale()})`
|
||||
);
|
||||
this.editedLink = elem;
|
||||
|
||||
select(textElements[index]).attr('visibility', 'hidden');
|
||||
@ -121,34 +139,52 @@ export class TextEditorComponent implements OnInit, OnDestroy {
|
||||
|
||||
this.editedNode = this.nodesDataSource.get(elem.nodeId);
|
||||
this.editedLink = elem;
|
||||
let x = ((elem.label.originalX + this.editedNode.x - 1) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x;
|
||||
let y = ((elem.label.originalY + this.editedNode.y + 4) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y;
|
||||
let x =
|
||||
(elem.label.originalX + this.editedNode.x - 1) * this.context.transformation.k +
|
||||
this.context.getZeroZeroTransformationPoint().x +
|
||||
this.context.transformation.x;
|
||||
let y =
|
||||
(elem.label.originalY + this.editedNode.y + 4) * this.context.transformation.k +
|
||||
this.context.getZeroZeroTransformationPoint().y +
|
||||
this.context.transformation.y;
|
||||
this.leftPosition = x.toString() + 'px';
|
||||
this.topPosition = y.toString() + 'px';
|
||||
this.temporaryTextElement.nativeElement.innerText = elem.label.text;
|
||||
|
||||
let styleProperties: StyleProperty[] = [];
|
||||
for (let property of elem.label.style.split(";")){
|
||||
for (let property of elem.label.style.split(';')) {
|
||||
styleProperties.push({
|
||||
property: property.split(": ")[0],
|
||||
value: property.split(": ")[1]
|
||||
property: property.split(': ')[0],
|
||||
value: property.split(': ')[1],
|
||||
});
|
||||
}
|
||||
let font: Font = {
|
||||
font_family: styleProperties.find(p => p.property === 'font-family') ? styleProperties.find(p => p.property === 'font-family').value : 'TypeWriter',
|
||||
font_size: styleProperties.find(p => p.property === 'font-size') ? Number(styleProperties.find(p => p.property === 'font-size').value) : 10.0,
|
||||
font_weight: styleProperties.find(p => p.property === 'font-weight') ? styleProperties.find(p => p.property === 'font-weight').value : 'normal'
|
||||
font_family: styleProperties.find((p) => p.property === 'font-family')
|
||||
? styleProperties.find((p) => p.property === 'font-family').value
|
||||
: 'TypeWriter',
|
||||
font_size: styleProperties.find((p) => p.property === 'font-size')
|
||||
? Number(styleProperties.find((p) => p.property === 'font-size').value)
|
||||
: 10.0,
|
||||
font_weight: styleProperties.find((p) => p.property === 'font-weight')
|
||||
? styleProperties.find((p) => p.property === 'font-weight').value
|
||||
: 'normal',
|
||||
};
|
||||
font = this.fontFixer.fix(font);
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'color', styleProperties.find(p => p.property === 'fill') ? styleProperties.find(p => p.property === 'fill').value : '#000000');
|
||||
this.renderer.setStyle(
|
||||
this.temporaryTextElement.nativeElement,
|
||||
'color',
|
||||
styleProperties.find((p) => p.property === 'fill')
|
||||
? styleProperties.find((p) => p.property === 'fill').value
|
||||
: '#000000'
|
||||
);
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-family', font.font_family);
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-size', `${font.font_size}pt`);
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'font-weight', font.font_weight);
|
||||
|
||||
|
||||
let listener = () => {
|
||||
let innerText = this.temporaryTextElement.nativeElement.innerText;
|
||||
let link: Link = this.linksDataSource.get(this.editedLink.linkId);
|
||||
link.nodes.find(n => n.node_id === this.editedNode.node_id).label.text = innerText;
|
||||
link.nodes.find((n) => n.node_id === this.editedNode.node_id).label.text = innerText;
|
||||
|
||||
this.linkService.updateLink(this.server, link).subscribe((link: Link) => {
|
||||
rootElement
|
||||
@ -177,7 +213,11 @@ export class TextEditorComponent implements OnInit, OnDestroy {
|
||||
.selectAll<SVGTextElement, TextElement>('text.text_element')
|
||||
.on('dblclick', (elem, index, textElements) => {
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'display', 'initial');
|
||||
this.renderer.setStyle(this.temporaryTextElement.nativeElement, 'transform', `scale(${this.mapScaleService.getScale()})`);
|
||||
this.renderer.setStyle(
|
||||
this.temporaryTextElement.nativeElement,
|
||||
'transform',
|
||||
`scale(${this.mapScaleService.getScale()})`
|
||||
);
|
||||
this.editedElement = elem;
|
||||
|
||||
select(textElements[index]).attr('visibility', 'hidden');
|
||||
@ -185,8 +225,14 @@ export class TextEditorComponent implements OnInit, OnDestroy {
|
||||
|
||||
this.editingDrawingId = textElements[index].parentElement.parentElement.getAttribute('drawing_id');
|
||||
var transformData = textElements[index].parentElement.getAttribute('transform').split(/\(|\)/);
|
||||
var x = (Number(transformData[1].split(/,/)[0]) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().x + this.context.transformation.x;
|
||||
var y = (Number(transformData[1].split(/,/)[1]) * this.context.transformation.k) + this.context.getZeroZeroTransformationPoint().y + this.context.transformation.y;
|
||||
var x =
|
||||
Number(transformData[1].split(/,/)[0]) * this.context.transformation.k +
|
||||
this.context.getZeroZeroTransformationPoint().x +
|
||||
this.context.transformation.x;
|
||||
var y =
|
||||
Number(transformData[1].split(/,/)[1]) * this.context.transformation.k +
|
||||
this.context.getZeroZeroTransformationPoint().y +
|
||||
this.context.transformation.y;
|
||||
this.leftPosition = x.toString() + 'px';
|
||||
this.topPosition = y.toString() + 'px';
|
||||
this.temporaryTextElement.nativeElement.innerText = elem.text;
|
||||
|
Reference in New Issue
Block a user