kitchen-simulator 3.1.10 → 3.1.12

package/es/utils/molding.js

@@ -5,11 +5,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-import { BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, EPSILON, MIDDLE_MOLDING_LOCATION, MOLDING_LOCATIONS, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_SAME, OVERLAP_SOME, TALL_CABINET_LAYOUTPOS, TOP_MOLDING_LOCATION, WALL_CABINET_LAYOUTPOS } from "../constants";
+import { BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, EPSILON, MIDDLE_MOLDING_LOCATION, MOLDING_LOCATIONS, OVERLAP_INCLUDED, OVERLAP_LINK, OVERLAP_SAME, OVERLAP_SOME, TALL_CABINET_LAYOUTPOS, TOE_KICK_MOLDING, TOP_MOLDING_LOCATION, WALL_CABINET_LAYOUTPOS } from "../constants";
 import * as Three from 'three';
 import { convert } from "./convert-units-lite";
 import IDBroker from "./id-broker";
-import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
+import { getToeKickSKU, isEqualInstallationType, returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
 import { GeometryUtils } from "./export";
 import { isEmpty } from "./helper";
 export function getItemRect(item) {
@@ -866,4 +866,236 @@ export function createMonldingGroup(oldMG, layer, molding, catalog) {
   newMG.lines.reverse();
   newMG = getMDPoints(newMG);
   return newMG;
+}
+export function getMoldingDataOfScene(layer, catalog, doorStyle) {
+  var moldingData = [];
+  var items = layer.items.toArray();
+  var moldings = [];
+  // get all moldings info
+  items.forEach(function (itemCat) {
+    var _itemCat$molding;
+    itemCat === null || itemCat === void 0 || (_itemCat$molding = itemCat.molding) === null || _itemCat$molding === void 0 || _itemCat$molding.forEach(function (molding) {
+      if (!moldings.some(function (m) {
+        return m.name === molding.name;
+      })) moldings.push(molding);
+    });
+  });
+
+  // calc normal molding
+  moldings.forEach(function (molding) {
+    var itemGroups = [];
+    var temp_items = [];
+    items.forEach(function (item) {
+      if (item.molding.some(function (mol) {
+        return mol.itemID === molding.itemID;
+      }) && isEnableItemForMolding(layer, item)) {
+        temp_items.push(item);
+      }
+    });
+    if (temp_items.length) {
+      while (temp_items.length > 0) {
+        var itemGroup = [temp_items[0]];
+        var _loop9 = function _loop9(_idx) {
+          if (!itemGroup.some(function (it) {
+            return it.id === temp_items[_idx].id;
+          }) && isItemSnappedGroup(temp_items[_idx], itemGroup)) {
+            itemGroup.push(temp_items[_idx]);
+            _idx = 0;
+          }
+          idx = _idx;
+        };
+        for (var idx = 0; idx < temp_items.length; idx++) {
+          _loop9(idx);
+        }
+        itemGroup.forEach(function (item) {
+          var index = temp_items.findIndex(function (it) {
+            return it.id === item.id;
+          });
+          if (index > -1) {
+            temp_items.splice(index, 1);
+          }
+        });
+        itemGroups.push(itemGroup);
+      }
+      var molding_totalLength = 0;
+      itemGroups.forEach(function (itemgroup) {
+        var allLineRects = GeometryUtils.buildRectFromLines(layer, GeometryUtils.getAllLines(layer));
+        var items = _toConsumableArray(itemgroup);
+        var MGlines = getLinesOfItem(items[0], allLineRects, catalog);
+        items = sortItemsByDistance(items, items[0]);
+        var _loop0 = function _loop0() {
+          var itemLines = getLinesOfItem(items[i], allLineRects, catalog);
+          var temp_MGLines = [];
+          MGlines.forEach(function (line) {
+            var idx = itemLines.findIndex(function (itemLine) {
+              return isLinesOverlapped(line, itemLine);
+            });
+            var curItemLine = itemLines[idx];
+            if (idx > -1) {
+              if (!(GeometryUtils.samePoints(line[0], curItemLine[0]) && GeometryUtils.samePoints(line[1], curItemLine[1]) || GeometryUtils.samePoints(line[0], curItemLine[1]) && GeometryUtils.samePoints(line[1], curItemLine[0]))) {
+                var MGLine = mergeOverlappedLines(line, curItemLine);
+                temp_MGLines.push(MGLine);
+              }
+              itemLines.splice(idx, 1);
+            } else {
+              temp_MGLines.push(line);
+            }
+          });
+          itemLines.forEach(function (itemLine) {
+            return temp_MGLines.push(itemLine);
+          });
+          MGlines = [].concat(temp_MGLines);
+        };
+        for (var i = 1; i < items.length; i++) {
+          _loop0();
+        }
+        MGlines.forEach(function (line) {
+          molding_totalLength += GeometryUtils.verticesDistance(line[0], line[1]);
+        });
+      });
+      molding_totalLength = convert(molding_totalLength).from('cm').to('in');
+      moldingData.push(_objectSpread(_objectSpread({}, molding), {}, {
+        doorStyle: doorStyle,
+        count: Math.ceil(molding_totalLength * 1.1 / 96)
+      }));
+    }
+  });
+
+  // calc toe kick molding
+  var tmp = [];
+  items.forEach(function (item) {
+    if (item.category === 'cabinet' && !item.cabinet_category.toLowerCase().includes('microwave')) {
+      tmp.push(item);
+    }
+  });
+  var tmpMoldingData = [];
+  var toedoorStyles = [];
+  tmp.map(function (item) {
+    var _item$molding;
+    if (item.layoutpos === BASE_CABINET_LAYOUTPOS && (isEmpty(item.molding) || ((_item$molding = item.molding) === null || _item$molding === void 0 ? void 0 : _item$molding.length) < 1 || !isEnableItemForMolding(layer, item))) {
+      var w = item.properties.get('width').get('_length');
+      var wUnit = item.properties.get('width').get('_unit') || 'cm';
+      w = convert(w / 2).from(wUnit).to('cm');
+      var h = item.properties.get('depth').get('_length');
+      var hUnit = item.properties.get('depth').get('_unit') || 'cm';
+      h = convert(h / 2).from(hUnit).to('cm');
+      var outline = null;
+      var element = catalog.elements[item.get('type')];
+      if (!element) element = catalog.elements[returnReplaceableDeepSearchType(item.get('type'))];
+      outline = element.info.outline;
+      var len = 0;
+      if (outline) {
+        // Extract Points from `outline`
+        var outlinePaths = outline.paths;
+        var outlineWidth = outline.svgWidth;
+        var outlineHeight = outline.svgHeight;
+        var outlinePoints = []; // Hold Points Of SVG
+        var _iterator3 = _createForOfIteratorHelper(outlinePaths),
+          _step3;
+        try {
+          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+            var path = _step3.value;
+            var _iterator4 = _createForOfIteratorHelper(path.subPaths),
+              _step4;
+            try {
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                var subPath = _step4.value;
+                outlinePoints = outlinePoints.concat(subPath.getPoints());
+              }
+            } catch (err) {
+              _iterator4.e(err);
+            } finally {
+              _iterator4.f();
+            }
+          }
+        } catch (err) {
+          _iterator3.e(err);
+        } finally {
+          _iterator3.f();
+        }
+        var maxX = outlinePoints[0].x,
+          minX = outlinePoints[0].x;
+        var maxY = outlinePoints[0].y,
+          minY = outlinePoints[0].y;
+        outlinePoints.forEach(function (point) {
+          if (point.x > maxX) {
+            maxX = point.x;
+          }
+          if (point.x < minX) {
+            minX = point.x;
+          }
+          if (point.y > maxY) {
+            maxY = point.y;
+          }
+          if (point.y < minY) {
+            minY = point.y;
+          }
+        });
+        outlinePoints.forEach(function (point) {
+          if (GeometryUtils.isPointInRect([{
+            x: minX,
+            y: minY
+          }, {
+            x: minX,
+            y: maxY
+          }, {
+            x: maxX,
+            y: maxY
+          }, {
+            x: maxX,
+            y: minY
+          }], point)) {
+            if (point.x > 10) len += (point.x / outlineWidth - 0.5) * w * 2 + h * 2 - (point.y / outlineHeight - 0.5) * h * 2;
+          }
+        });
+        len = convert(len).from('cm').to('in');
+      } else {
+        w = convert(w * 2).from('cm').to('in');
+        len += w;
+      }
+      var doorIndex = toedoorStyles.findIndex(function (a) {
+        var iDS = item === null || item === void 0 ? void 0 : item.doorStyle;
+        if (!iDS) return false;
+        if (!iDS.hasOwnProperty('id')) {
+          iDS = iDS.toJS();
+        }
+        return a.doorStyle.id === iDS.id && isEqualInstallationType(a.doorStyle, iDS);
+      });
+      if (doorIndex > -1) {
+        toedoorStyles[doorIndex].totalLength += len;
+      } else {
+        toedoorStyles.push({
+          doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : item.doorStyle && item.doorStyle.toJS(),
+          totalLength: len
+        });
+      }
+    }
+  });
+  toedoorStyles.forEach(function (doorStyle) {
+    var skuName = getToeKickSKU(doorStyle.doorStyle, catalog);
+    var thumbnail = skuName ? skuName : '';
+    // moldings.forEach(molding => {
+    //   if (
+    //     molding.name ===
+    //     getToeKickSKU(
+    //       doorStyle.doorStyle,
+    //       catalog,
+    //       true
+    //     )
+    //   )
+    //     thumbnail = molding.thumbnail;
+    // });
+
+    doorStyle.totalLength && tmpMoldingData.push({
+      name: TOE_KICK_MOLDING,
+      sku: getToeKickSKU(doorStyle.doorStyle, catalog),
+      thumbnail: thumbnail,
+      category: 'molding',
+      type: 'cabinet',
+      doorStyle: doorStyle.doorStyle,
+      count: Math.ceil(doorStyle.totalLength * 1.1 / 96)
+    });
+  });
+  if (tmpMoldingData.length > 0) moldingData = [].concat(_toConsumableArray(moldingData), tmpMoldingData);
+  return moldingData;
 }

