浏览代码

矩形item及圆角矩形整合提交

haojianlong 4 年之前
父节点
当前提交
2144745216

+ 5 - 1
persagy-web-graph/src/index.ts

@@ -53,6 +53,8 @@ import { SGraphPolyGroupItem } from "./items/SGraphPolyGroupItem";
 import { AreaGroup } from "./types/AreaGroup";
 import { PolyGroup } from "./types/PolyGroup";
 import { Point } from "./types/Point";
+import { SGraphRectItem } from "./items/SGraphRectItem";
+import { SGraphRect } from "./types/SGraphRect";
 
 export {
     SGraphItem,
@@ -81,5 +83,7 @@ export {
     SGraphPolyGroupItem,
     AreaGroup,
     PolyGroup,
-    Point
+    Point,
+    SGraphRect,
+    SGraphRectItem
 };

+ 149 - 0
persagy-web-graph/src/items/SGraphRectItem.ts

@@ -0,0 +1,149 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+
+import { SGraphShape } from "./SGraphShape";
+import { SGraphItem } from "../SGraphItem";
+import { SPainter, SRect } from "@persagy-web/draw";
+import { SGraphRect } from "..";
+
+/**
+ * 矩形(包含圆角矩形)item
+ *
+ * @author 郝建龙
+ * */
+export class SGraphRectItem extends SGraphShape {
+    /** item左上角X坐标 */
+    private _leftTopY: number = 0;
+    get leftTopY(): number {
+        return this._leftTopY;
+    } // Get leftTopY
+    set leftTopY(v: number) {
+        if (v == this._leftTopY) {
+            return;
+        }
+        this._leftTopY = v;
+        this.update();
+    } // Set leftTopY
+    /** item左上角Y坐标 */
+    private _leftTopX: number = 0;
+    get leftTopX(): number {
+        return this._leftTopX;
+    } // Get leftTopX
+    set leftTopX(v: number) {
+        if (v == this._leftTopX) {
+            return;
+        }
+        this._leftTopX = v;
+        this.update();
+    } // Set leftTopX
+    /** item宽 */
+    private _width: number = 0;
+    get width(): number {
+        return this._width;
+    } // Get width
+    set width(v: number) {
+        if (v == this._width) {
+            return;
+        }
+        this._width = v;
+        this.update();
+    } // Set width
+    /** item高 */
+    private _height: number = 0;
+    get height(): number {
+        return this._height;
+    } // Get height
+    set height(v: number) {
+        if (v == this._height) {
+            return;
+        }
+        this._height = v;
+        this.update();
+    } // Set height
+    /** 绘制矩形的圆角半径 */
+    private _radius: number = 0;
+    get radius(): number {
+        return this._radius;
+    } // Get radius
+    set radius(v: number) {
+        if (v == this._radius) {
+            return;
+        }
+        this._radius = v;
+        this.update();
+    } // Set radius
+
+    /**
+     * 构造函数
+     *
+     * @param parent    指向父对象
+     * @param data      矩形数据
+     */
+    constructor(parent: SGraphItem | null, data: SGraphRect) {
+        super(parent, data.Style);
+        this.leftTopX = data.X;
+        this.leftTopY = data.Y;
+        this.width = data.Width;
+        this.height = data.Height;
+        if (data.Radius && !isNaN(data.Radius)) {
+            this.radius = Number(data.Radius);
+        }
+    } // Constructor
+
+    /**
+     * Item对象边界区域
+     *
+     * @return	SRect
+     */
+    boundingRect(): SRect {
+        return new SRect(this.leftTopX, this.leftTopY, this.width, this.height);
+    } // Function boundingRect()
+
+    /**
+     * 绘制
+     *
+     * @param   painter painter对象
+     * */
+    onDraw(painter: SPainter): void {
+        super.onDraw(painter);
+        if (this.radius != 0) {
+            painter.drawRoundRect(
+                this.leftTopX,
+                this.leftTopY,
+                this.width,
+                this.height,
+                this.radius
+            );
+        } else {
+            painter.drawRect(
+                this.leftTopX,
+                this.leftTopY,
+                this.width,
+                this.height
+            );
+        }
+    } // Function onDraw()
+} // Class SGraphRectItem

+ 7 - 2
persagy-web-graph/src/items/SGraphShape.ts

@@ -34,9 +34,14 @@ import {
     SRadialGradient
 } from "@persagy-web/draw/lib";
 
+/**
+ * 图形item基类
+ *
+ * @author  郝建龙
+ */
 export class SGraphShape extends SGraphItem {
     /** 当前item的风格 */
-    style: Style | null = null;
+    style: Style | undefined;
 
     /**
      * 构造函数
@@ -46,7 +51,7 @@ export class SGraphShape extends SGraphItem {
      * */
     constructor(parent: SGraphItem | null, style?: Style) {
         super(parent);
-        this.style = style || null;
+        this.style = style;
     } // Constructor
 
     /**

+ 46 - 0
persagy-web-graph/src/types/SGraphRect.ts

@@ -0,0 +1,46 @@
+/*
+ * *********************************************************************************************************************
+ *
+ *          !!
+ *        .F88X
+ *        X8888Y
+ *      .}888888N;
+ *        i888888N;        .:!              .I$WI:
+ *          R888888I      .'N88~            i8}+8Y&8"l8i$8>8W~'>W8}8]KW+8IIN"8&
+ *          .R888888I    .;N8888~          .X8'  "8I.!,/8"  !%NY8`"8I8~~8>,88I
+ *            +888888N;  .8888888Y                                  "&&8Y.}8,
+ *            ./888888N;  .R888888Y        .'}~    .>}'.`+>  i}!    "i'  +/'  .'i~  !11,.:">,  .~]!  .i}i
+ *              ~888888%:  .I888888l      .]88~`1/iY88Ii+1'.R$8$8]"888888888>  Y8$  W8E  X8E  W8888'188Il}Y88$*
+ *              18888888    E8888881    .]W%8$`R8X'&8%++N8i,8N%N8+l8%`  .}8N:.R$RE%N88N%N$K$R  188,FE$8%~Y88I
+ *            .E888888I  .i8888888'      .:$8I;88+`E8R:/8N,.>881.`$8E/1/]N8X.Y8N`"KF&&FK!'88*."88K./$88%RN888+~
+ *            8888888I  .,N888888~        ~88i"8W,!N8*.I88.}888%F,i$88"F88"  888:E8X.>88!i88>`888*.}Fl1]*}1YKi'
+ *          i888888N'      I888Y          ]88;/EX*IFKFK88X  K8R  .l8W  88Y  ~88}'88E&%8W.X8N``]88!.$8K  .:W8I
+ *        .i888888N;        I8Y          .&8$  .X88!  i881.:%888>I88  ;88]  +88+.';;;;:.Y88X  18N.,88l  .+88/
+ *      .:R888888I
+ *      .&888888I                                          Copyright (c) 2009-2020.  博锐尚格科技股份有限公司
+ *        ~8888'
+ *        .!88~                                                                     All rights reserved.
+ *
+ * *********************************************************************************************************************
+ */
+import { Style } from "./Style";
+
+/**
+ * 矩形(包含圆角矩形)数据类型
+ *
+ * @author 郝建龙
+ * */
+export interface SGraphRect {
+    /** item风格 */
+    Style?: Style;
+    /** 矩形左上角X坐标 */
+    X: number;
+    /** 矩形左上角Y坐标 */
+    Y: number;
+    /** 矩形宽 */
+    Width: number;
+    /** 矩形左上角X坐标 */
+    Height: number;
+    /** 当为圆角时的圆角半径 */
+    Radius?: number;
+} // Interface SGraphRect