【杨琨】【二三维统一绘制工具】

【杨琨】【解决阵地点控制点不足的BUG】

Author: killer1992

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

@@ -10,12 +10,15 @@ import  Point  from "../../PlotUtilBase/Geometry/Point";
 import  {PlotObjectFactory}  from "../Shapes/PlotObjectFactory";
 
 export default class DrawPoint2D extends DrawObject {
-  constructor(fabricCanvas, symbol) {
+  constructor(fabricCanvas, symbol, options) {
     super();
     this.m_fabricCanvas = fabricCanvas;
     this.m_symbol = symbol;
     this.m_coordSys = this.m_fabricCanvas.getCoordSys();
     this.onMouseUp = this.innerOnMouseUp.bind(this);
+    //绘制完成回调函数
+    const {addedPlot} = options;
+    this._addedPlot = addedPlot;
   }
 
   addHooks() {
@@ -44,6 +47,9 @@ export default class DrawPoint2D extends DrawObject {
       this.m_fabricCanvas.add(object);
       this.m_fabricCanvas.requestRenderAll();
       this.fireFinishEvent({ plotObj2D: object });
+      if(this._addedPlot){
+        this._addedPlot(object);
+      }
       this.disable();
     })
 

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

@@ -11,7 +11,7 @@ import { PlotObjectFactory } from '../Shapes/PlotObjectFactory';
 
 const _ = require('lodash');
 export default class DrawPolyline2D extends DrawObject {
-    constructor(fabricCanvas, symbol) {
+    constructor(fabricCanvas, symbol, options) {
         super();
         this.m_fabricCanvas = fabricCanvas;
         this.m_symbol = symbol;
@@ -20,6 +20,9 @@ export default class DrawPolyline2D extends DrawObject {
         this.m_coords = [[0, 0]];
         this.onMouseUp = this.innerOnMouseUp.bind(this);
         this.onMouseMove = _.throttle(this.innerOnMouseMove.bind(this), 30);
+        //绘制完成回调函数
+        const {addedPlot} = options;
+        this._addedPlot = addedPlot;
     }
 
     addHooks() {
@@ -54,6 +57,9 @@ export default class DrawPolyline2D extends DrawObject {
         if (lastPnt && Math.abs(pnt[0] - lastPnt.x) < 1e-4 && Math.abs(pnt[1] - lastPnt.y) < 1e-4) {
             this.fireFinishEvent({ plotObj2D: this.m_object });
             this.m_startDrawing = false;
+            if(this._addedPlot){
+                this._addedPlot(this.m_object);
+            }
             this.disable();
         } else {
             this.m_coords.push(new Point(pnt[0], pnt[1]));

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

@@ -144,22 +144,6 @@ export default class PlotCanvas {
         return this.m_CoordSys;
     }
 
-    /**
-     * @function: Module:PlotCanvas.prototype.DrawSymbol
-     * @description: 绘制工具
-     * @param {*} symbol 符号节点
-     * @return {*}
-     */
-    DrawSymbol(symbol) {
-        if (this.drawTool) {
-            this.drawTool.disable();
-        }
-        this.drawTool = DrawPlotObjectFactory2D.createInstance(symbol.type, this, symbol);
-        if (this.drawTool) {
-            this.drawTool.enable();
-        }
-        return this.drawTool;
-    }
     /**
      * @function: Module:PlotCanvas.prototype.addPlotObjectBy3DPlotObj
      * @description: 根据三维对象添加二维对象

src/service/2DPlot/PlotCanvas.js

@@ -90,7 +90,7 @@ class DrawTool {
      */
     _drawPlot2D(symbol){
         if (!this._drawTool) {
-            this._drawTool = DrawPlotObjectFactory2D.createInstance(symbol.type, this._plotLayer, symbol);
+            this._drawTool = DrawPlotObjectFactory2D.createInstance(symbol.type, this._plotLayer, symbol, this._options);
         }
 
         //开始绘制

src/service/PlotBase/Draw/DrawTool.js

@@ -369,7 +369,7 @@ class BasePlotElement extends SvgElement {
     _setNodeAttr(child, key, value) {
         const {baseSVGAttributes, extendElementAttributes} =
             child.getSaveBaseAttributes();
-        const baseSVGStyleAttributes = child.styleObject.getStyleNameArr();
+        const baseSVGStyleAttributes = this.getStyleObject().getStyleNameArr();
 
         if (baseSVGStyleAttributes.indexOf(key) > -1) {
             child.getStyleObject().setStyle(key, value);