xushiting 2 år sedan
förälder
incheckning
7b76902406
2 ändrade filer med 10 tillägg och 6 borttagningar
  1. 1 1
      server/test/a0k4xu045_202305311600080410/attach/sceneStore
  2. 9 5
      src/graphic/Load.js

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


+ 9 - 5
src/graphic/Load.js

@@ -8,6 +8,7 @@ import Settings from "./Settings";
 import { circleService } from "./Service/CircleService.js";
 import { magnifierService } from "./Service/MagnifierService.js";
 import { textService } from "./Service/TextService.js";
+import { mathUtil } from "./Util/MathUtil.js";
 
 export default class Load {
   constructor(layer) {
@@ -137,11 +138,14 @@ export default class Load {
               VectorCategory.Line.BaseLine
             );
             Settings.baseLineId = baseLine.vectorId;
-
+            const geometryBaseLine = mathUtil.createLine1(
+              dataService.getPoint(baseLine.startId),
+              dataService.getPoint(baseLine.endId)
+            );
             //文字要和基准线的方向一致
-            if (typeof baseLine.a != "undefined") {
-              angle = Math.atan(baseLine.a);
-            } else if (baseLine.hasOwnProperty("x")) {
+            if (typeof geometryBaseLine.a != "undefined") {
+              angle = Math.atan(geometryBaseLine.a);
+            } else if (geometryBaseLine.hasOwnProperty("x")) {
               angle = Math.PI / 2;
             } else {
               angle = 0;
@@ -176,7 +180,7 @@ export default class Load {
             // point.setCategory(VectorCategory.Point.FixPoint);
             let text = textService.create(data3d.fixPoints[i].pos);
             text.setValue(data3d.fixPoints[i].text);
-            text.setAngle(data3d.fixPoints[i].angle || 0);
+            text.setAngle(angle);
           }
         }
       }