新编规则测试

Author: zhaokai

src/service/2DPlot/Draw/DrawPolyline2D.js

@@ -40,7 +40,7 @@ export default class DrawPolyline2D extends DrawObject {
     innerOnMouseMove(event) {
         const pnt = this.m_coordSys.pointToData([event.pointer.x, event.pointer.y]);
         this.m_coords[this.m_coords.length - 1] = new Point(pnt[0], pnt[1]);
-        if (this.m_coords.length >= 2) {
+        if (this.m_coords.length >= 2 && this.m_object) {
             this.m_object.setPnts(this.m_coords);
             this.m_fabricCanvas.requestRenderAll();
         }

src/service/2DPlot/Draw/index.js

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-15 17:47:45
  * @LastEditors: zk
- * @LastEditTime: 2022-05-16 19:03:08
+ * @LastEditTime: 2022-05-18 09:51:56
  */
 import  DrawPoint2D  from './DrawPoint2D';
 import  DrawPolyline2D  from './DrawPolyline2D';
@@ -17,7 +17,8 @@ DrawPlotObjectFactory2D.register("msbl_kidneyarea", DrawPolyline2D);
 
 // 新修规则
 DrawPlotObjectFactory2D.register("simpleline", DrawPolyline2D);
-
+DrawPlotObjectFactory2D.register("simplearea", DrawPolyline2D);
+DrawPlotObjectFactory2D.register("simplepoint", DrawPoint2D);
 // 非规则符号
 DrawPlotObjectFactory2D.register("msbl_AssaultArrow", DrawPolyline2D);
 DrawPlotObjectFactory2D.register("msbl_MultiArrow", DrawPolyline2D);

src/service/2DPlot/PlotCanvasGroup.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-05-13 11:01:10
  * @LastEditors: zk
- * @LastEditTime: 2022-05-13 16:54:34
+ * @LastEditTime: 2022-05-18 14:52:57
  */
 
 import { fabric } from 'fabric';

src/service/2DPlot/Shapes/RegularShapes/PlotRegularObject.js

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-17 16:12:55
  * @LastEditors: zk
- * @LastEditTime: 2022-05-16 18:52:26
+ * @LastEditTime: 2022-05-18 14:49:44
  */
 
 import { fabric } from 'fabric';

src/service/2DPlot/Shapes/RegularShapes/PlotSimpleArea.js

@@ -0,0 +1,46 @@
+/*
+ * @Description:
+ * @Author: zk
+ * @Date: 2021-11-15 17:47:45
+ * @LastEditors: zk
+ * @LastEditTime: 2022-05-17 16:34:09
+ */
+import { fabric } from "fabric";
+import  PlotRegularObject  from "./PlotRegularObject";
+import { defined } from "../../../PlotUtilBase/Check";
+
+
+const _ = require("lodash");
+
+ const PlotSimpleArea = fabric.util.createClass(PlotRegularObject, {
+  isCalcCompareLine:true,
+  _drawPath(ctx, style) {
+    if(!this._elem.isMustFill){
+      this.callSuper("_drawPath",ctx,style)
+      return
+    }
+    Object.keys(style).forEach((key) => {
+      ctx[key] = style[key];
+    });
+
+    if (defined(style.strokeStyle) && style.strokeStyle !== "") {
+      ctx.stroke();
+    }
+
+    const canvas = this._elem._getFillCanvas();
+    if (canvas&&canvas.height>0 && canvas.width>0 ) {
+      // 创建CanvasPattern对象
+      const pattern = ctx.createPattern(canvas, "repeat");
+      // 将新创建的CanvasPattern对象赋值给fillStyle属性
+      ctx.fillStyle = pattern;
+    }
+    if (defined(style.fillRuleStyle) && style.fillRuleStyle !== "") {
+      ctx.fill(style.fillRuleStyle);
+    } else {
+      ctx.fill();
+    }
+  },
+});
+
+fabric.PlotSimpleArea = PlotSimpleArea;
+export default PlotSimpleArea

src/service/2DPlot/Shapes/index.js

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-15 17:47:45
  * @LastEditors: zk
- * @LastEditTime: 2022-05-16 19:02:53
+ * @LastEditTime: 2022-05-18 09:45:46
  */
 import  {PlotObjectFactory}  from "./PlotObjectFactory";
 import  PlotRegularPoint  from "./RegularShapes/PlotRegularPoint";
@@ -12,6 +12,7 @@ import  PlotRegularSurface  from "./RegularShapes/PlotRegularSurface";
 import  PlotIrregularShape  from "./IrregularShapes/PlotIrregularShape";
 import  PlotIrregularShapeByLatlng  from "./IrregularShapes/PlotIrregularShapeByLatlng";
 import  PlotKidneyarea  from "./RegularShapes/PlotKidneyarea";
+import PlotSimpleArea from "./RegularShapes/PlotSimpleArea";
 
 PlotObjectFactory.register("msbl_regularpoint", PlotRegularPoint);
 PlotObjectFactory.register("msbl_regularLine1", PlotRegularObject);
@@ -21,6 +22,9 @@ PlotObjectFactory.register("msbl_kidneyarea", PlotKidneyarea);
 
 // 新修规则
 PlotObjectFactory.register("simpleline", PlotRegularObject);
+PlotObjectFactory.register("simplearea", PlotSimpleArea);
+PlotObjectFactory.register("simplepoint", PlotRegularPoint);
+
 
 // 非规则符号
 PlotObjectFactory.register("msbl_AssaultArrow", PlotIrregularShape);

src/service/PlotBase/SvgLoader/element/Element.js

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-04 17:02:07
  * @LastEditors: zk
- * @LastEditTime: 2022-05-16 20:14:26
+ * @LastEditTime: 2022-05-18 12:41:37
  */
 
 /* eslint-disable guard-for-in */

src/service/PlotBase/SvgLoader/element/RegularElement/KidneyArea.js

@@ -1,8 +1,8 @@
 /*
  * @Author: your name
  * @Date: 2021-06-02 15:16:15
- * @LastEditTime: 2022-05-10 17:08:03
- * @LastEditors: Do not edit
+ * @LastEditTime: 2022-05-17 16:18:38
+ * @LastEditors: zk
  * @Description: In User Settings Edit
  * @FilePath: \TypeScript-Babel-Starter\src\Object\RegularElement\RegularSurface.ts
  */