适配

src/CAD/core/additional/calcRoom.js

@@ -244,8 +244,10 @@ export default function calcRoom(data, cad) {
     return walls.map(cid => wall.find(({id}) => cid === id))
   })
 
-  removeBigPolygon()
-  getIncludeFromRoom()
+  console.log(_roomsWalls)
+
+  // removeBigPolygon()
+  // getIncludeFromRoom()
 
   //计算多边形中心
   //后续要修改，应该是重心才合理
@@ -276,13 +278,16 @@ export default function calcRoom(data, cad) {
   data.room = _roomsWalls.map((wall, i) => {
     return {
       wall: wall.map(({id}) => id),
-      ground: _roomsPoints[i].map(({id}) => id),
+      ground: _roomsPoints[i]
     }
   })
 
+  
+
   if (test_debugger) {
     window.testCenterPoints && cad.processing.render.remove(...window.testCenterPoints)
     window.testCenterPoints = _roomsPoints.map(points => {
+      points = points.map(pid => data.vertex.find(({id}) => pid === id))
       let point = getPolygonAreaCenter(points.map(point => ({...point, y: -point.y})))
       let color = Color();
       let epoint = new Point({ fillColor: color, storkeColor: color, x: point.x, y: point.y, renderer: cad.processing.render })
@@ -297,7 +302,6 @@ export default function calcRoom(data, cad) {
         pointData: _roomsWalls[i],
         lineData: _roomsPoints[i]
       }
-      console.log(ground)
     })
   }