【新增】【支持算法符号三角形、折线。修改算法符号默认不填充。】

Author: zhaokai

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

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-15 17:47:45
  * @LastEditors: zk
- * @LastEditTime: 2022-06-23 11:15:37
+ * @LastEditTime: 2022-06-28 09:53:26
  */
 import DrawPoint2D from './DrawPoint2D';
 import DrawPolyline2D from './DrawPolyline2D';
@@ -25,6 +25,8 @@ DrawPlotObjectFactory2D.register('irregular', DrawPolyline2D);
 DrawPlotObjectFactory2D.register('combinationcircle', DrawPolyline2D);
 DrawPlotObjectFactory2D.register('kidney', DrawPolyline2D);
 DrawPlotObjectFactory2D.register('sector', DrawPolyline2D);
+DrawPlotObjectFactory2D.register('pathway',DrawPolyline2D)
+DrawPlotObjectFactory2D.register('triangle',DrawPolyline2D)
 
 DrawPlotObjectFactory2D.register('singlearrow', DrawPolyline2D);
 DrawPlotObjectFactory2D.register('squadarrow', DrawPolyline2D);

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

@@ -3,7 +3,7 @@
  * @Author: zk
  * @Date: 2021-11-15 17:47:45
  * @LastEditors: zk
- * @LastEditTime: 2022-06-23 11:15:15
+ * @LastEditTime: 2022-06-28 09:54:02
  */
 import  {PlotObjectFactory}  from "./PlotObjectFactory";
 import  PlotRegularPoint  from "./RegularShapes/PlotRegularPoint";
@@ -30,6 +30,8 @@ PlotObjectFactory.register('irregular', PlotIrregularShape);
 PlotObjectFactory.register("combinationcircle", PlotIrregularShapeByLatlng);
 PlotObjectFactory.register("kidney", PlotIrregularShape);
 PlotObjectFactory.register("sector", PlotIrregularShape);
+PlotObjectFactory.register('pathway',PlotIrregularShape)
+PlotObjectFactory.register('triangle',PlotIrregularShape)
 
 PlotObjectFactory.register("singlearrow", PlotIrregularShape);
 PlotObjectFactory.register("squadarrow", PlotIrregularShape);

src/service/3DPlot/Draw/DrawPlotObjectFactory3D.js

@@ -4,7 +4,7 @@
  * @Author: zk
  * @Date: 2022-06-13 14:58:40
  * @LastEditors: zk
- * @LastEditTime: 2022-06-23 11:16:19
+ * @LastEditTime: 2022-06-28 09:52:39
  */
 import SimpleFactory from "../../../service/PlotUtilBase/SimpleFactory";
 import DrawPoint from "./DrawPoint";
@@ -26,6 +26,8 @@ DrawPlotObjectFactory3D.register('irregular', DrawPolyline);
 DrawPlotObjectFactory3D.register("combinationcircle", DrawPolyline);
 DrawPlotObjectFactory3D.register("kidney", DrawPolyline);
 DrawPlotObjectFactory3D.register("sector", DrawPolyline);
+DrawPlotObjectFactory3D.register('pathway',DrawPolyline)
+DrawPlotObjectFactory3D.register('triangle',DrawPolyline)
 
 DrawPlotObjectFactory3D.register("singlearrow", DrawPolyline);
 DrawPlotObjectFactory3D.register("squadarrow", DrawPolyline);

src/service/3DPlot/Primitive/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-09-17 16:36:53
- * @LastEditTime: 2022-06-23 11:17:00
+ * @LastEditTime: 2022-06-28 09:53:00
  * @LastEditors: zk
  * @Description: In User Settings Edit
  * @FilePath: \MapGISPlotBase\src\3DPlot\RegularElement.js
@@ -34,6 +34,8 @@ PrimitiveFactory.register('irregular', BaseIrregularPrimitive);
 PrimitiveFactory.register("combinationcircle", BaseIrregularPrimitive);
 PrimitiveFactory.register("kidney", BaseIrregularPrimitive);
 PrimitiveFactory.register("sector", BaseIrregularPrimitive);
+PrimitiveFactory.register('pathway',BaseIrregularPrimitive)
+PrimitiveFactory.register('triangle',BaseIrregularPrimitive)
 
 PrimitiveFactory.register("singlearrow", BaseIrregularPrimitive);
 PrimitiveFactory.register("squadarrow", BaseIrregularPrimitive);

src/service/PlotBase/SvgLoader/element/IrregularElement/BaseIrregularElement.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-18 09:13:48
- * @LastEditTime: 2022-06-23 13:38:41
+ * @LastEditTime: 2022-06-28 10:22:04
  * @LastEditors: zk
  * @Description: In User Settings Edit
  * @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\BaseIrregularElement.js