package/lib/components/viewer2d/item.js

@@ -286,10 +286,18 @@ function Item(_ref, _ref2) {
   var cat = catalog.elements[catid];
   PointArray.forEach(function (pointElement, index) {
     if (pointElement[0] == undefined) PointArray[index][0] = 0;
-    if (pointElement[1] === -90 && cat.info.is_corner !== 1) {
-      PointArray[index][0] -= 4;
-    }
+    // if (pointElement[1] === -90 && cat.info.is_corner !== 1) {
+    //   PointArray[index][0] -= 4;
+    // }
+  });
+  var cnt = 0;
+  PointArray.forEach(function (pointElement) {
+    if (pointElement[0] == 0) cnt++;
   });
+  if (cnt == 4 || cnt == 3) {
+    PointArray[0][0] = 100;
+    PointArray[1][0] = 100;
+  }
   if (Array.isArray(PointArray)) {
     itemsActions.storeDistArray(layerID, id, PointArray);
   }

package/lib/components/viewer3d/viewer3d.js

@@ -1193,12 +1193,12 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
         if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.isEmpty)(evtElement)) {
-          var _currentObject, _this2$props$onIntern, _this2$props;
+          var _this2$props$onIntern, _this2$props;
           var payload = evtElement === null || evtElement === void 0 ? void 0 : evtElement.toJS();
-          if (((_currentObject = currentObject) === null || _currentObject === void 0 ? void 0 : _currentObject.prototype) === 'lines') {
+          if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'lines') {
             // caculating length of selected line//
-            var v_a = layer.vertices.get(currentObject.vertices.get(0));
-            var v_b = layer.vertices.get(currentObject.vertices.get(1));
+            var v_a = layer.vertices.get(evtElement.vertices.get(0));
+            var v_b = layer.vertices.get(evtElement.vertices.get(1));
             var distance = _export.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
             var _length = (0, _convertUnitsLite.convert)(distance).from('cm').to('in');
             payload.length = _length;
@@ -1302,7 +1302,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             if (intersects[_i1] === undefined) {
               if (transflag !== 0 && transflag !== 2) {
                 isSelected = false;
-                // this.context.projectActions.unselectAll();
+                _this2.context.projectActions.unselectAll();
                 scene3D.remove(toolObj);
                 _this2.context.itemsActions.removeReplacingSupport();
                 return;
@@ -1369,16 +1369,11 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
               if (selectedFlag || toolIntersects.length > 0 && !(0, _helper.isElevationView)(mode)) {
                 cameraControls.mouseButtons.left = _cameraControls["default"].ACTION.NONE;
                 selectedFlag = false;
-              } else {
-                isSelected = false;
-                // this.context.projectActions.unselectAll();
-                scene3D.remove(toolObj);
-                _this2.context.itemsActions.removeReplacingSupport();
               }
             }
           } else {
             isSelected = false;
-            // this.context.projectActions.unselectAll();
+            _this2.context.projectActions.unselectAll();
             scene3D.remove(toolObj);
             _this2.context.itemsActions.removeReplacingSupport();
             return;
@@ -1397,7 +1392,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
           altitude = (0, _convertUnitsLite.convert)(altitude).from(unit).to(_this2.props.state.scene.unit);
         }
         scene3D.remove(angleObj);
-        scene3D.remove(toolObj);
+        // scene3D.remove(toolObj);
         if (!_this2.props.downloadFlag && !_this2.props.state.mode.includes('ING')) {
           _this2.props.setToolbar('');
         }
@@ -1536,22 +1531,12 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                     toolObj: toolObj
                   });
                   // showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
