ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-02-28 04:02:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert the qt value into the stroke dasharray

Browse Source
This commit is contained in:
Rajnikant Lodhi 2022-08-24 16:03:50 +05:30
parent 22ef305e81
commit 5bee5deb22
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/cartography/helpers/qt-dasharray-fixer.ts
View File

@ -14,9 +14,11 @@ export class QtDasharrayFixer {
}; };
public fix(dasharray: string): string { public fix(dasharray: string): string {
if(dasharray || dasharray == '' ){
if (dasharray in QtDasharrayFixer.MAPPING) { if (dasharray in QtDasharrayFixer.MAPPING) {
return QtDasharrayFixer.MAPPING[dasharray]; return QtDasharrayFixer.MAPPING[dasharray];
} }
return dasharray; return dasharray;
} }
} }
}

35
src/app/components/project-map/drawings-editors/style-editor/style-editor.component.ts
View File

@ -4,6 +4,7 @@ import { MatDialogRef } from '@angular/material/dialog';
import { DrawingToMapDrawingConverter } from '../../../../cartography/converters/map/drawing-to-map-drawing-converter'; import { DrawingToMapDrawingConverter } from '../../../../cartography/converters/map/drawing-to-map-drawing-converter';
import { MapDrawingToSvgConverter } from '../../../../cartography/converters/map/map-drawing-to-svg-converter'; import { MapDrawingToSvgConverter } from '../../../../cartography/converters/map/map-drawing-to-svg-converter';
import { DrawingsDataSource } from '../../../../cartography/datasources/drawings-datasource'; import { DrawingsDataSource } from '../../../../cartography/datasources/drawings-datasource';
import { QtDasharrayFixer } from '../../../../cartography/helpers/qt-dasharray-fixer';
import { Drawing } from '../../../../cartography/models/drawing'; import { Drawing } from '../../../../cartography/models/drawing';
import { EllipseElement } from '../../../../cartography/models/drawings/ellipse-element'; import { EllipseElement } from '../../../../cartography/models/drawings/ellipse-element';
import { LineElement } from '../../../../cartography/models/drawings/line-element'; import { LineElement } from '../../../../cartography/models/drawings/line-element';
@ -27,12 +28,12 @@ export class StyleEditorDialogComponent implements OnInit {
element: ElementData; element: ElementData;
formGroup: FormGroup; formGroup: FormGroup;
borderTypes = [ borderTypes = [
{ value: 'none', name: 'Solid' }, {qt:'none', value: 'none', name: 'Solid' },
{ value: '15 3', name: 'Dash' }, {qt:'10, 2', value: '25, 25', name: 'Dash' },
{ value: '5', name: 'Dot' }, {qt:'4, 2', value: '5, 25', name: 'Dot' },
{ value: '15 2 7 2', name: 'Dash Dot' }, {qt:'5, 5, 1, 5', value: '5, 25, 25', name: 'Dash Dot' },
{ value: '15 2 7 2 7 2', name: 'Dash Dot Dot' }, {qt:'5, 2, 5, 2, 5', value: '25, 25, 5, 25, 5', name: 'Dash Dot Dot' },
{ value: '', name: 'No border' }, {qt:'', value: '', name: 'No border' },
]; ];
constructor( constructor(
@ -44,7 +45,8 @@ export class StyleEditorDialogComponent implements OnInit {
private formBuilder: FormBuilder, private formBuilder: FormBuilder,
private toasterService: ToasterService, private toasterService: ToasterService,
private nonNegativeValidator: NonNegativeValidator, private nonNegativeValidator: NonNegativeValidator,
private rotationValidator: RotationValidator private rotationValidator: RotationValidator,
private qtDasharrayFixer: QtDasharrayFixer
) { ) {
this.formGroup = this.formBuilder.group({ this.formGroup = this.formBuilder.group({
borderWidth: new FormControl('', [Validators.required, nonNegativeValidator.get]), borderWidth: new FormControl('', [Validators.required, nonNegativeValidator.get]),
@ -53,15 +55,28 @@ export class StyleEditorDialogComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
let dasharray_find_value;
this.element = new ElementData(); this.element = new ElementData();
if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) { if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) {
this.element.fill = this.drawing.element.fill; this.element.fill = this.drawing.element.fill;
this.element.stroke = this.drawing.element.stroke; this.element.stroke = this.drawing.element.stroke;
this.element.stroke_dasharray = this.drawing.element.stroke_dasharray ?? 'none'; let dasharray_value = this.drawing.element.stroke_dasharray;
this.borderTypes.map((_) => {
if (_.qt == dasharray_value) {
dasharray_find_value = _.value;
}
});
this.element.stroke_dasharray = dasharray_find_value ?? 'none';
this.element.stroke_width = this.drawing.element.stroke_width; this.element.stroke_width = this.drawing.element.stroke_width;
} else if (this.drawing.element instanceof LineElement) { } else if (this.drawing.element instanceof LineElement) {
this.element.stroke = this.drawing.element.stroke; this.element.stroke = this.drawing.element.stroke;
this.element.stroke_dasharray = this.drawing.element.stroke_dasharray ?? 'none'; let dasharray_value = this.drawing.element.stroke_dasharray;
this.borderTypes.map((_) => {
if (_.qt == dasharray_value) {
dasharray_find_value = _.value;
}
});
this.element.stroke_dasharray = dasharray_find_value ?? 'none';
this.element.stroke_width = this.drawing.element.stroke_width; this.element.stroke_width = this.drawing.element.stroke_width;
} }
@ -87,7 +102,7 @@ export class StyleEditorDialogComponent implements OnInit {
if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) { if (this.drawing.element instanceof RectElement || this.drawing.element instanceof EllipseElement) {
this.drawing.element.fill = this.element.fill; this.drawing.element.fill = this.element.fill;
this.drawing.element.stroke = this.element.stroke; this.drawing.element.stroke = this.element.stroke;
this.drawing.element.stroke_dasharray = this.element.stroke_dasharray; this.drawing.element.stroke_dasharray = this.qtDasharrayFixer.fix(this.element.stroke_dasharray);
this.drawing.element.stroke_width = this.element.stroke_width; this.drawing.element.stroke_width = this.element.stroke_width;
} else if (this.drawing.element instanceof LineElement) { } else if (this.drawing.element instanceof LineElement) {
this.drawing.element.stroke = this.element.stroke; this.drawing.element.stroke = this.element.stroke;