@@ -37,7 +37,7 @@ export default class BaseIrregularElement extends BasePlotElement {
         const path = document.createElement('path');
         path.setAttribute(
             'style',
-            'fill:#ffff64;fill-opacity:0.70588235;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none'
+            'fill:none;fill-opacity:0.70588235;stroke:#ff0000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none'
         );
         path.setAttribute('id', 'irregular');
         path.setAttribute('d', 'm 200.0,100.0 -200,0');

src/service/PlotBase/SvgLoader/element/IrregularElement/PathwayGeometry.js

@@ -0,0 +1,19 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-09 10:34:29
+ * @LastEditTime: 2022-06-28 09:50:05
+ * @LastEditors: zk
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Kidney.js
+ */
+import BaseIrregularElement from './BaseIrregularElement';
+
+export default class PathwayGeometry extends BaseIrregularElement {
+    constructor(node) {
+        super(node);
+        this.type = 'pathway';
+    }
+    _insertGeometry(points) {
+        return [points];
+    }
+}

src/service/PlotBase/SvgLoader/element/IrregularElement/TriangleGemtry.js

@@ -0,0 +1,26 @@
+/*
+ * @Author: your name
+ * @Date: 2021-11-09 10:34:29
+ * @LastEditTime: 2022-06-28 10:20:51
+ * @LastEditors: zk
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \MapGISPlotBase\src\base\SvgLoader\element\IrregularElement\Kidney.js
+ */
+import BaseIrregularElement from './BaseIrregularElement';
+
+export default class TriangleGemtry extends BaseIrregularElement {
+    constructor(node) {
+        super(node);
+        this.type = 'triangle';
+    }
+    _insertGeometry(points) {
+        if (points.legnth <= 2) {
+            return [points];
+        }
+
+        const pnts = points.slice(0, 3)
+        pnts.push(points[0])
+
+        return [pnts];
+    }
+}

src/service/PlotBase/SvgLoader/element/PropertyClass/BaseCanvasClass/FillStyleClass.js

@@ -2,8 +2,8 @@
  * @Description:
  * @Author: zk
  * @Date: 2022-03-03 15:57:30
- * @LastEditors: Do not edit
- * @LastEditTime: 2022-03-08 10:14:58
+ * @LastEditors: zk
+ * @LastEditTime: 2022-06-28 10:35:07
  */
 import BaseStyleObject from "./BaseStyleObjectClass";
 import Property from "../../Property";
@@ -29,11 +29,19 @@ class FillStyleClass extends BaseStyleObject {
       fillRule;
     // 计算填充样式
     const fillStyleProp = elem.getStyle("fill");
-    if (fillStyleProp.hasValue()) {
-      fillStyleType = 1;
+
+    if (fillStyleProp.hasValue() ) {
+
+      if(fillStyleProp.getString()==='none'){
+        fillStyleType = 0;
+      }else{
+        fillStyleType = 1
+      }
+
       if (fillStyleProp.getString() === "currentColor") {
         fillStyleProp.setValue(elem.getStyle("color").getColor());
       }
+      
       fillStyle = fillStyleProp.getColor();
 
       if (fillStyle === "inherit") {
@@ -59,6 +67,7 @@ class FillStyleClass extends BaseStyleObject {
     }
 
     return style;
+    
   }
 
   getBaseClass() {

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-08-30 22:22:31
- * @LastEditTime: 2022-06-23 11:14:35
+ * @LastEditTime: 2022-06-28 09:52:04
  * @LastEditors: zk
  * @Description: In User Settings Edit
  * @FilePath: \MapGISPlotBase\src\svg-loader\index.js
@@ -40,6 +40,8 @@ import PolygonElement from './PolygonElement';
 import StyleElement from './StyleElement';
 import DefsElement from './DefsElement';
 import BaseIrregularElement from './IrregularElement/BaseIrregularElement';
+import PathwayGeometry from './IrregularElement/PathwayGeometry';
+import TriangleGemtry from './IrregularElement/TriangleGemtry';
 
 
 const drawTypes = ['path', 'mainline', 'tspan', 'mainborder', 'circle','ellipse','rect','line','polyline','polygon','extendline'];
@@ -76,6 +78,8 @@ ElementFactory.register('irregular', BaseIrregularElement);
 ElementFactory.register('combinationcircle', CombinationalCircleGeometry);
 ElementFactory.register('kidney', KidneyGeometry);
 ElementFactory.register('sector', FigureFanGeometry);
+ElementFactory.register('pathway',PathwayGeometry)
+ElementFactory.register('triangle',TriangleGemtry)
 
 ElementFactory.register('singlearrow', SimpleArrowGeometry);
 ElementFactory.register('squadarrow', SquadArrowGeometry);