-                  var pointArray = [],
-                    cnt = 0;
-                  pointArray.push([_sceneCreator.fVLine[0].userData.distance, 90]);
-                  pointArray.push([_sceneCreator.fVLine[1].userData.distance, -90]);
-                  pointArray.push([_sceneCreator.fVLine[2].userData.distance, 180]);
-                  pointArray.push([_sceneCreator.fVLine[3].userData.distance, 0]);
-                  pointArray.forEach(function (pointElement, index) {
-                    if (pointElement[0] == undefined) pointArray[index][0] = 0;
-                  });
-                  pointArray.forEach(function (pointElement) {
-                    if (pointElement[0] == 0) cnt++;
-                  });
-                  if (cnt == 4 || cnt == 3) {
-                    pointArray[0][0] = 100;
-                    pointArray[1][0] = 100;
-                  }
+                  var pointArray = [];
+                  // pointArray.push([fVLine[0].userData.distance, 90]);
+                  // pointArray.push([fVLine[1].userData.distance, -90]);
+                  // pointArray.push([fVLine[2].userData.distance, 180]);
+                  // pointArray.push([fVLine[3].userData.distance, 0]);
+                  pointArray = _export.GeometryUtils.calcDistancesFromItemToWalls(selectedElement, layer).PointArray;
                   actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
                   internalType = internalType ? internalType : _constants.INTERNAL_EVENT_SELECT_ELEMENT;
                   sendInternalEvent(internalType, selectedElement, pointArray);
