kitchen-simulator 3.13.0 → 3.14.0

package/lib/utils/molding.js

@@ -12,7 +12,9 @@ exports.getItemRect = getItemRect;
 exports.getLinesFromItems = getLinesFromItems;
 exports.getLinesFromItems2 = getLinesFromItems2;
 exports.getLinesOfItem = getLinesOfItem;
+exports.getLinesOfItem2 = getLinesOfItem2;
 exports.getMoldingDataOfScene = getMoldingDataOfScene;
+exports.getMoldingDataOfScene2 = getMoldingDataOfScene2;
 exports.hasMoldingLayout = hasMoldingLayout;
 exports.isAttachedWall = isAttachedWall;
 exports.isEnableItemForMolding = isEnableItemForMolding;
@@ -331,6 +333,74 @@ function getLinesOfItem(item, allLineRects, catalog) {
   }
   return lines;
 }
+function getLinesOfItem2(item, allLineRects, catalog) {
+  var lines = [];
+  var outline = null;
+  var element = catalog.elements[item.get('type')];
+  if (!element) element = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(item.get('type'))];
+  // get edge lines
+  var newWidth = item.properties.get('width').get('_length');
+  var wUnit = item.properties.get('width').get('_unit') || 'cm';
+  newWidth = (0, _convertUnitsLite.convert)(newWidth).from(wUnit).to('cm');
+  var newDepth = item.properties.get('depth').get('_length');
+  var hUnit = item.properties.get('depth').get('_unit') || 'cm';
+  newDepth = (0, _convertUnitsLite.convert)(newDepth).from(hUnit).to('cm');
+  if (item) {
+    // Get Outline Data of Selected Item
+    outline = element.info.outline;
+    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();
+      }
+      outline.reverse && outlinePoints.reverse();
+      for (var i = 0; i < outlinePoints.length - 1; i++) {
+        lines.push([_export.GeometryUtils.rotatePointAroundPoint((outlinePoints[i].x / outlineWidth - 0.5) * newWidth + item.x, (outlinePoints[i].y / outlineHeight - 0.5) * newDepth + item.y, item.x, item.y, item.rotation + 90), _export.GeometryUtils.rotatePointAroundPoint((outlinePoints[i + 1].x / outlineWidth - 0.5) * newWidth + item.x, (outlinePoints[i + 1].y / outlineHeight - 0.5) * newDepth + item.y, item.x, item.y, item.rotation + 90), _idBroker["default"].acquireID()]);
+      }
+    } else {
+      var pos = [[-1, -1], [1, -1], [1, 1], [-1, 1]];
+      for (var _i2 = 0; _i2 < 4; _i2++) {
+        lines.push([_export.GeometryUtils.rotatePointAroundPoint(pos[_i2][0] * newWidth / 2 + item.x, pos[_i2][1] * newDepth / 2 + item.y, item.x, item.y, item.rotation), _export.GeometryUtils.rotatePointAroundPoint(pos[(_i2 + 1) % 4][0] * newWidth / 2 + item.x, pos[(_i2 + 1) % 4][1] * newDepth / 2 + item.y, item.x, item.y, item.rotation), _idBroker["default"].acquireID()]);
+      }
+    }
+  }
+  lines = lines.filter(function (line) {
+    return !_export.GeometryUtils.isSnappedLine({
+      rect: [{
+        x: 0,
+        y: 0
+      }, {
+        x: 0,
+        y: 0
+      }, line[0], line[1]]
+    }, allLineRects);
+  });
+  return lines;
+}
 function isParallelLines(line1, line2) {
   var isParallel = false;
   if (Math.abs(line1[0].y - line1[1].y) <= _constants.EPSILON && Math.abs(line2[0].y - line2[1].y) <= _constants.EPSILON) isParallel = true;
@@ -512,20 +582,20 @@ function getLinesFromItems2(moldingGroup, layer, catalog) {
   // merge the collinear linked lines to one line
   var newMGlines = [];
   var filteredMGlines = MGlines;
-  var _loop3 = function _loop3(_i2) {
+  var _loop3 = function _loop3(_i3) {
       if (filteredMGlines.length < 1) return 0; // break
       if (!filteredMGlines.some(function (v) {
-        return v[2] === MGlines[_i2][2];
+        return v[2] === MGlines[_i3][2];
       })) return 1; // continue
-      var mergedResult = getMergedLine(MGlines[_i2], filteredMGlines, 0);
+      var mergedResult = getMergedLine(MGlines[_i3], filteredMGlines, 0);
       if (mergedResult) {
         newMGlines.push(mergedResult.mergedLine);
         filteredMGlines = mergedResult.filteredMGlines;
       }
     },
     _ret;
-  for (var _i2 = 0; _i2 < MGlines.length; _i2++) {
-    _ret = _loop3(_i2);
+  for (var _i3 = 0; _i3 < MGlines.length; _i3++) {
+    _ret = _loop3(_i3);
     if (_ret === 0) break;
     if (_ret === 1) continue;
   }
@@ -614,11 +684,12 @@ function getTrimmedContourLineSegs(lineSegs, otherLines, cnt) {
       };
       var bContourSeg = true;
       var _loop6 = function _loop6(j) {
+          var _otherLines$j$0$x, _otherLines$j$, _otherLines$j$line$, _otherLines$j$0$y, _otherLines$j$2, _otherLines$j$line$2, _otherLines$j$1$x, _otherLines$j$3, _otherLines$j$line$3, _otherLines$j$1$y, _otherLines$j$4, _otherLines$j$line$4;
           var destLine = {
-            x1: otherLines[j][0].x,
-            y1: otherLines[j][0].y,
-            x2: otherLines[j][1].x,
-            y2: otherLines[j][1].y
+            x1: (_otherLines$j$0$x = (_otherLines$j$ = otherLines[j][0]) === null || _otherLines$j$ === void 0 ? void 0 : _otherLines$j$.x) !== null && _otherLines$j$0$x !== void 0 ? _otherLines$j$0$x : (_otherLines$j$line$ = otherLines[j].line[0]) === null || _otherLines$j$line$ === void 0 ? void 0 : _otherLines$j$line$.x,
+            y1: (_otherLines$j$0$y = (_otherLines$j$2 = otherLines[j][0]) === null || _otherLines$j$2 === void 0 ? void 0 : _otherLines$j$2.y) !== null && _otherLines$j$0$y !== void 0 ? _otherLines$j$0$y : (_otherLines$j$line$2 = otherLines[j].line[0]) === null || _otherLines$j$line$2 === void 0 ? void 0 : _otherLines$j$line$2.y,
+            x2: (_otherLines$j$1$x = (_otherLines$j$3 = otherLines[j][1]) === null || _otherLines$j$3 === void 0 ? void 0 : _otherLines$j$3.x) !== null && _otherLines$j$1$x !== void 0 ? _otherLines$j$1$x : (_otherLines$j$line$3 = otherLines[j].line[1]) === null || _otherLines$j$line$3 === void 0 ? void 0 : _otherLines$j$line$3.x,
+            y2: (_otherLines$j$1$y = (_otherLines$j$4 = otherLines[j][1]) === null || _otherLines$j$4 === void 0 ? void 0 : _otherLines$j$4.y) !== null && _otherLines$j$1$y !== void 0 ? _otherLines$j$1$y : (_otherLines$j$line$4 = otherLines[j].line[1]) === null || _otherLines$j$line$4 === void 0 ? void 0 : _otherLines$j$line$4.y
           };
           var rst = _export.GeometryUtils.relationshipOfTwoOverlappedLines(srcLine, destLine);
           if (rst.result == _constants.OVERLAP_SAME || rst.result == _constants.OVERLAP_INCLUDED) {
@@ -894,6 +965,151 @@ function createMonldingGroup(oldMG, layer, molding, catalog) {
   newMG = getMDPoints(newMG);
   return newMG;
 }
+function getMoldingDataOfScene2(layer, catalog, doorStyle) {
+  var moldingData = [];
+  var items = layer.items.toArray();
+  var allLineRects = _export.GeometryUtils.buildRectFromLines(layer, _export.GeometryUtils.getAllLines(layer));
+
+  // get all molding line segments
+  var moldingLines = [];
+  items.forEach(function (item) {
+    if (item.category === _constants.ITEM_TYPE.CABINET) {
+      var _item$molding;
+      var MGlines = getLinesOfItem2(item, allLineRects, catalog); // exclude overlayed to wall
+      // z position of molding line
+      var z = item.properties.get('altitude').get('_length');
+      var zUnit = item.properties.get('altitude').get('_unit') || 'cm';
+      z = (0, _convertUnitsLite.convert)(z).from(zUnit).to('cm');
+      var h = item.properties.get('height').get('_length');
+      var hUnit = item.properties.get('height').get('_unit') || 'cm';
+      h = (0, _convertUnitsLite.convert)(h).from(hUnit).to('cm');
+      if (!(0, _helper.isEmpty)(item.molding) && isEnableItemForMolding(layer, item)) {
+        // calc normal molding line
+        item === null || item === void 0 || item.molding.forEach(function (molding) {
+          var lineZ = z;
+          switch (molding.location_type) {
+            case _constants.TOP_MOLDING_LOCATION:
+              lineZ = z + h;
+              break;
+            case _constants.MIDDLE_MOLDING_LOCATION:
+              lineZ = z + h / 2;
+              break;
+          }
+          MGlines === null || MGlines === void 0 || MGlines.forEach(function (line) {
+            return moldingLines.push({
+              molding: _objectSpread({}, molding),
+              doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !(0, _helper.isEmpty)(item.doorStyle) && item.doorStyle.toJS(),
+              line: line,
+              z: lineZ
+            });
+          });
+        });
+      } else if (
+      // calc toe kick molding line
+      item.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && ((0, _helper.isEmpty)(item.molding) || ((_item$molding = item.molding) === null || _item$molding === void 0 ? void 0 : _item$molding.length) < 1 || !isEnableItemForMolding(layer, item))) {
+        var skuName = (0, _utils.getToeKickSKU)(item.doorStyle, catalog);
+        var thumbnail = skuName ? skuName : '';
+        MGlines === null || MGlines === void 0 || MGlines.forEach(function (line) {
+          return moldingLines.push({
+            molding: {
+              name: _constants.TOE_KICK_MOLDING,
+              sku: (0, _utils.getToeKickSKU)(item.doorStyle, catalog),
+              thumbnail: thumbnail,
+              category: 'molding',
+              type: 'cabinet'
+            },
+            doorStyle: item.doorStyle.hasOwnProperty('id') ? item.doorStyle : !(0, _helper.isEmpty)(item.doorStyle) && item.doorStyle.toJS(),
+            line: line,
+            z: z
+          });
+        });
+      }
+    }
+  });
+
+  // filter the real molding line segments
+  var removeLineIds = []; // remove the line that fully overlapped to other line
+  var newLines = []; // new countour line segment that except the overlapped part
+  var _loop9 = function _loop9(i) {
+    var srcLine = {
+      x1: moldingLines[i].line[0].x,
+      y1: moldingLines[i].line[0].y,
+      x2: moldingLines[i].line[1].x,
+      y2: moldingLines[i].line[1].y
+    };
+    var _loop1 = function _loop1(j) {
+        if (i === j) return 0; // continue
+        if (Math.abs(moldingLines[i].z - moldingLines[j].z) > _constants.EPSILON) return 0; // continue
+        var destLine = {
+          x1: moldingLines[j].line[0].x,
+          y1: moldingLines[j].line[0].y,
+          x2: moldingLines[j].line[1].x,
+          y2: moldingLines[j].line[1].y
+        };
+        var rst = _export.GeometryUtils.relationshipOfTwoOverlappedLines(srcLine, destLine);
+        if (rst.result === _constants.OVERLAP_SAME || rst.result === _constants.OVERLAP_INCLUDED) {
+          removeLineIds.push(i);
+          return 1; // break
+        } else if (rst.result === _constants.OVERLAP_SOME) {
+          removeLineIds.push(i);
+          var lineSegs = getTrimmedContourLineSegs(rst.trimmedSegs, moldingLines.filter(function (v, idx) {
+            return idx !== i && idx !== j && Math.abs(v.z - moldingLines[i].z) < _constants.EPSILON;
+          }), 0);
+          if (lineSegs.length > 0) {
+            lineSegs.forEach(function (ls) {
+              return newLines.push({
+                molding: _objectSpread({}, moldingLines[i].molding),
+                doorStyle: moldingLines[i].doorStyle,
+                line: (0, _toConsumableArray2["default"])(ls),
+                z: moldingLines[i].z
+              });
+            });
+          }
+          return 1; // break
+        }
+      },
+      _ret4;
+    for (var j = 0; j < moldingLines.length; j++) {
+      _ret4 = _loop1(j);
+      if (_ret4 === 0) continue;
+      if (_ret4 === 1) break;
+    }
+  };
+  for (var i = 0; i < moldingLines.length; i++) {
+    _loop9(i);
+  }
+  moldingLines = moldingLines.filter(function (line, idx) {
+    return !removeLineIds.some(function (id) {
+      return idx === id;
+    });
+  });
+  if (newLines.length > 0) moldingLines = [].concat((0, _toConsumableArray2["default"])(moldingLines), newLines);
+  // console.log('moldingLines: ', moldingLines);
+
+  // make molding data with sorting molding & doorStyle
+  var _loop0 = function _loop0() {
+    var ml = moldingLines[k];
+    var mlLength = (0, _convertUnitsLite.convert)(_export.GeometryUtils.verticesDistance(ml.line[0], ml.line[1])).from('cm').to('in');
+    var idx = moldingData.findIndex(function (v) {
+      var _ml$molding, _v$doorStyle, _ml$doorStyle;
+      return (v === null || v === void 0 ? void 0 : v.name) === ((_ml$molding = ml.molding) === null || _ml$molding === void 0 ? void 0 : _ml$molding.name) && ((_v$doorStyle = v.doorStyle) === null || _v$doorStyle === void 0 ? void 0 : _v$doorStyle.id) === ((_ml$doorStyle = ml.doorStyle) === null || _ml$doorStyle === void 0 ? void 0 : _ml$doorStyle.id);
+    });
+    if (idx < 0) moldingData.push(_objectSpread(_objectSpread({}, ml.molding), {}, {
+      doorStyle: ml.doorStyle,
+      totalLength: mlLength,
+      count: Math.ceil(mlLength * 1.1 / 96)
+    }));else {
+      moldingData[idx].totalLength += mlLength;
+      moldingData[idx].count = Math.ceil(moldingData[idx].totalLength * 1.1 / 96);
+    }
+  };
+  for (var k = 0; k < moldingLines.length; k++) {
+    _loop0();
+  }
+  // console.log('moldingData: ', moldingData);
+
+  return moldingData;
+}
 function getMoldingDataOfScene(layer, catalog, doorStyle) {
   var moldingData = [];
   var items = layer.items.toArray();
@@ -922,7 +1138,7 @@ function getMoldingDataOfScene(layer, catalog, doorStyle) {
     if (temp_items.length) {
       while (temp_items.length > 0) {
         var itemGroup = [temp_items[0]];
-        var _loop9 = function _loop9(_idx) {
+        var _loop10 = function _loop10(_idx) {
           if (!itemGroup.some(function (it) {
             return it.id === temp_items[_idx].id;
           }) && isItemSnappedGroup(temp_items[_idx], itemGroup)) {
@@ -932,7 +1148,7 @@ function getMoldingDataOfScene(layer, catalog, doorStyle) {
           idx = _idx;
         };
         for (var idx = 0; idx < temp_items.length; idx++) {
-          _loop9(idx);
+          _loop10(idx);
         }
         itemGroup.forEach(function (item) {
           var index = temp_items.findIndex(function (it) {
@@ -950,7 +1166,7 @@ function getMoldingDataOfScene(layer, catalog, doorStyle) {
         var items = (0, _toConsumableArray2["default"])(itemgroup);
         var MGlines = getLinesOfItem(items[0], allLineRects, catalog);
         items = sortItemsByDistance(items, items[0]);
-        var _loop0 = function _loop0() {
+        var _loop11 = function _loop11() {
           var itemLines = getLinesOfItem(items[i], allLineRects, catalog);
           var temp_MGLines = [];
           MGlines.forEach(function (line) {
@@ -974,7 +1190,7 @@ function getMoldingDataOfScene(layer, catalog, doorStyle) {
           MGlines = [].concat(temp_MGLines);
         };
         for (var i = 1; i < items.length; i++) {
-          _loop0();
+          _loop11();
         }
         MGlines.forEach(function (line) {
           molding_totalLength += _export.GeometryUtils.verticesDistance(line[0], line[1]);
@@ -998,8 +1214,8 @@ function getMoldingDataOfScene(layer, catalog, doorStyle) {
   var tmpMoldingData = [];
   var toedoorStyles = [];
   tmp.map(function (item) {
-    var _item$molding;
-    if (item.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && ((0, _helper.isEmpty)(item.molding) || ((_item$molding = item.molding) === null || _item$molding === void 0 ? void 0 : _item$molding.length) < 1 || !isEnableItemForMolding(layer, item))) {
+    var _item$molding2;
+    if (item.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && ((0, _helper.isEmpty)(item.molding) || ((_item$molding2 = item.molding) === null || _item$molding2 === void 0 ? void 0 : _item$molding2.length) < 1 || !isEnableItemForMolding(layer, item))) {
       var w = item.properties.get('width').get('_length');
       var wUnit = item.properties.get('width').get('_unit') || 'cm';
       w = (0, _convertUnitsLite.convert)(w / 2).from(wUnit).to('cm');
@@ -1017,28 +1233,28 @@ function getMoldingDataOfScene(layer, catalog, doorStyle) {
         var outlineWidth = outline.svgWidth;
         var outlineHeight = outline.svgHeight;
         var outlinePoints = []; // Hold Points Of SVG
-        var _iterator3 = _createForOfIteratorHelper(outlinePaths),
-          _step3;
+        var _iterator5 = _createForOfIteratorHelper(outlinePaths),
+          _step5;
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var path = _step3.value;
-            var _iterator4 = _createForOfIteratorHelper(path.subPaths),
-              _step4;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var path = _step5.value;
+            var _iterator6 = _createForOfIteratorHelper(path.subPaths),
+              _step6;
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                var subPath = _step4.value;
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                var subPath = _step6.value;
                 outlinePoints = outlinePoints.concat(subPath.getPoints());
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator4.f();
+              _iterator6.f();
             }
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator3.f();
+          _iterator5.f();
         }
         var maxX = outlinePoints[0].x,
           minX = outlinePoints[0].x;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "3.13.0",
+  "version": "3.14.0",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",