jinx %!s(int64=2) %!d(string=hai) anos
pai
achega
c651b4717f
Modificáronse 1 ficheiros con 25 adicións e 18 borrados
  1. 25 18
      src/graphic/Controls/UIControl.js

+ 25 - 18
src/graphic/Controls/UIControl.js

@@ -120,13 +120,30 @@ export default class UIControl {
   }
 
   updateVectorForSelectUI(selectUI) {
-    console.log("selectUI", selectUI)
+    console.log('selectUI', selectUI);
     const focusItem = stateService.getFocusItem();
-    if (selectUI == VectorStyle.Bold || selectUI == VectorStyle.Thinning) {
+    // if (selectUI == VectorStyle.Bold || selectUI == VectorStyle.Thinning) {
+    //   if (focusItem.type == VectorType.Line) {
+    //     let Line = dataService.getLine(focusItem.vectorId);
+    //     Line.setStyle(selectUI);
+    //   } else if (focusItem.type == VectorType.RoadEdge) {
+    //     let roadEdge = dataService.getRoadEdge(focusItem.vectorId);
+    //     if (roadEdge) {
+    //       roadEdge.setStyle(selectUI);
+    //     } else {
+    //       roadEdge = dataService.getCurveRoadEdge(focusItem.vectorId);
+    //       roadEdge.setStyle(selectUI);
+    //     }
+    //   }
+    //   this.layer.history.save();
+    //   this.layer.renderer.autoRedraw();
+    // }
+    // else
+    if (uiService.isBelongRoadEdgeStyle(selectUI)) {
       if (focusItem.type == VectorType.Line) {
         let Line = dataService.getLine(focusItem.vectorId);
         Line.setStyle(selectUI);
-      } else if (focusItem.type == VectorType.RoadEdge) {
+      } else {
         let roadEdge = dataService.getRoadEdge(focusItem.vectorId);
         if (roadEdge) {
           roadEdge.setStyle(selectUI);
@@ -135,21 +152,10 @@ export default class UIControl {
           roadEdge.setStyle(selectUI);
         }
       }
+
       this.layer.history.save();
       this.layer.renderer.autoRedraw();
-    }
-    // else if (uiService.isBelongRoadEdgeStyle(selectUI)) {
-    //   let roadEdge = dataService.getRoadEdge(focusItem.vectorId);
-    //   if (roadEdge) {
-    //     roadEdge.setStyle(selectUI);
-    //   } else {
-    //     roadEdge = dataService.getCurveRoadEdge(focusItem.vectorId);
-    //     roadEdge.setStyle(selectUI);
-    //   }
-    //   this.layer.history.save();
-    //   this.layer.renderer.autoRedraw();
-    // }
-    else if (selectUI == VectorEvents.AddLane) {
+    } else if (selectUI == VectorEvents.AddLane) {
       if (focusItem && focusItem.vectorId) {
         stateService.setEventName(VectorEvents.AddLane);
       }
@@ -521,7 +527,8 @@ export default class UIControl {
     uiService.setRoadMidDivideWidth(setting.roadQuarantineWidth / coordinate.res);
     uiService.setCurveRoadMidDivideWidth(setting.roadQuarantineWidth / coordinate.res);
     uiService.setSingleLaneWidth(setting.singleRoadWidth / coordinate.res);
-    uiService.setLineWidth(setting.lineWidth / 1000 / coordinate.res);
+    // uiService.setLineWidth(setting.lineWidth / 1000 / coordinate.res);
+    uiService.setLineWidth(setting.lineWidth);
   }
 
   // 获取默认设置
@@ -532,7 +539,7 @@ export default class UIControl {
     return {
       singleRoadWidth: singleLaneWidth * coordinate.res,
       roadQuarantineWidth: roadMidDivideWidth * coordinate.res,
-      // lineWidth: lineWidth * coordinate.res * 1000,
+      lineWidth: lineWidth * coordinate.res * 1000,
       lineWidth: lineWidth,
     };
   }