From 48c9c1a87d66faf3b4e02d74bfa7323d015b26cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Tue, 4 Feb 2025 11:22:43 +0100 Subject: [PATCH] removed width+height from Part --- src/main/angular/src/app/editor/parts/Part.ts | 8 -------- src/main/angular/src/app/editor/parts/part.component.svg | 4 ++-- src/main/angular/src/app/editor/parts/part.component.ts | 3 ++- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/angular/src/app/editor/parts/Part.ts b/src/main/angular/src/app/editor/parts/Part.ts index 5f73a2e..88fe403 100644 --- a/src/main/angular/src/app/editor/parts/Part.ts +++ b/src/main/angular/src/app/editor/parts/Part.ts @@ -12,23 +12,15 @@ export abstract class Part { y: number; - readonly w: number; - - readonly h: number; - protected constructor( readonly circuit: Circuit, readonly type: PartType, readonly name: string, rasterX: number, rasterY: number, - rasterW: number = 1, - rasterH: number = 1, ) { this.x = Math.round(rasterX * 3) * RASTER; this.y = Math.round(rasterY * 3) * RASTER; - this.w = Math.round(rasterW * 3) * RASTER; - this.h = Math.round(rasterH * 3) * RASTER; } toString(): string { diff --git a/src/main/angular/src/app/editor/parts/part.component.svg b/src/main/angular/src/app/editor/parts/part.component.svg index dec489a..f773ff8 100644 --- a/src/main/angular/src/app/editor/parts/part.component.svg +++ b/src/main/angular/src/app/editor/parts/part.component.svg @@ -3,8 +3,8 @@ *ngFor="let part of parts.circuit.parts" [attr.x]="part.x + 'px'" [attr.y]="part.y + 'px'" - [attr.width]="part.w + 'px'" - [attr.height]="part.h + 'px'" + [attr.width]="RASTER * 3 + 'px'" + [attr.height]="RASTER * 3 + 'px'" [class.partDrag]="parts.isDragged(part)" (mousedown)="parts.mouseDown(part, $event)" > diff --git a/src/main/angular/src/app/editor/parts/part.component.ts b/src/main/angular/src/app/editor/parts/part.component.ts index aec9f9d..416076f 100644 --- a/src/main/angular/src/app/editor/parts/part.component.ts +++ b/src/main/angular/src/app/editor/parts/part.component.ts @@ -1,5 +1,5 @@ import {Component, Input} from '@angular/core'; -import {Part} from './Part'; +import {Part, RASTER} from './Part'; import {Battery} from './battery/Battery'; import {Light} from './light/Light'; import {BatteryComponent} from './battery/battery.component'; @@ -70,4 +70,5 @@ export class PartComponent { return part instanceof Switch; } + protected readonly RASTER = RASTER; }