kitchen-simulator 3.1.10 → 3.1.12

package/es/components/viewer2d/item.js

@@ -277,10 +277,18 @@ export default 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/es/components/viewer3d/viewer3d.js

@@ -1187,12 +1187,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
       var sendInternalEvent = function sendInternalEvent(evtType, evtElement) {
         var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
         if (!isEmpty(evtType) && !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 = GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
             var _length = convert(distance).from('cm').to('in');
             payload.length = _length;
@@ -1296,7 +1296,7 @@ var Scene3DViewer = /*#__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;
@@ -1363,16 +1363,11 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
               if (selectedFlag || toolIntersects.length > 0 && !isElevationView(mode)) {
                 cameraControls.mouseButtons.left = CameraControls.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;
@@ -1391,7 +1386,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
           altitude = 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('');
         }
@@ -1530,22 +1525,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
                     toolObj: toolObj
                   });
                   // showItemButtons(layer.getIn(['items', selectedObject.itemID]), currentObject, event, camera, this.renderer);
-                  var pointArray = [],
-                    cnt = 0;
-                  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.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 = GeometryUtils.calcDistancesFromItemToWalls(selectedElement, layer).PointArray;
                   actions.itemsActions.storeDistArray(layer.id, selectedObject.itemID, pointArray);
                   internalType = internalType ? internalType : INTERNAL_EVENT_SELECT_ELEMENT;
                   sendInternalEvent(internalType, selectedElement, pointArray);
@@ -1558,6 +1543,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
                     case 'holeID' in selectedObject:
                       elementID = selectedObject.holeID;
                       elementPrototype = 'holes';
+                      scene3D.remove(toolObj);
                       if (_this2.props.state.mode === MODE_DRAGGING_HOLE_3D) {
                         actions.holesActions.endDraggingHole3D(sPoint.x, sPoint.y);
                       }
@@ -1565,10 +1551,12 @@ var Scene3DViewer = /*#__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;
@@ -1578,8 +1566,8 @@ var Scene3DViewer = /*#__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);
@@ -1589,6 +1577,13 @@ var Scene3DViewer = /*#__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;
@@ -1608,14 +1603,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             getPoint(event, alti);
             if (bRotate) {
               var _intersects$_i;
-              var selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (isUndefined(selectedItem)) return;
+              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if (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({
@@ -1626,14 +1621,14 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             }
             if (bMove) {
               bMove = false;
-              var _selectedItem = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
-              if (isUndefined(_selectedItem)) return;
+              var _selectedItem2 = planData.sceneGraph.layers[selectedObject.layerID].items[selectedObject.itemID];
+              if (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/es/utils/geometry.js

@@ -2459,31 +2459,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: {
@@ -2492,27 +2474,14 @@ function getAllItems2(layer, catalog) {
       },
       rotRad: item.rotation / 180 * Math.PI
     };
-    var catid = item.type;
-    var cat = findCatalogElement(catalog, catid);
     var width = convert(item.properties.getIn(['width', '_length'])).from('in').to('cm');
     var height = 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;
@@ -2544,62 +2513,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
   };
 }
-export function calcDistancesFromItemToWalls(attributesFormData, layer, catalog) {
-  if (isEmpty(attributesFormData)) return [];
-  var x = attributesFormData.get('x');
-  var y = attributesFormData.get('y');
-  var rotRad = attributesFormData.get('rotation') / 180 * Math.PI;
+export function calcDistancesFromItemToWalls(curItem, layer) {
+  if (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 = convert(attributesFormData.get('properties').get('width').get('_length')).from(attributesFormData.get('properties').get('width').get('_unit')).to('cm');
-    height = 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 = convert(curItem.get('properties').get('width').get('_length')).from(curItem.get('properties').get('width').get('_unit')).to('cm');
+    height = convert(curItem.get('properties').get('depth').get('_length')).from(curItem.get('properties').get('depth').get('_unit')).to('cm');
   } else {
-    width = convert(attributesFormData.info.sizeinfo.width).from('in').to('cm');
-    height = convert(attributesFormData.info.sizeinfo.depth).from('in').to('cm');
+    width = convert(curItem.info.sizeinfo.width).from('in').to('cm');
+    height = convert(curItem.info.sizeinfo.depth).from('in').to('cm');
   }
   var center_h = 3 * height / 8;
   var center_x = x;
@@ -2619,7 +2548,7 @@ export 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);
@@ -2645,6 +2574,17 @@ export 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
   };

package/es/utils/isolate-event-handler.js

@@ -13,6 +13,7 @@ import { convert } from "./convert-units-lite";
 import { GeometryUtils, MathUtils } from "./export";
 import { returnReplaceableDeepSearchType } from "../components/viewer2d/utils";
 import { SVGLoader } from 'three/addons/loaders/SVGLoader';
+import { getMoldingDataOfScene } from "./molding";
 var PRECISION = 2;
 function loadJSON(_x) {
   return _loadJSON.apply(this, arguments);
@@ -722,7 +723,7 @@ function updateAttributeOfSelectedElement(element, attrPayload, state, layer, ca
         } else {
           attributesFormData = attributesFormData.set(attributeName, value);
           // update the distances from wall
-          var _GeometryUtils$calcDi = GeometryUtils.calcDistancesFromItemToWalls(attributesFormData, layer, catalog),
+          var _GeometryUtils$calcDi = GeometryUtils.calcDistancesFromItemToWalls(attributesFormData, layer),
             PointArray = _GeometryUtils$calcDi.PointArray;
           attributesFormData = attributesFormData.set('distArray', PointArray);
         }
@@ -1058,13 +1059,15 @@ export function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId, layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, _t5;
+    var evt, state, layerId, layer, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, defaulTitle, _Object$keys, _evt$payload5, doorStyle, itemCDS, isAll, _layerId, _cdsItems, allItems, selectedItemId, _itemKeys, _loop4, _i2, _props$onInternalEven2, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2, _layerId2, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i4, _i5, _i6, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven3, sceneData, currentTexture, _t5;
     return _regeneratorRuntime.wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
           // console.log('***external event****', props);
           evt = props.externalEvent;
           state = props.state.get('KitchenConfigurator');
+          layerId = state.getIn(['scene', 'selectedLayer']);
+          layer = state.getIn(['scene', 'layers', layerId]);
           _t5 = evt === null || evt === void 0 ? void 0 : evt.type;
           _context1.next = _t5 === EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === EXTERNAL_EVENT_UNDO ? 23 : _t5 === EXTERNAL_EVENT_REDO ? 24 : _t5 === EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 30 : _t5 === EXTERNAL_EVENT_UPDATE_PROPERTY ? 30 : _t5 === EXTERNAL_EVENT_REPLACE_CABINET ? 31 : _t5 === EXTERNAL_EVENT_SET_FINISHING ? 33 : _t5 === EXTERNAL_EVENT_SYNC_SCENE ? 34 : 35;
           break;
@@ -1078,7 +1081,11 @@ function _handleExternalEvent() {
             return _regeneratorRuntime.wrap(function (_context8) {
               while (1) switch (_context8.prev = _context8.next) {
                 case 0:
-                  it = evt === null || evt === void 0 || (_evt$payload2 = evt.payload) === null || _evt$payload2 === void 0 || (_evt$payload2 = _evt$payload2.layers['layer-1']) === null || _evt$payload2 === void 0 ? void 0 : _evt$payload2.items[itemKeys[i]];
+                  it = evt === null || evt === void 0 || (_evt$payload2 = evt.payload) === null || _evt$payload2 === void 0 || (_evt$payload2 = _evt$payload2.layers['layer-1']) === null || _evt$payload2 === void 0 ? void 0 : _evt$payload2.items[itemKeys[i]]; //////// check altitude of item property and change length from _length (convert length from 'in' fo 'cm')
+                  if (it.properties.altitude.length !== convert(it.properties.altitude._length).from('in').to('cm')) {
+                    it.properties.altitude.length = convert(it.properties.altitude._length).from('in').to('cm');
+                  }
+                  /////////
                   if (!cdsItems.some(function (v) {
                     var _it$doorStyle;
                     return it.itemID === v.itemID && it.name === v.name && ((_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 || (_it$doorStyle = _it$doorStyle.doorStyles) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.cabinet_door_style_id) === v.cdsId;
@@ -1155,7 +1162,7 @@ function _handleExternalEvent() {
           props.projectActions.setMode(MODE_IDLE);
           return _context1.abrupt("continue", 35);
         case 7:
-          sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
+          sLineCnt = layer.selected.lines.size;
           if (sLineCnt > 0) props.projectActions.setMode(MODE_ELEVATION_VIEW);
           return _context1.abrupt("continue", 35);
         case 8:
@@ -1208,10 +1215,10 @@ function _handleExternalEvent() {
           return _context1.abrupt("continue", 35);
         case 15:
           _evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll; // prepare item data request
-          layerId = state.getIn(['scene', 'selectedLayer']);
+          _layerId = state.getIn(['scene', 'selectedLayer']);
           _cdsItems = [];
-          allItems = state.getIn(['scene', 'layers', layerId, 'items']).toJS();
-          selectedItemId = state.getIn(['scene', 'layers', layerId]).selected.items.toJS()[0];
+          allItems = state.getIn(['scene', 'layers', _layerId, 'items']).toJS();
+          selectedItemId = state.getIn(['scene', 'layers', _layerId]).selected.items.toJS()[0];
           _itemKeys = isAll ? (_Object$keys = Object.keys(allItems)) !== null && _Object$keys !== void 0 ? _Object$keys : [] : [selectedItemId];
           _loop4 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop4() {
             var _itemCDS$find;
@@ -1224,7 +1231,7 @@ function _handleExternalEvent() {
                     return itCDS.itemID === item.itemID;
                   })) === null || _itemCDS$find === void 0 ? void 0 : _itemCDS$find.cabinet_door_style_id;
                   if (cdsId && !_cdsItems.some(function (v) {
-                    return it.itemID === v.itemID && it.name === v.name && cdsId === v.cdsId;
+                    return item.itemID === v.itemID && item.name === v.name && cdsId === v.cdsId;
                   })) _cdsItems.push({
                     itemID: item.itemID,
                     prototype: item.prototype,
@@ -1351,18 +1358,18 @@ function _handleExternalEvent() {
           }
           return _context1.abrupt("continue", 35);
         case 30:
-          _layerId = state.getIn(['scene', 'selectedLayer']);
-          layer = state.getIn(['scene', 'layers', _layerId]);
-          _layer$getIn = layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
-          for (_i4 = 0; _i4 < selectedLines.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, state, layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
-          for (_i5 = 0; _i5 < selectedHoles.size; _i5++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, state, layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, props.catalog, props.projectActions, evt.callback);
-          for (_i6 = 0; _i6 < selectedItems.size; _i6++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, state, layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, props.catalog, props.projectActions, evt.callback);
+          _layerId2 = state.getIn(['scene', 'selectedLayer']);
+          _layer = state.getIn(['scene', 'layers', _layerId2]);
+          _layer$getIn = _layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
+          for (_i4 = 0; _i4 < selectedLines.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
+          for (_i5 = 0; _i5 < selectedHoles.size; _i5++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, props.catalog, props.projectActions, evt.callback);
+          for (_i6 = 0; _i6 < selectedItems.size; _i6++) (evt === null || evt === void 0 ? void 0 : evt.type) === EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, state, _layer, props.catalog, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, props.catalog, props.projectActions, evt.callback);
           return _context1.abrupt("continue", 35);
         case 31:
           _layerID = state.scene.selectedLayer;
-          _layer = state.scene.getIn(['layers', _layerID]).toJS();
+          _layer2 = state.scene.getIn(['layers', _layerID]).toJS();
           orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
-          originalItem = _layer === null || _layer === void 0 ? void 0 : _layer.items[orginalItemInfo.id];
+          originalItem = _layer2 === null || _layer2 === void 0 ? void 0 : _layer2.items[orginalItemInfo.id];
           _context1.next = 32;
           return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
         case 32:
@@ -1384,11 +1391,14 @@ function _handleExternalEvent() {
         case 33:
           setFinishing(props, state, evt.payload);
         case 34:
+          sceneData = state.scene.toJS(); // get molding data for "ReviewForQuote"
+          currentTexture = layer.doorStyle !== null || layer.doorStyle !== undefined ? layer.doorStyle : props.state.doorStyle.toJS();
+          sceneData.layers[layerId].moldingData = getMoldingDataOfScene(layer, props.catalog, currentTexture);
           // send scene object from 3DTool to HostApp using internalEvent
           (_props$onInternalEven3 = props.onInternalEvent) === null || _props$onInternalEven3 === void 0 || _props$onInternalEven3.call(props, {
             type: INTERNAL_EVENT_SYNC_SCENE,
             value: {
-              scene: state.scene.toJS()
+              scene: sceneData
             }
           });
           return _context1.abrupt("continue", 35);