Rename DrawingWidget to DrawingShapeWidget

This commit is contained in:
ziajka 2018-11-08 08:28:19 +01:00
parent b57bc7370b
commit 6fcbf0da28
8 changed files with 19 additions and 13 deletions

View File

@ -37,6 +37,12 @@ export class MapListener {
});
});
this.end = this.drawingsWidget.draggable.end.subscribe((evt: DraggableStart<Drawing>) => {
let drawings = this.selectionManager.getSelectedDrawings();
drawings.forEach((drawing: Drawing) => {
});
});
}
public onDestroy() {

View File

@ -10,7 +10,7 @@ import { ImageDrawingWidget } from "./drawings/image-drawing";
import { RectDrawingWidget } from "./drawings/rect-drawing";
import { LineDrawingWidget } from "./drawings/line-drawing";
import { EllipseDrawingWidget } from "./drawings/ellipse-drawing";
import { DrawingWidget } from "./drawings/drawing-widget";
import { DrawingShapeWidget } from "./drawings/drawing-widget";
import { event } from "d3-selection";
import { D3DragEvent, drag } from "d3-drag";
import { Draggable } from "../events/draggable";
@ -18,7 +18,7 @@ import { Draggable } from "../events/draggable";
@Injectable()
export class DrawingsWidget implements Widget {
private drawingWidgets: DrawingWidget[] = [];
private drawingWidgets: DrawingShapeWidget[] = [];
public draggable = new Draggable<SVGGElement, Drawing>();

View File

@ -1,5 +1,5 @@
import { SVGSelection } from "../../models/types";
export interface DrawingWidget {
export interface DrawingShapeWidget {
draw(view: SVGSelection);
}

View File

@ -3,12 +3,12 @@ import { Injectable } from "@angular/core";
import { SVGSelection } from "../../models/types";
import { Drawing } from "../../models/drawing";
import { EllipseElement } from "../../models/drawings/ellipse-element";
import { DrawingWidget } from "./drawing-widget";
import { DrawingShapeWidget } from "./drawing-widget";
import { QtDasharrayFixer } from "../../helpers/qt-dasharray-fixer";
@Injectable()
export class EllipseDrawingWidget implements DrawingWidget {
export class EllipseDrawingWidget implements DrawingShapeWidget {
constructor(
private qtDasharrayFixer: QtDasharrayFixer

View File

@ -3,11 +3,11 @@ import { Injectable } from "@angular/core";
import { SVGSelection } from "../../models/types";
import { Drawing } from "../../models/drawing";
import { ImageElement } from "../../models/drawings/image-element";
import { DrawingWidget } from "./drawing-widget";
import { DrawingShapeWidget } from "./drawing-widget";
@Injectable()
export class ImageDrawingWidget implements DrawingWidget {
export class ImageDrawingWidget implements DrawingShapeWidget {
public draw(view: SVGSelection) {
const drawing = view
.selectAll<SVGImageElement, ImageElement>('image.image_element')

View File

@ -3,12 +3,12 @@ import { Injectable } from "@angular/core";
import { SVGSelection } from "../../models/types";
import { Drawing } from "../../models/drawing";
import { LineElement } from "../../models/drawings/line-element";
import { DrawingWidget } from "./drawing-widget";
import { DrawingShapeWidget } from "./drawing-widget";
import { QtDasharrayFixer } from "../../helpers/qt-dasharray-fixer";
@Injectable()
export class LineDrawingWidget implements DrawingWidget {
export class LineDrawingWidget implements DrawingShapeWidget {
constructor(
private qtDasharrayFixer: QtDasharrayFixer

View File

@ -3,12 +3,12 @@ import { Injectable } from "@angular/core";
import { SVGSelection } from "../../models/types";
import { Drawing } from "../../models/drawing";
import { RectElement } from "../../models/drawings/rect-element";
import { DrawingWidget } from "./drawing-widget";
import { DrawingShapeWidget } from "./drawing-widget";
import { QtDasharrayFixer } from "../../helpers/qt-dasharray-fixer";
@Injectable()
export class RectDrawingWidget implements DrawingWidget {
export class RectDrawingWidget implements DrawingShapeWidget {
constructor(
private qtDasharrayFixer: QtDasharrayFixer
) {}

View File

@ -3,13 +3,13 @@ import { Injectable } from "@angular/core";
import { SVGSelection } from "../../models/types";
import { TextElement } from "../../models/drawings/text-element";
import { Drawing } from "../../models/drawing";
import { DrawingWidget } from "./drawing-widget";
import { DrawingShapeWidget } from "./drawing-widget";
import { FontFixer } from "../../helpers/font-fixer";
import { select } from "d3-selection";
@Injectable()
export class TextDrawingWidget implements DrawingWidget {
export class TextDrawingWidget implements DrawingShapeWidget {
static MARGIN = 4;
constructor(