@@ -1564,6 +1549,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                     case 'holeID' in selectedObject:
                       elementID = selectedObject.holeID;
                       elementPrototype = 'holes';
+                      scene3D.remove(toolObj);
                       if (_this2.props.state.mode === _constants.MODE_DRAGGING_HOLE_3D) {
                         actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
                       }
@@ -1571,10 +1557,12 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                     case 'lineID' in selectedObject:
                       elementID = selectedObject.lineID;
                       elementPrototype = 'lines';
+                      scene3D.remove(toolObj);
                       break;
                     case 'areaID' in selectedObject:
                       elementID = selectedObject.areaID;
                       elementPrototype = 'areas';
+                      scene3D.remove(toolObj);
                       break;
                     default:
                       break;
@@ -1584,8 +1572,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                 isSelected = false;
               }
             } else {
-              isSelected = false;
-              _this2.context.projectActions.unselectAll();
+              // isSelected = false;
+              // this.context.projectActions.unselectAll();
               switch (true) {
                 case 'holeID' in selectedObject:
                   actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
@@ -1595,6 +1583,13 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
                   break;
               }
             }
+            var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+            if (selectedItem) {
+              selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
+              var itemPos = selectedItem.position.clone();
+              toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
+              scene3D.add(toolObj);
+            }
             bMove = false;
             bRotate = false;
             bMoveUP = false;
