fix: Scale netzgrafik does not include notes (#616)

* Issue fixed

* Issue fixed

* refactored

Author: aiAdrian

src/app/services/data/note.service.ts

@@ -126,6 +126,10 @@ export class NoteService {
     return Object.assign({}, this.notesStore).notes;
   }
 
+  getSelectedNotes(): Note[] {
+    return this.getNotes().filter((n) => n.selected());
+  }
+
   visibleNotesDeleteLabel(labelRef: string) {
     const labelObject = this.labelService.getLabelFromLabelAndLabelRef(labelRef, LabelRef.Note);
     if (labelObject === undefined) {
@@ -313,7 +317,7 @@ export class NoteService {
     round: number,
     dragEnd: boolean,
   ) {
-    const notesToUpdate = this.notesStore.notes.filter((n) => n.selected());
+    const notesToUpdate = this.getSelectedNotes();
     notesToUpdate.forEach((note) => {
       const newPosition = NoteService.alginNoteToRaster(
         new Vec2D(note.getPositionX() + deltaPositionX, note.getPositionY() + deltaPositionY),

src/app/services/util/position.transformation.service.ts

@@ -7,6 +7,7 @@ import {Vec2D} from "../../utils/vec2D";
 import {Node} from "../../models/node.model";
 import {ViewportCullService} from "../ui/viewport.cull.service";
 import {NodeOperation, Operation, OperationType} from "src/app/models/operation.model";
+import {Note} from "../../models/note.model";
 
 @Injectable({
   providedIn: "root",
@@ -47,6 +48,22 @@ export class PositionTransformationService {
       }
       n.setPosition(newPos.getX(), newPos.getY());
     });
+
+    this.noteService.getNotes().forEach((n, index) => {
+      let newPos = new Vec2D(
+        (n.getPositionX() - scaleCenterCoordinates.getX()) * factor + scaleCenterCoordinates.getX(),
+        (n.getPositionY() - scaleCenterCoordinates.getY()) * factor + scaleCenterCoordinates.getY(),
+      );
+
+      if (focalNode?.getId() === n.getId()) {
+        const delta = Vec2D.sub(
+          newPos,
+          new Vec2D(focalNode.getPositionX(), focalNode.getPositionY()),
+        );
+        newPos = Vec2D.sub(newPos, delta);
+      }
+      n.setPosition(newPos.getX(), newPos.getY());
+    });
   }
 
   private computeScaleCenterCoordinates(
@@ -80,6 +97,7 @@ export class PositionTransformationService {
     factor: number,
     zoomCenter: Vec2D,
     nodes: Node[],
+    notes: Note[],
     windowViewboxPropertiesMapKey: string,
   ) {
     const scaleCenterCoordinates: Vec2D = this.computeScaleCenterCoordinates(
@@ -128,6 +146,18 @@ export class PositionTransformationService {
 
       n.setPosition(newPos.getX(), newPos.getY());
     });
+
+    notes.forEach((n, index) => {
+      const newPos = new Vec2D(
+        (n.getPositionX() + n.getWidth() / 2.0 - scaleCenterCoordinates.getX()) * factor +
+          scaleCenterCoordinates.getX() -
+          n.getWidth() / 2.0,
+        (n.getPositionY() + n.getHeight() / 2.0 - scaleCenterCoordinates.getY()) * factor +
+          scaleCenterCoordinates.getY() -
+          n.getHeight() / 2.0,
+      );
+      n.setPosition(newPos.getX(), newPos.getY());
+    });
   }
 
   private updateRendering() {
@@ -143,14 +173,19 @@ export class PositionTransformationService {
 
   scaleNetzgrafikArea(factor: number, zoomCenter: Vec2D, windowViewboxPropertiesMapKey: string) {
     const nodes: Node[] = this.nodeService.getSelectedNodes();
-
     if (nodes.length < 2) {
       this.scaleFullNetzgrafikArea(factor, zoomCenter, windowViewboxPropertiesMapKey);
     } else {
+      let notes: Note[] = this.noteService.getSelectedNotes();
+      if (notes.length === 0) {
+        notes = this.noteService.getNotes();
+      }
+      this.noteService.getSelectedNote();
       this.scaleNetzgrafikSelectedNodesArea(
         factor,
         zoomCenter,
         nodes,
+        notes,
         windowViewboxPropertiesMapKey,
       );
     }