xushiting 1 年間 前
コミット
b92eacbe4e

+ 21 - 0
src/view/case/draw/board/editCAD/Controls/MoveBgImage.js

@@ -0,0 +1,21 @@
+import { floorplanService } from '../Service/FloorplanService'
+import { mathUtil } from '../MathUtil.js'
+import { coordinate } from '../Coordinate'
+import Constant from '../Constant'
+
+export default class MoveBgImage {
+    constructor() {
+
+    }
+
+    moveFullBgImage(dx,dy, bgImageId) {
+        let bgImage = floorplanService.getCustomImage(bgImageId)
+        bgImage.center = {
+            x:bgImage.center.x + dx/coordinate.res * Constant.defaultZoom/coordinate.zoom,
+            y:bgImage.center.y - dy/coordinate.res * Constant.defaultZoom/coordinate.zoom,
+        }
+    }
+}
+
+const moveBgImage = new MoveBgImage()
+export { moveBgImage }

+ 8 - 16
src/view/case/draw/board/editCAD/Layer.js

@@ -180,12 +180,14 @@ export default class Layer {
         needAutoRedraw = listenLayer.start(position);
         break;
       case LayerEvents.PanBackGround:
-        // stateService.clearItems()
-        // coordinate.center.x = coordinate.center.x - (dx * Constant.defaultZoom) / coordinate.zoom / coordinate.res
-        // coordinate.center.y = coordinate.center.y + (dy * Constant.defaultZoom) / coordinate.zoom / coordinate.res
-        // this.lastX = X
-        // this.lastY = Y
-        // needAutoRedraw = true
+        break;
+      case LayerEvents.ModifyBgImage:
+        needAutoRedraw = true;
+        if (draggingItem != null) {
+          moveCustomImage.moveFullCustomImage(dx, dy, draggingItem.vectorId);
+          this.lastX = X;
+          this.lastY = Y;
+        }
         break;
       case LayerEvents.AddWall:
         stateService.clearDraggingItem();
@@ -932,9 +934,6 @@ export default class Layer {
       } else if (eventName == LayerEvents.AddTable) {
         stateService.clearEventName();
       } 
-      // else if (eventName == LayerEvents.AddCustomImage) {
-      //   stateService.clearEventName();
-      // }
       else if (
         eventName != LayerEvents.AddWall &&
         eventName != LayerEvents.AddingWall
@@ -974,13 +973,6 @@ export default class Layer {
           stateService.clearItems();
         }
       } 
-      // else if (eventName == LayerEvents.AddCustomImage) {
-      //   if (draggingItem && draggingItem.vectorId) {
-      //     customImageService.deleteCustomImage(draggingItem.vectorId);
-      //     this.uiControl.clearUI();
-      //     stateService.clearItems();
-      //   }
-      // }
     } else {
       stateService.setEventName(LayerEvents.AddWall);
     }

+ 4 - 0
src/view/case/draw/board/editCAD/enum/HistoryEvents.js

@@ -43,6 +43,10 @@ const HistoryEvents = {
     DeleteCustomImage: 'deleteCustomImage',
     ModifyCustomImage: 'modifyCustomImage',
 
+    AddBgImage: 'addBgImage',
+    DeleteBgImage: 'deleteBgImage',
+    ModifyBgImage: 'modifyBgImage',
+
     ModifyTitle: 'modifyTitle',
     ModifyImage: 'modifyImage',
     ModifyCompass: 'modifyCompass',

+ 3 - 0
src/view/case/draw/board/editCAD/enum/LayerEvents.js

@@ -35,6 +35,9 @@ const LayerEvents = {
     AddCustomImage: 'addCustomImage',
     MoveCustomImage: 'moveCustomImage',
 
+    AddBgImage: 'addBgImage',
+    ModifyBgImage: 'modifyBgImage',
+
     AddSign: 'addSign',
     MoveSign: 'moveSign',