@@ -1614,14 +1609,14 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             getPoint(event, alti);
             if (bRotate) {
               var _intersects$_i;
-              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(selectedItem)) return;
+              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if ((0, _util.isUndefined)(_selectedItem)) return;
               selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-              var itemPos = selectedItem.position.clone();
-              if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === selectedItem.userData.itemId) {
+              var _itemPos = _selectedItem.position.clone();
+              if (((_intersects$_i = intersects[_i10]) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.object) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.parent) === null || _intersects$_i === void 0 || (_intersects$_i = _intersects$_i.userData) === null || _intersects$_i === void 0 ? void 0 : _intersects$_i.itemId) === _selectedItem.userData.itemId) {
                 toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
               } else {
-                toolObj.position.set(planData.plan.position.x + itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + selectedItem.children[0].position.y, planData.plan.position.z + itemPos.z);
+                toolObj.position.set(planData.plan.position.x + _itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
               }
               scene3D.add(toolObj);
               _this2.setState({
@@ -1632,14 +1627,14 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             }
             if (bMove) {
               bMove = false;
-              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if ((0, _util.isUndefined)(_selectedItem)) return;
+              var _selectedItem2 = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if ((0, _util.isUndefined)(_selectedItem2)) return;
               selectedElement = _this2.props.state.scene.layers.get(selectedObject.layerID).items.get(selectedObject.itemID);
-              var _itemPos = _selectedItem.position.clone();
-              if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem.userData.itemId) {
+              var _itemPos2 = _selectedItem2.position.clone();
+              if (intersects[_i10].object.parent.parent.userData.itemId === _selectedItem2.userData.itemId) {
                 toolObj.position.set(intersects[_i10].point.x, intersects[_i10].point.y, intersects[_i10].point.z);
               } else {
-                toolObj.position.set(planData.plan.position.x + _itemPos.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem.children[0].position.y, planData.plan.position.z + _itemPos.z);
+                toolObj.position.set(planData.plan.position.x + _itemPos2.x, selectedElement.category === 'lighting' ? -planData.plan.position.y - selectedElement.properties.get('height').get('length') : planData.plan.position.y + _selectedItem2.children[0].position.y, planData.plan.position.z + _itemPos2.z);
               }
               scene3D.add(toolObj);
               _this2.setState({

package/lib/utils/geometry.js

@@ -2559,31 +2559,13 @@ function getCalcRectFromItem2(itemInfo) {
   var m3y = y + h * Math.cos(rotRad);
   var m1x = x + h * Math.sin(rotRad);
   var m1y = y - h * Math.cos(rotRad);
-  var x0 = mx + h * Math.sin(rotRad);
-  var y0 = my - h * Math.cos(rotRad);
-  var x3 = mx * 2 - x0;
-  var y3 = my * 2 - y0;
-  var x1 = x * 2 - x3;
-  var y1 = y * 2 - y3;
-  var x2 = x * 2 - x0;
-  var y2 = y * 2 - y0;
   return {
     rectCenterPoint: [[point(mx, my), 180], [point(m1x, m1y), -90], [point(m2x, m2y), 0], [point(m3x, m3y), 90]]
   };
 }
-function getAllItems2(layer, catalog) {
+function getAllItems2(curItem, layer) {
   var rectarray = [];
-  var currentItem;
-  var selectedItem;
-  if (layer.selected.items.size > 0) {
-    selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
-    var catid = selectedItem.type;
-    var cat = findCatalogElement(catalog, catid);
-    currentItem = {
-      selectedItem: selectedItem,
-      cat: cat
-    };
-  }
+  var tempHeight = curItem.get('properties').get('depth');
   layer.items.forEach(function (item) {
     var val = {
       pos: {
@@ -2592,27 +2574,14 @@ function getAllItems2(layer, catalog) {
       },
       rotRad: item.rotation / 180 * Math.PI
     };
-    var catid = item.type;
-    var cat = findCatalogElement(catalog, catid);
     var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to('cm');
     var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to('cm');
-    // let width = cat.info.sizeinfo.width;
-    // let height = cat.info.sizeinfo.depth;
     val.size = {
       width: width,
       height: height
     };
-    var otherItem = {
-      item: item,
-      cat: cat
-    };
-
-    // if (!GeometryUtils.needSnap(currentItem, otherItem)) {
-    //   return;
-    // }
-
-    if (!item.selected) {
-      var detectObjectsAtSameAltitudeFlag = layoutpos === 'Base' ? item.properties.getIn(['altitude', '_length']) <= altitude + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= altitude;
+    if (curItem.get('id') !== item.id) {
+      var detectObjectsAtSameAltitudeFlag = item.layoutpos === 'Base' ? item.properties.getIn(['altitude', '_length']) <= curItem.get('properties').getIn(['altitude', '_length']) + tempHeight.get('_length') : item.properties.getIn(['altitude', '_length']) + item.properties.getIn(['height', '_length']) >= curItem.get('properties').getIn(['altitude', '_length']);
       if (detectObjectsAtSameAltitudeFlag) {
         var x = val.pos.x;
         var y = val.pos.y;
@@ -2644,62 +2613,22 @@ function getAllItems2(layer, catalog) {
       }
     }
   });
-
-  // layer.holes.forEach(hole => {
-  //   let val = {pos:{x:hole.x, y:hole.y}, rotRad:hole.rotation};
-  //   let catid = hole.type;
-  //   let cat = catalog.elements[catid];
-  //   let width = hole.properties.getIn(['width']).getIn(['length']);
-  //   let height = hole.properties.getIn(['height']).getIn(['length']);
-  //   val.size = {width, height};
-  //   let otherItem = {
-  //     hole,
-  //     cat
-  //   }
-
-  //   // if (!GeometryUtils.needSnap(currentItem, otherItem)) {
-  //   //   return;
-  //   // }
-
-  //   if (!hole.selected) {
-  //     let x = val.pos.x;
-  //     let y = val.pos.y;
-  //     let rotRad = val.rotRad;
-  //     let w = val.size.width / 2;
-  //     let mx = x - w * Math.cos(rotRad);
-  //     let my = y - w * Math.sin(rotRad);
-  //     let kx = x + w * Math.cos(rotRad);
-  //     let ky = y + w * Math.sin(rotRad);
-  //     let x0 = mx - 10 * Math.sin(rotRad);
-  //     let y0 = my + 10 * Math.cos(rotRad);
-  //     let x3 = mx + 10 * Math.sin(rotRad);
-  //     let y3 = my - 10 * Math.cos(rotRad);
-  //     let x1 = kx - 10 * Math.sin(rotRad);
-  //     let y1 = ky + 10 * Math.cos(rotRad);
-  //     let x2 = kx + 10 * Math.sin(rotRad);
-  //     let y2 = ky - 10 * Math.cos(rotRad);
-  //     rectarray.push({'rect':[point(x0,y0), point(x1,y1) ,point(x0,y0), point(x1,y1)]});
-  //     rectarray.push({'rect':[point(x1,y1), point(x2,y2), point(x1,y1), point(x2,y2)]}); // right
-  //     rectarray.push({'rect':[point(x2,y2), point(x3,y3), point(x2,y2), point(x3,y3)]}); // front
-  //     rectarray.push({'rect':[point(x3,y3), point(x0,y0), point(x3,y3), point(x0,y0)]}); // left
-  //   }
-  // });
   return {
     others: rectarray
   };
 }
-function calcDistancesFromItemToWalls(attributesFormData, layer, catalog) {
-  if ((0, _helper.isEmpty)(attributesFormData)) return [];
-  var x = attributesFormData.get('x');
-  var y = attributesFormData.get('y');
-  var rotRad = attributesFormData.get('rotation') / 180 * Math.PI;
+function calcDistancesFromItemToWalls(curItem, layer) {
+  if ((0, _helper.isEmpty)(curItem)) return [];
+  var x = curItem.get('x');
+  var y = curItem.get('y');
+  var rotRad = curItem.get('rotation') / 180 * Math.PI;
   var width, height;
-  if (attributesFormData.get('properties').get('width') || attributesFormData.get('properties').get('depth')) {
-    width = (0, _convertUnitsLite.convert)(attributesFormData.get('properties').get('width').get('_length')).from(attributesFormData.get('properties').get('width').get('_unit')).to('cm');
-    height = (0, _convertUnitsLite.convert)(attributesFormData.get('properties').get('depth').get('_length')).from(attributesFormData.get('properties').get('depth').get('_unit')).to('cm');
+  if (curItem.get('properties').get('width') || curItem.get('properties').get('depth')) {
+    width = (0, _convertUnitsLite.convert)(curItem.get('properties').get('width').get('_length')).from(curItem.get('properties').get('width').get('_unit')).to('cm');
+    height = (0, _convertUnitsLite.convert)(curItem.get('properties').get('depth').get('_length')).from(curItem.get('properties').get('depth').get('_unit')).to('cm');
   } else {
-    width = (0, _convertUnitsLite.convert)(attributesFormData.info.sizeinfo.width).from('in').to('cm');
-    height = (0, _convertUnitsLite.convert)(attributesFormData.info.sizeinfo.depth).from('in').to('cm');
+    width = (0, _convertUnitsLite.convert)(curItem.info.sizeinfo.width).from('in').to('cm');
+    height = (0, _convertUnitsLite.convert)(curItem.info.sizeinfo.depth).from('in').to('cm');
   }
   var center_h = 3 * height / 8;
   var center_x = x;
@@ -2719,7 +2648,7 @@ function calcDistancesFromItemToWalls(attributesFormData, layer, catalog) {
     height: height
   };
   var curiteminfo = getCalcRectFromItem2(itemInfo);
-  var allItemRect = getAllItems2(layer, catalog);
+  var allItemRect = getAllItems2(curItem, layer);
   var allLines = getAllLines(layer);
   var allLineRects = buildRectFromLines(layer, allLines);
   var allRect = allLineRects.concat(allItemRect.others);
@@ -2745,6 +2674,17 @@ function calcDistancesFromItemToWalls(attributesFormData, layer, catalog) {
     });
     PointArray.push([a, centerpoint[1]]);
   });
+  PointArray.forEach(function (pointElement, index) {
+    if (pointElement[0] == undefined) PointArray[index][0] = 0;
+  });
+  var cnt = 0;
+  PointArray.forEach(function (pointElement) {
+    if (pointElement[0] == 0) cnt++;
+  });
+  if (cnt == 4 || cnt == 3) {
+    PointArray[0][0] = 100;
+    PointArray[1][0] = 100;
+  }
   return {
     PointArray: PointArray
   };