Dialog for editing text created

src/app/app.module.ts

@@ -86,6 +86,8 @@ import { ToolsService } from './services/tools.service';
 import { TextAddedComponent } from './components/drawings-listeners/text-added/text-added.component';
 import { DrawingAddedComponent } from './components/drawings-listeners/drawing-added/drawing-added.component';
 import { StyleEditorDialogComponent } from './components/project-map/drawings-editors/style-editor/style-editor.component';
+import { EditTextActionComponent } from './components/project-map/context-menu/actions/edit-text-action/edit-text-action.component';
+import { TextEditorDialogComponent } from './components/project-map/drawings-editors/text-editor/text-editor.component';
 
 
 if (environment.production) {
@@ -123,6 +125,7 @@ if (environment.production) {
     MoveLayerDownActionComponent,
     MoveLayerUpActionComponent,
     EditStyleActionComponent,
+    EditTextActionComponent,
     ProjectMapShortcutsComponent,
     SettingsComponent,
     LocalServerComponent,
@@ -139,7 +142,8 @@ if (environment.production) {
     DrawingDraggedComponent,
     LinkCreatedComponent,
     InterfaceLabelDraggedComponent,
-    StyleEditorDialogComponent
+    StyleEditorDialogComponent,
+    TextEditorDialogComponent
   ],
   imports: [
     BrowserModule,
@@ -195,7 +199,8 @@ if (environment.production) {
     AddBlankProjectDialogComponent,
     ImportProjectDialogComponent,
     ConfirmationDialogComponent,
-    StyleEditorDialogComponent
+    StyleEditorDialogComponent,
+    TextEditorDialogComponent
   ],
   bootstrap: [ AppComponent ]
 })

src/app/cartography/converters/map/map-drawing-to-svg-converter.ts

@@ -15,7 +15,8 @@ export class MapDrawingToSvgConverter implements Converter<MapDrawing, string> {
 
     convert(mapDrawing: MapDrawing) {
         let elem = ``;
-
+        console.log("!!!  ", mapDrawing.element);
+        
         if (mapDrawing.element instanceof RectElement) {
             elem = `<rect fill=\"${mapDrawing.element.fill}\" fill-opacity=\"${mapDrawing.element.fill_opacity}\" height=\"${mapDrawing.element.height}\" width=\"${mapDrawing.element.width}\" stroke=\"${mapDrawing.element.stroke}\" stroke-width=\"${mapDrawing.element.stroke_width}\" />`;
         } else if (mapDrawing.element instanceof EllipseElement) {

src/app/components/project-map/context-menu/actions/edit-style-action/edit-style-action.component.ts

@@ -3,9 +3,7 @@ import { Drawing } from '../../../../../cartography/models/drawing';
 import { Server } from '../../../../../models/server';
 import { MatDialog } from '@angular/material';
 import { Project } from '../../../../../models/project';
-import { TextElement } from '../../../../../cartography/models/drawings/text-element';
 import { StyleEditorDialogComponent } from '../../../drawings-editors/style-editor/style-editor.component';
-import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor/text-editor.component';
 
 
 @Component({
@@ -24,10 +22,6 @@ export class EditStyleActionComponent implements OnInit {
     ngOnInit() {}
 
     editStyle() {
-        this.drawing.element instanceof TextElement ? this.openTextEditor() : this.openStyleEditor(); 
-    }
-
-    openStyleEditor() {
         const dialogRef = this.dialog.open(StyleEditorDialogComponent, {
             width: '550px',
         });
@@ -36,14 +30,4 @@ export class EditStyleActionComponent implements OnInit {
         instance.project = this.project;
         instance.drawing = this.drawing;
     }
-
-    openTextEditor() {
-        const dialogRef = this.dialog.open(TextEditorDialogComponent, {
-            width: '550px',
-        });
-        let instance = dialogRef.componentInstance;
-        instance.server = this.server;
-        instance.project = this.project;
-        instance.drawing = this.drawing;
-    }
 }

src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.html

@@ -0,0 +1,4 @@
+<button mat-menu-item (click)="editText()">
+    <mat-icon>text_format</mat-icon>
+    <span>Edit text</span>
+</button>

src/app/components/project-map/context-menu/actions/edit-text-action/edit-text-action.component.ts

@@ -0,0 +1,33 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Server } from '../../../../../models/server';
+import { Project } from '../../../../../models/project';
+import { Drawing } from '../../../../../cartography/models/drawing';
+import { MatDialog } from '@angular/material';
+import { TextEditorDialogComponent } from '../../../drawings-editors/text-editor/text-editor.component';
+
+
+@Component({
+    selector: 'app-edit-text-action',
+    templateUrl: './edit-text-action.component.html'
+})
+export class EditTextActionComponent implements OnInit {
+    @Input() server: Server;
+    @Input() project: Project;
+    @Input() drawing: Drawing;
+
+    constructor(
+        private dialog: MatDialog
+    ) {}
+
+    ngOnInit() {}
+
+    editText() {
+        const dialogRef = this.dialog.open(TextEditorDialogComponent, {
+            width: '550px',
+        });
+        let instance = dialogRef.componentInstance;
+        instance.server = this.server;
+        instance.project = this.project;
+        instance.drawing = this.drawing;
+    }
+}

src/app/components/project-map/context-menu/context-menu.component.html

@@ -3,7 +3,8 @@
   <mat-menu #contextMenu="matMenu" class="context-menu-items">
     <app-start-node-action *ngIf="hasNodeCapabilities" [server]="server" [node]="node"></app-start-node-action>
     <app-stop-node-action *ngIf="hasNodeCapabilities" [server]="server" [node]="node"></app-stop-node-action>
-    <app-edit-style-action *ngIf="hasDrawingCapabilities" [server]="server" [project]="project" [drawing]="drawing"></app-edit-style-action>
+    <app-edit-style-action *ngIf="hasDrawingCapabilities && !isTextElement" [server]="server" [project]="project" [drawing]="drawing"></app-edit-style-action>
+    <app-edit-text-action *ngIf="hasDrawingCapabilities && isTextElement" [server]="server" [project]="project" [drawing]="drawing"></app-edit-text-action>
     <app-move-layer-up-action *ngIf="!projectService.isReadOnly(project)" [server]="server" [node]="node" [drawing]="drawing"></app-move-layer-up-action>
     <app-move-layer-down-action *ngIf="!projectService.isReadOnly(project)" [server]="server" [node]="node" [drawing]="drawing"></app-move-layer-down-action>
   </mat-menu>

src/app/components/project-map/context-menu/context-menu.component.ts

@@ -6,6 +6,7 @@ import { Server } from "../../../models/server";
 import { Project } from "../../../models/project";
 import { ProjectService } from "../../../services/project.service";
 import { Drawing } from '../../../cartography/models/drawing';
+import { TextElement } from '../../../cartography/models/drawings/text-element';
 
 
 @Component({
@@ -25,6 +26,7 @@ export class ContextMenuComponent implements OnInit {
   drawing: Drawing;
   private hasNodeCapabilities: boolean = false;
   private hasDrawingCapabilities: boolean = false;
+  private isTextElement: boolean = false;
 
   constructor(
     private sanitizer: DomSanitizer,
@@ -54,6 +56,7 @@ export class ContextMenuComponent implements OnInit {
   public openMenuForDrawing(drawing: Drawing, top: number, left: number) {
     this.resetCapabilities();
     this.hasDrawingCapabilities = true;
+    this.isTextElement = drawing.element instanceof TextElement;
 
     this.drawing = drawing;
     this.setPosition(top, left);
@@ -66,5 +69,6 @@ export class ContextMenuComponent implements OnInit {
     this.drawing = null;
     this.hasDrawingCapabilities = false;
     this.hasNodeCapabilities = false;
+    this.isTextElement = false;
   }
 }

src/app/components/project-map/drawings-editors/style-editor/style-editor.component.html

@@ -21,7 +21,7 @@
 <br/>
 <span class="item">
     <div class="item-name">Rotation: </div>
-    <input class="item-value" matInput type="text" [(ngModel)]="drawing.rotation"/>
+    <input class="item-value" matInput type="text" [(ngModel)]="rotation"/>
 </span>
 <br/>
 <div mat-dialog-actions>

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

@@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { Server } from '../../../../models/server';
 import { Project } from '../../../../models/project';
 import { Drawing } from '../../../../cartography/models/drawing';
-import { MatDialogRef, MatDialog } from '@angular/material';
+import { MatDialogRef } from '@angular/material';
 import { DrawingToMapDrawingConverter } from '../../../../cartography/converters/map/drawing-to-map-drawing-converter';
 import { MapDrawingToSvgConverter } from '../../../../cartography/converters/map/map-drawing-to-svg-converter';
 import { DrawingService } from '../../../../services/drawing.service';
@@ -18,10 +18,10 @@ export class StyleEditorDialogComponent implements OnInit {
     server: Server;
     project: Project;
     drawing: Drawing;
+    rotation: string;
 
     constructor(
         public dialogRef: MatDialogRef<StyleEditorDialogComponent>,
-        private dialog: MatDialog,
         private drawingToMapDrawingConverter: DrawingToMapDrawingConverter,
         private mapDrawingToSvgConverter: MapDrawingToSvgConverter,
         private drawingService: DrawingService,
@@ -29,7 +29,7 @@ export class StyleEditorDialogComponent implements OnInit {
     ){}
 
     ngOnInit() {
-        console.log(this.drawing.element);
+        this.rotation = this.drawing.rotation.toString();
     }
 
     onNoClick() {
@@ -37,8 +37,12 @@ export class StyleEditorDialogComponent implements OnInit {
     }
 
     onYesClick() {
+        this.drawing.rotation = +this.rotation;
         let mapDrawing = this.drawingToMapDrawingConverter.convert(this.drawing);
+        mapDrawing.element = this.drawing.element;
+
         this.drawing.svg = this.mapDrawingToSvgConverter.convert(mapDrawing);
+
         this.drawingService
             .update(this.server, this.drawing).subscribe((serverDrawing: Drawing) => {
                 this.drawingsDataSource.update(serverDrawing);

src/app/components/project-map/drawings-editors/text-editor/text-editor.component.html

@@ -0,0 +1,19 @@
+<h1 mat-dialog-title>Text editor</h1>
+<span *ngIf="drawing.element.fill" class="item">
+    <div class="item-name">Fill color:</div>
+    <input class="input-color" type="color" (ngModelChange)="changeTextColor($event)" [(ngModel)]="drawing.element.fill"/>
+</span>
+<br/>
+<span class="item">
+    <div class="item-name">Rotation:</div>
+    <input class="item-value" matInput type="text" [(ngModel)]="rotation"/>
+</span>
+<br/>
+<span>
+    <textarea #textArea id="textArea" class="text" [(ngModel)]="drawing.element.text">
+    </textarea>
+</span>
+<div mat-dialog-actions>
+    <button mat-button (click)="onNoClick()" color="accent">Cancel</button>
+    <button mat-button (click)="onYesClick()" tabindex="2" mat-raised-button color="primary">Apply</button>
+</div>

src/app/components/project-map/drawings-editors/text-editor/text-editor.component.scss

@@ -0,0 +1,29 @@
+.item {
+    display: flex;
+    height: 25px;
+}
+
+.item-name {
+    width: 30%;
+}
+
+.item-value {
+    width: 70%;
+}
+
+.input-color {
+    padding: 0px;
+    border-width: 0px;
+    width: 70%;
+    background-color: transparent;
+    outline: none;
+}
+
+input:focus {
+    outline: none;
+}
+
+.text {
+    width: 100%;
+    height: 150px;
+}

src/app/components/project-map/drawings-editors/text-editor/text-editor.component.ts

@@ -1,7 +1,13 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ViewChild, ElementRef, Renderer2 } from "@angular/core";
 import { Project } from '../../../../models/project';
 import { Drawing } from '../../../../cartography/models/drawing';
 import { Server } from '../../../../models/server';
+import { MatDialogRef } from '@angular/material';
+import { DrawingToMapDrawingConverter } from '../../../../cartography/converters/map/drawing-to-map-drawing-converter';
+import { MapDrawingToSvgConverter } from '../../../../cartography/converters/map/map-drawing-to-svg-converter';
+import { DrawingService } from '../../../../services/drawing.service';
+import { DrawingsDataSource } from '../../../../cartography/datasources/drawings-datasource';
+import { TextElement } from '../../../../cartography/models/drawings/text-element';
 
 
 @Component({
@@ -10,11 +16,51 @@ import { Server } from '../../../../models/server';
     styleUrls: ['./text-editor.component.scss']
 })
 export class TextEditorDialogComponent implements OnInit {
+    @ViewChild('textArea') textArea : ElementRef;
+
     server: Server;
     project: Project;
     drawing: Drawing;
+    rotation: string;
 
-    constructor(){}
+    constructor(
+        private dialogRef: MatDialogRef<TextEditorDialogComponent>,
+        private drawingToMapDrawingConverter: DrawingToMapDrawingConverter,
+        private mapDrawingToSvgConverter: MapDrawingToSvgConverter,
+        private drawingService: DrawingService,
+        private drawingsDataSource: DrawingsDataSource,
+        private renderer: Renderer2
+    ){}
 
-    ngOnInit(){}
+    ngOnInit() {
+        this.rotation = this.drawing.rotation.toString();
+
+        let textElement = this.drawing.element as TextElement;
+        this.renderer.setStyle(this.textArea.nativeElement, 'color', textElement.fill);
+        this.renderer.setStyle(this.textArea.nativeElement, 'font-family', textElement.font_family);
+        this.renderer.setStyle(this.textArea.nativeElement, 'font-size', `${textElement.font_size}pt`);
+        this.renderer.setStyle(this.textArea.nativeElement, 'font-weight', textElement.font_weight);
+    }
+
+    onNoClick() {
+        this.dialogRef.close();
+    }
+
+    onYesClick() {
+        this.drawing.rotation = +this.rotation;
+        let mapDrawing = this.drawingToMapDrawingConverter.convert(this.drawing);
+        mapDrawing.element = this.drawing.element;
+
+        this.drawing.svg = this.mapDrawingToSvgConverter.convert(mapDrawing);
+
+        this.drawingService
+            .update(this.server, this.drawing).subscribe((serverDrawing: Drawing) => {
+                this.drawingsDataSource.update(serverDrawing);
+                this.dialogRef.close();
+            });
+    }
+
+    changeTextColor(changedColor) {
+        this.renderer.setStyle(this.textArea.nativeElement, 'color', changedColor);
+    }
 }