소스 검색

折线修改

haojianlong 4 년 전
부모
커밋
478b353c17
2개의 변경된 파일67개의 추가작업 그리고 31개의 파일을 삭제
  1. 33 15
      src/lib/items/TipelineItem.js
  2. 34 16
      src/lib/items/TipelineItem.ts

+ 33 - 15
src/lib/items/TipelineItem.js

@@ -145,28 +145,46 @@ export class TipelineItem extends SPolylineItem {
         }
         }
         return this.data
         return this.data
     }
     }
-    onDraw(painter) {
+   // onDraw(painter: SPainter) {
+    //     if (this.maskFlag && this.status == SItemStatus.Normal) {
+    //         let color = new SColor(this.strokeColor)
+    //         color.alpha = color.alpha / 8
+    //         painter.pen.color = color
+
+    //         if (this.selected) {
+    //             painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
+    //             painter.shadow.shadowBlur = 10;
+    //             painter.shadow.shadowColor = new SColor(`#00000033`);
+    //             painter.shadow.shadowOffsetX = 5;
+    //             painter.shadow.shadowOffsetY = 5;
+    //         } else {
+    //             painter.pen.lineWidth = painter.toPx(this.lineWidth);
+    //             painter.shadow.shadowColor = SColor.Transparent
+    //         }
+    //         painter.drawPolyline(this.pointList)
+
+    //         painter.pen.color = new SColor('#ffffff80')
+    //         painter.drawPolyline(this.pointList)
+    //     } else {
+    //         super.onDraw(painter)
+    //     }
+    // }
+    /**
+     * Item绘制框架
+     *
+     * @param   painter       painter对象
+     * @param   rect          绘制区域
+     */
+    onPaint(painter, rect) {
+        super.onPaint(painter, rect);
         if (this.maskFlag && this.status == SItemStatus.Normal) {
         if (this.maskFlag && this.status == SItemStatus.Normal) {
-            let color = new SColor(this.strokeColor)
-            color.alpha = color.alpha / 8
-            painter.pen.color = color
-            
             if (this.selected) {
             if (this.selected) {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
-                painter.shadow.shadowBlur = 10;
-                painter.shadow.shadowColor = new SColor(`#00000033`);
-                painter.shadow.shadowOffsetX = 5;
-                painter.shadow.shadowOffsetY = 5;
             } else {
             } else {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth);
                 painter.pen.lineWidth = painter.toPx(this.lineWidth);
-                painter.shadow.shadowColor = SColor.Transparent
             }
             }
-            painter.drawPolyline(this.pointList)
-
             painter.pen.color = new SColor('#ffffff80')
             painter.pen.color = new SColor('#ffffff80')
             painter.drawPolyline(this.pointList)
             painter.drawPolyline(this.pointList)
-        } else {
-            super.onDraw(painter)
         }
         }
-    }
+    } // Function onPaint()
 }
 }

+ 34 - 16
src/lib/items/TipelineItem.ts

@@ -1,5 +1,5 @@
 import { SPolylineItem, ItemOrder, SItemStatus } from '@saga-web/big/lib'
 import { SPolylineItem, ItemOrder, SItemStatus } from '@saga-web/big/lib'
-import { SPainter, SColor } from '@saga-web/draw'
+import { SPainter, SColor, SRect } from '@saga-web/draw'
 import { SAnchorItem, SGraphItem } from '@saga-web/graph/lib'
 import { SAnchorItem, SGraphItem } from '@saga-web/graph/lib'
 import { Relation } from '../types/Relation'
 import { Relation } from '../types/Relation'
 import { SPoint } from '@saga-web/draw/lib'
 import { SPoint } from '@saga-web/draw/lib'
@@ -156,28 +156,46 @@ export class TipelineItem extends SPolylineItem {
         return this.data
         return this.data
     }
     }
 
 
-    onDraw(painter: SPainter) {
+    // onDraw(painter: SPainter) {
+    //     if (this.maskFlag && this.status == SItemStatus.Normal) {
+    //         let color = new SColor(this.strokeColor)
+    //         color.alpha = color.alpha / 8
+    //         painter.pen.color = color
+
+    //         if (this.selected) {
+    //             painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
+    //             painter.shadow.shadowBlur = 10;
+    //             painter.shadow.shadowColor = new SColor(`#00000033`);
+    //             painter.shadow.shadowOffsetX = 5;
+    //             painter.shadow.shadowOffsetY = 5;
+    //         } else {
+    //             painter.pen.lineWidth = painter.toPx(this.lineWidth);
+    //             painter.shadow.shadowColor = SColor.Transparent
+    //         }
+    //         painter.drawPolyline(this.pointList)
+
+    //         painter.pen.color = new SColor('#ffffff80')
+    //         painter.drawPolyline(this.pointList)
+    //     } else {
+    //         super.onDraw(painter)
+    //     }
+    // }
+    /**
+     * Item绘制框架
+     *
+     * @param   painter       painter对象
+     * @param   rect          绘制区域
+     */
+    onPaint(painter: SPainter, rect: SRect): void {
+        super.onPaint(painter, rect);
         if (this.maskFlag && this.status == SItemStatus.Normal) {
         if (this.maskFlag && this.status == SItemStatus.Normal) {
-            let color = new SColor(this.strokeColor)
-            color.alpha = color.alpha / 8
-            painter.pen.color = color
-            
             if (this.selected) {
             if (this.selected) {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
                 painter.pen.lineWidth = painter.toPx(this.lineWidth * 2);
-                painter.shadow.shadowBlur = 10;
-                painter.shadow.shadowColor = new SColor(`#00000033`);
-                painter.shadow.shadowOffsetX = 5;
-                painter.shadow.shadowOffsetY = 5;
             } else {
             } else {
                 painter.pen.lineWidth = painter.toPx(this.lineWidth);
                 painter.pen.lineWidth = painter.toPx(this.lineWidth);
-                painter.shadow.shadowColor = SColor.Transparent
             }
             }
-            painter.drawPolyline(this.pointList)
-
             painter.pen.color = new SColor('#ffffff80')
             painter.pen.color = new SColor('#ffffff80')
             painter.drawPolyline(this.pointList)
             painter.drawPolyline(this.pointList)
-        } else {
-            super.onDraw(painter)
         }
         }
-    }
+    } // Function onPaint()
 }
 }