kitchen-simulator 1.0.0-alin.9 → 1.0.0-clark.101

package/lib/components/viewer2d/item.js

@@ -14,6 +14,7 @@ var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _export = require("../../utils/export");
 var _constants = require("../../constants");
 var _utils = require("./utils");
+var _geometry = require("../../utils/geometry");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var STYLE_LINE = {
   fill: '#0096fd',
@@ -30,6 +31,7 @@ var STYLE_CIRCLE2 = {
   cursor: 'ew-resize'
 };
 function Item(_ref, _ref2) {
+  var _element$render2D;
   var layer = _ref.layer,
     item = _ref.item,
     scene = _ref.scene,
@@ -38,7 +40,8 @@ function Item(_ref, _ref2) {
   var itemsActions = _ref2.itemsActions;
   var x = item.x,
     y = item.y,
-    rotation = item.rotation;
+    rotation = item.rotation,
+    id = item.id;
   var showBaseCabinetMeasure = scene.showBaseCabinetMeasure,
     showWallCabinetMeasure = scene.showWallCabinetMeasure;
   var vertices = layer.vertices;
@@ -84,13 +87,6 @@ function Item(_ref, _ref2) {
       y: y
     };
   }
-  var buttons = [{
-    name: 'Edit',
-    thumbnail: '/assets/img/svg/3d_item_warning_edit.svg'
-  }, {
-    name: 'Info',
-    thumbnail: '/assets/img/svg/3d_item_warning_info.svg'
-  }];
   function getCalcRectFromItem(items) {
     var x = items.pos.x;
     var y = items.pos.y;
@@ -124,16 +120,11 @@ function Item(_ref, _ref2) {
     var selectedItem;
     if (layer.selected.items.size > 0) {
       selectedItem = layer.getIn(['items', layer.selected.items.get(0)]);
-      var catid = selectedItem.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
-      if (cat === undefined || cat === null) {
-        cat = catalog.getIn(['elements', catid]);
-        if (!cat) cat = catalog.getIn(['elements', (0, _utils.returnReplaceableDeepSearchType)(catid)]);
-      }
+      var _catid = selectedItem.type;
+      var _cat = (0, _geometry.findCatalogElement)(catalog, _catid);
       currentItem = {
         selectedItem: selectedItem,
-        cat: cat
+        cat: _cat
       };
     }
     layer.items.forEach(function (item) {
@@ -145,8 +136,7 @@ function Item(_ref, _ref2) {
         rotRad: item.rotation / 180 * Math.PI
       };
       var catid = item.type;
-      var cat = catalog.elements[catid];
-      if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
+      var cat = (0, _geometry.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;
@@ -272,7 +262,7 @@ function Item(_ref, _ref2) {
           if (_export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p0.x, p0.y, coordinatePoint.x, coordinatePoint.y) && _export.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y) > _export.GeometryUtils.pointsDistance(p1.x, p1.y, coordinatePoint.x, coordinatePoint.y)) {
             if (_export.GeometryUtils.pointsDistance(coordinatePoint.x, coordinatePoint.y, center_x, center_y) > _export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y)) {
               comparelength.push(_export.GeometryUtils.pointsDistance(centerpoint[0].x, centerpoint[0].y, coordinatePoint.x, coordinatePoint.y));
-              a = Math.min.apply(null, comparelength);
+              a = Math.max.apply(null, comparelength);
             }
           }
         }
@@ -287,9 +277,17 @@ function Item(_ref, _ref2) {
   var nh = height / 2;
   var _getDistant = getDistant(x, y, val.rotRad),
     PointArray = _getDistant.PointArray;
+  var catid = item.type;
+  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 (Array.isArray(PointArray)) {
+    itemsActions.storeDistArray(layerID, id, PointArray);
+  }
   var renderedRuler = [];
   var ep = 0.1;
   if (item.selected) {
@@ -314,75 +312,16 @@ function Item(_ref, _ref2) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: element[1],
-          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? -nh : 3 * nh / 4, ") rotate(").concat(element[1], ", 0, 0)")
+          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });
   }
-  var renderedItem = element.render2D.call(element, item, layer, scene);
+  var renderedItem = element === null || element === void 0 || (_element$render2D = element.render2D) === null || _element$render2D === void 0 ? void 0 : _element$render2D.call(element, item, layer, scene);
   var isSmall = false;
   if (width < 40) isSmall = true;
   var parts = [];
-  var warning_buttons = '';
   var newWidth = item.toJS().properties.width.length;
-  if (item.toJS().doorStyle.doorStyles && item.toJS().doorStyle.doorStyles.cds && item.toJS().doorStyle.doorStyles.cds.filter(function (cd) {
-    return cd.itemID == item.getIn(['itemID']);
-  }).length === 0 && item.category === 'cabinet') warning_buttons = /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
-    id: "warning_info_2d",
-    style: {
-      transform: "translate(0px,20px)",
-      cursor: 'pointer'
-    },
-    onMouseEnter: function onMouseEnter(event) {
-      var bbox = event.target.getBoundingClientRect();
-      if (!(0, _utils.isEmpty)(document.getElementById('warning_box_2d'))) {
-        document.getElementById('warning_box_2d').style.display = 'flex';
-        document.getElementById('warning_box_2d').style.top = "".concat(bbox.top - 60, "px");
-        document.getElementById('warning_box_2d').style.left = "".concat(bbox.left, "px");
-      }
-    },
-    onMouseLeave: function onMouseLeave() {
-      if (!(0, _utils.isEmpty)(document.getElementById('warning_box_2d'))) document.getElementById('warning_box_2d').style.display = 'none';
-    }
-  }, /*#__PURE__*/_react["default"].createElement("circle", {
-    cx: 0,
-    cy: 0,
-    r: 8,
-    fill: "white"
-  }), /*#__PURE__*/_react["default"].createElement("image", {
-    width: 15,
-    height: 15,
-    x: -7.5,
-    y: -7.5,
-    style: {
-      transform: "rotate(".concat(180 - item.rotation, "deg)")
-    },
-    href: buttons[1].thumbnail
-  })), /*#__PURE__*/_react["default"].createElement("g", {
-    style: {
-      cursor: 'pointer'
-    },
-    "data-element-root": true,
-    "data-prototype": item.prototype,
-    "data-id": item.id,
-    "data-selected": item.selected,
-    "data-layer": layer.id,
-    "data-part": "warning_edit"
-  }, /*#__PURE__*/_react["default"].createElement("circle", {
-    cx: 0,
-    cy: 0,
-    r: 8,
-    fill: "white"
-  }), /*#__PURE__*/_react["default"].createElement("image", {
-    width: 15,
-    height: 15,
-    x: -7.5,
-    y: -7.5,
-    style: {
-      transform: "rotate(".concat(90 - item.rotation, "deg)")
-    },
-    href: buttons[0].thumbnail
-  })));
   if (item.selected) parts = [/*#__PURE__*/_react["default"].createElement("g", {
     key: 0,
     "data-element-root": true,
@@ -504,7 +443,7 @@ function Item(_ref, _ref2) {
     style: {
       cursor: 'initial'
     }
-  }, measure ? renderedRuler : null, parts, warning_buttons));
+  }, measure ? renderedRuler : null, parts));
 }
 Item.propTypes = {
   item: _propTypes["default"].object.isRequired,

package/lib/components/viewer2d/layer.js

@@ -144,7 +144,7 @@ function Layer(_ref) {
       unit: unit,
       catalog: catalog
     });
-  }), lineData, itemData, itemWall, itemSelected, mode !== _constants.MODE_DRAWING_LINE && vertices.valueSeq().filter(function (v) {
+  }), itemData, itemWall, lineData, itemSelected, mode !== _constants.MODE_DRAWING_LINE && vertices.valueSeq().filter(function (v) {
     return v.selected;
   }).map(function (vertex) {
     return /*#__PURE__*/_react["default"].createElement(_export.Vertex, {