继续

src/graphic/Controls/AddCircle.js

@@ -4,8 +4,8 @@ import { listenLayer } from "../ListenLayer";
 
 export default class AddCircle {
   constructor() {
+    this.newCircle = null;
     this.center = null;
-    this.radius = null;
   }
 
   setCenter(value) {
@@ -13,18 +13,28 @@ export default class AddCircle {
     mathUtil.clonePoint(this.center, value);
   }
 
-  setRadius(value) {
-    this.radius = value;
+  buildCircle(position) {
+    if (this.newCircle == null && !mathUtil.equalPoint(this.center, position)) {
+      const radius = mathUtil.getDistance(this.center, position);
+      this.newCircle = circleService.create(this.center, radius);
+    }
   }
 
-  buildCircle() {
-    circleService.create(this.center, this.radius);
-    listenLayer.clear();
+  updateCircle(position) {
+    if (this.newCircle != null && !mathUtil.equalPoint(this.center, position)) {
+      this.newCircle.setRadius(mathUtil.getDistance(this.center, position));
+    }
+  }
+
+  finish(position) {
+    if (this.newCircle != null && mathUtil.equalPoint(this.center, position)) {
+      dataService.deleteLine(this.newLine.vectorId);
+    }
   }
 
   clear() {
+    this.newCircle = null;
     this.center = null;
-    this.radius = null;
   }
 }
 

src/graphic/Controls/AddLine.js

@@ -7,60 +7,62 @@ import { mathUtil } from "../Util/MathUtil";
 
 export default class AddLine {
   constructor() {
+    this.newLine = null;
     this.startInfo = {};
-    this.endInfo = {};
     this.baseLineId = null;
     this.category = VectorCategory.Line.NormalLine;
   }
 
-  setPointInfo(dir, pointInfo) {
-    if (dir == "start") {
-      this.startInfo = {
-        position: {
-          x: pointInfo.x,
-          y: pointInfo.y,
-        },
-        linkedPointId: pointInfo.linkedPointId,
-        lineId: pointInfo.lineId,
-      };
-    } else if (dir == "end") {
-      this.endInfo = {
-        position: {
-          x: pointInfo.x,
-          y: pointInfo.y,
-        },
-        linkedPointId: pointInfo.linkedPointId,
-        lineId: pointInfo.lineId,
-      };
+  setPointInfo(pointInfo) {
+    this.startInfo = {
+      position: {
+        x: pointInfo.x,
+        y: pointInfo.y,
+      },
+      linkedPointId: pointInfo.linkedPointId,
+      lineId: pointInfo.lineId,
+    };
+  }
+
+  setNewLinePoint(position) {
+    if (listenLayer.modifyPoint) {
+      this.setPointInfo(listenLayer.modifyPoint);
+    } else {
+      this.setPointInfo(position);
+    }
+    return true;
+  }
+
+  buildLine(position) {
+    if (
+      this.newLine == null &&
+      !mathUtil.equalPoint(this.startInfo.position, position)
+    ) {
+      this.newLine = lineService.create(
+        this.startInfo.position,
+        position,
+        this.category
+      );
     }
   }
 
-  setNewLinePoint(dir, position) {
-    if (dir == "start") {
-      if (listenLayer.modifyPoint) {
-        this.setPointInfo(dir, listenLayer.modifyPoint);
-      } else {
-        this.setPointInfo(dir, position);
-      }
-      return true;
-    } else if (dir == "end") {
-      if (listenLayer.modifyPoint) {
-        this.setPointInfo(dir, listenLayer.modifyPoint);
-      } else {
-        this.setPointInfo(dir, position);
-      }
-      return true;
+  updateLine(position) {
+    if (
+      this.newLine != null &&
+      !mathUtil.equalPoint(this.startInfo.position, position)
+    ) {
+      let point = dataService.getPoint(this.newLine.endId);
+      point.setPosition(position);
     }
-    return false;
   }
 
-  buildLine() {
-    lineService.create(
-      this.startInfo.position,
-      this.endInfo.position,
-      this.category
-    );
-    listenLayer.clear();
+  finish(position) {
+    if (
+      this.newLine != null &&
+      mathUtil.equalPoint(this.startInfo.position, position)
+    ) {
+      dataService.deleteLine(this.newLine.vectorId);
+    }
   }
 
   setCategory(value) {
@@ -76,8 +78,10 @@ export default class AddLine {
   }
 
   clear() {
+    this.newLine = null;
     this.startInfo = {};
-    this.endInfo = {};
+    this.baseLineId = null;
+    this.category = VectorCategory.Line.NormalLine;
   }
 }
 

src/graphic/Controls/UIControl.js

@@ -143,11 +143,7 @@ export default class UIControl {
 
     const historyState = historyService.getHistoryState();
     this.graphicStateUI.canRevoke = historyState.pre;
-    // if (historyState.pre) {
-    //     this.layer.$xui.toolbar.recall = true
-    // } else {
-    //     this.layer.$xui.toolbar.recall = false
-    // }
+    this.graphicStateUI.canRecovery = true;
 
     this.layer.stopAddVector();
     this.layer.renderer.autoRedraw();
@@ -161,12 +157,7 @@ export default class UIControl {
     const historyState = historyService.getHistoryState();
     this.graphicStateUI.canRecovery = historyState.next;
     this.graphicStateUI.canRevoke = true;
-    // if (historyState.next) {
-    //   this.layer.$xui.toolbar.recover = true;
-    // } else {
-    //   this.layer.$xui.toolbar.recover = false;
-    // }
-    // this.layer.$xui.toolbar.recall = true;
+
     this.layer.stopAddVector();
     this.layer.renderer.autoRedraw();
     this.layer.recoveryHistory();
@@ -174,7 +165,6 @@ export default class UIControl {
 
   menu_backgroundImg(value) {
     //
-    this.graphicStateUI.canRevoke = !value;
   }
 
   menu_clear() {

src/graphic/Layer.js

@@ -119,7 +119,7 @@ export default class Layer {
         break;
       case LayerEvents.AddLine:
         stateService.setEventName(LayerEvents.AddingLine);
-        addLine.setNewLinePoint("start", position);
+        addLine.setNewLinePoint(position);
         break;
       case LayerEvents.AddCircle:
         stateService.setEventName(LayerEvents.AddingCircle);
@@ -296,7 +296,13 @@ export default class Layer {
         break;
       case LayerEvents.AddingLine:
         needAutoRedraw = true;
-        listenLayer.start(position);
+        let exceptLineId = null;
+        if (addLine.newLine != null) {
+          exceptLineId = addLine.newLine.vectorId;
+        }
+        listenLayer.start(position, {
+          exceptLineId: exceptLineId,
+        });
         if (listenLayer.modifyPoint) {
           position = {
             x: listenLayer.modifyPoint.x,
@@ -308,11 +314,20 @@ export default class Layer {
         elementService.setNewLine(addLine.startInfo.position, position);
         elementService.setNewLineCategory(VectorCategory.Line.NormalLine);
         elementService.showNewLine();
-        addLine.setNewLinePoint("end", position);
+
+        if (addLine.newLine == null) {
+          addLine.buildLine(position);
+        } else {
+          addLine.updateLine(position);
+        }
         break;
       case LayerEvents.AddingCircle:
         needAutoRedraw = true;
-        listenLayer.start(position);
+        let exceptCircleId = null;
+        if (addCircle.newCircle != null) {
+          exceptCircleId = addCircle.newCircle.vectorId;
+        }
+        listenLayer.start(position, { exceptCircleId: exceptCircleId });
         if (listenLayer.modifyPoint) {
           position = {
             x: listenLayer.modifyPoint.x,
@@ -321,7 +336,11 @@ export default class Layer {
         }
         elementService.execute(addCircle.center, position);
         elementService.setPoint(position);
-        addCircle.setRadius(mathUtil.getDistance(addCircle.center, position));
+        if (addCircle.newCircle == null) {
+          addCircle.buildCircle(position);
+        } else {
+          addCircle.updateCircle(position);
+        }
         break;
       case LayerEvents.MoveRoad:
         needAutoRedraw = true;
@@ -648,14 +667,14 @@ export default class Layer {
         break;
       case LayerEvents.AddingLine:
         needAutoRedraw = true;
-        addLine.buildLine();
+        addLine.finish(position);
         addLine.clear();
         this.history.save();
         elementService.hideAll();
         break;
       case LayerEvents.AddingCircle:
         needAutoRedraw = true;
-        addCircle.buildCircle();
+        addCircle.finish(position);
         addCircle.clear();
         this.history.save();
         elementService.hideAll();