kitchen-simulator 3.0.3 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/actions/lines-actions.js +3 -1
- package/es/catalog/utils/item-loader.js +1 -0
- package/es/class/item.js +1 -0
- package/es/class/line.js +14 -2
- package/es/components/viewer2d/viewer2d.js +4 -2
- package/es/components/viewer3d/viewer3d.js +2 -1
- package/es/constants.js +1 -0
- package/es/reducers/lines-reducer.js +1 -1
- package/es/utils/isolate-event-handler.js +143 -62
- package/lib/actions/lines-actions.js +3 -1
- package/lib/catalog/utils/item-loader.js +1 -0
- package/lib/class/item.js +1 -0
- package/lib/class/line.js +13 -1
- package/lib/components/viewer2d/viewer2d.js +4 -2
- package/lib/components/viewer3d/viewer3d.js +2 -1
- package/lib/constants.js +5 -4
- package/lib/reducers/lines-reducer.js +1 -1
- package/lib/utils/isolate-event-handler.js +143 -62
- package/package.json +1 -1
|
@@ -13,12 +13,14 @@ export function selectToolDrawingLine(sceneComponentType) {
|
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
15
|
export function beginDrawingLine(layerID, x, y, snapMask) {
|
|
16
|
+
var onInternalEvent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
|
|
16
17
|
return {
|
|
17
18
|
type: BEGIN_DRAWING_LINE,
|
|
18
19
|
layerID: layerID,
|
|
19
20
|
x: x,
|
|
20
21
|
y: y,
|
|
21
|
-
snapMask: snapMask
|
|
22
|
+
snapMask: snapMask,
|
|
23
|
+
onInternalEvent: onInternalEvent
|
|
22
24
|
};
|
|
23
25
|
}
|
|
24
26
|
export function updateDrawingLine(x, y, relatedLines, snapMask) {
|
|
@@ -450,6 +450,7 @@ export function render3DItem(element, layer, scene, sizeinfo, structure_json, is
|
|
|
450
450
|
var tempPlaceholders = structure.tempPlaceholders;
|
|
451
451
|
var tPlaceholders = tempPlaceholders.find(function (el) {
|
|
452
452
|
return el.id === tempDoorStyles.cabinet_door_style_id;
|
|
453
|
+
// return el.id === tempDoorStyles.cds[0].cabinet_door_style_id;
|
|
453
454
|
});
|
|
454
455
|
if (tPlaceholders !== undefined) {
|
|
455
456
|
placeholders = tPlaceholders.placeholders;
|
package/es/class/item.js
CHANGED
|
@@ -1148,6 +1148,7 @@ var Item = /*#__PURE__*/function () {
|
|
|
1148
1148
|
for (var x in keys) {
|
|
1149
1149
|
tmp[keys[x]] = doorStyle.doorStyles[keys[x]];
|
|
1150
1150
|
}
|
|
1151
|
+
doorStyle.cds = itemCDS;
|
|
1151
1152
|
state = state.setIn(['scene', 'layers', state.scene.selectedLayer, 'doorStyle'], doorStyle);
|
|
1152
1153
|
state = state.merge({
|
|
1153
1154
|
doorStyle: doorStyle
|
package/es/class/line.js
CHANGED
|
@@ -5,8 +5,9 @@ import { fromJS, List, Map } from 'immutable';
|
|
|
5
5
|
import { Group, Hole, Layer, Vertex } from "./export";
|
|
6
6
|
import { GeometryUtils, history, IDBroker, NameGenerator, SnapSceneUtils, SnapUtils } from "../utils/export";
|
|
7
7
|
import * as Three from 'three';
|
|
8
|
-
import { END_DRAGGING_LINE, END_DRAGGING_VERTEX, END_DRAWING_LINE, EPSILON, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_DRAGGING_LINE, MODE_DRAWING_LINE, MODE_IDLE, MODE_WAITING_DRAWING_LINE, UNIT_ANGLE } from "../constants";
|
|
8
|
+
import { END_DRAGGING_LINE, END_DRAGGING_VERTEX, END_DRAWING_LINE, EPSILON, INTERNAL_EVENT_START_DRAW_WALL, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_DRAGGING_LINE, MODE_DRAWING_LINE, MODE_IDLE, MODE_WAITING_DRAWING_LINE, UNIT_ANGLE } from "../constants";
|
|
9
9
|
import { isEmpty } from "../utils/helper";
|
|
10
|
+
import { convert } from "../utils/convert-units-lite";
|
|
10
11
|
var timeGlobal = 0;
|
|
11
12
|
var TimeRecorder = /*#__PURE__*/function () {
|
|
12
13
|
function TimeRecorder(name) {
|
|
@@ -426,7 +427,7 @@ var Line = /*#__PURE__*/function () {
|
|
|
426
427
|
}
|
|
427
428
|
}, {
|
|
428
429
|
key: "beginDrawingLine",
|
|
429
|
-
value: function beginDrawingLine(state, layerID, x, y) {
|
|
430
|
+
value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
|
|
430
431
|
// if end drawing by created area
|
|
431
432
|
if (state.mode == MODE_IDLE) {
|
|
432
433
|
return {
|
|
@@ -479,6 +480,17 @@ var Line = /*#__PURE__*/function () {
|
|
|
479
480
|
activeSnapElement: snap ? snap.snap : null,
|
|
480
481
|
drawingSupport: drawingSupport
|
|
481
482
|
});
|
|
483
|
+
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
484
|
+
var payload = line.toJS();
|
|
485
|
+
var v_a = layer.vertices.get(line.vertices.get(0));
|
|
486
|
+
var v_b = layer.vertices.get(line.vertices.get(1));
|
|
487
|
+
var distance = GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
|
|
488
|
+
var _length = convert(distance).from('cm').to('in');
|
|
489
|
+
payload.length = _length;
|
|
490
|
+
if (onInternalEvent) onInternalEvent({
|
|
491
|
+
type: INTERNAL_EVENT_START_DRAW_WALL,
|
|
492
|
+
value: payload
|
|
493
|
+
});
|
|
482
494
|
return {
|
|
483
495
|
updatedState: state
|
|
484
496
|
};
|
|
@@ -1199,7 +1199,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1199
1199
|
break;
|
|
1200
1200
|
case constants.MODE_WAITING_DRAWING_LINE:
|
|
1201
1201
|
setdrawStart(true);
|
|
1202
|
-
linesActions.beginDrawingLine(layerID, x, y, state.snapMask);
|
|
1202
|
+
linesActions.beginDrawingLine(layerID, x, y, state.snapMask, onInternalEvent);
|
|
1203
1203
|
break;
|
|
1204
1204
|
case constants.MODE_DRAWING_LINE:
|
|
1205
1205
|
// Blocked 90 degree snap.
|
|
@@ -1213,7 +1213,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1213
1213
|
getConnectedLines();
|
|
1214
1214
|
var endInfor = getEndPoint(vertices, x, y, 'END_DRAWIN_LINE');
|
|
1215
1215
|
linesActions.endDrawingLine(endInfor.x, endInfor.y, state.snapMask);
|
|
1216
|
-
linesActions.beginDrawingLine(layerID, endInfor.x, endInfor.y, state.snapMask);
|
|
1216
|
+
linesActions.beginDrawingLine(layerID, endInfor.x, endInfor.y, state.snapMask, onInternalEvent);
|
|
1217
1217
|
break;
|
|
1218
1218
|
case constants.MODE_DRAWING_HOLE:
|
|
1219
1219
|
holesActions.endDrawingHole(layerID, x, y);
|
|
@@ -1264,6 +1264,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1264
1264
|
} else if (((_currentObject5 = _currentObject) === null || _currentObject5 === void 0 ? void 0 : _currentObject5.prototype) === 'items') {
|
|
1265
1265
|
// check this cabinet has warning box
|
|
1266
1266
|
payload.isWarning = isWarningItem(_currentObject);
|
|
1267
|
+
// check this item is available molding
|
|
1268
|
+
payload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, _currentObject);
|
|
1267
1269
|
// check this item is snapped to wall
|
|
1268
1270
|
payload.isAttachedWall = MoldingUtils.isAttachedWall(layer, _currentObject);
|
|
1269
1271
|
}
|
|
@@ -1192,7 +1192,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
1192
1192
|
if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
|
|
1193
1193
|
// check this cabinet has warning box
|
|
1194
1194
|
payload.isWarning = isWarningItem(evtElement);
|
|
1195
|
-
// check this item is
|
|
1195
|
+
// check this item is available molding
|
|
1196
|
+
payload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, evtElement); // check this item is snapped to wall
|
|
1196
1197
|
payload.isAttachedWall = MoldingUtils.isAttachedWall(layer, evtElement);
|
|
1197
1198
|
// update distArray
|
|
1198
1199
|
if (pointArray) payload.distArray = pointArray;
|
package/es/constants.js
CHANGED
|
@@ -747,6 +747,7 @@ export var INTERNAL_EVENT_DRAG_ELEMENT = 'INTERNAL_EVENT_DRAG_ELEMENT';
|
|
|
747
747
|
export var INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNAL_EVENT_DRAW_ELEMENT';
|
|
748
748
|
export var INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
|
|
749
749
|
export var INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
750
|
+
export var INTERNAL_EVENT_START_DRAW_WALL = 'INTERNAL_EVENT_START_DRAW_WALL';
|
|
750
751
|
|
|
751
752
|
// room shape type
|
|
752
753
|
export var ROOM_SHAPE_TYPE = {
|
|
@@ -13,7 +13,7 @@ export default function (state, action) {
|
|
|
13
13
|
state = state.merge({
|
|
14
14
|
sceneHistory: history.historyPush(state.sceneHistory, state.scene)
|
|
15
15
|
});
|
|
16
|
-
return Line.beginDrawingLine(state, action.layerID, action.x, action.y).updatedState;
|
|
16
|
+
return Line.beginDrawingLine(state, action.layerID, action.x, action.y, action.onInternalEvent).updatedState;
|
|
17
17
|
case UPDATE_DRAWING_LINE:
|
|
18
18
|
return Line.updateDrawingLine(state, action.x, action.y, action.relatedLines).updatedState;
|
|
19
19
|
case STOP_DRAWING_LINE:
|
|
@@ -1052,17 +1052,17 @@ export function handleExternalEvent(_x10) {
|
|
|
1052
1052
|
return _handleExternalEvent.apply(this, arguments);
|
|
1053
1053
|
}
|
|
1054
1054
|
function _handleExternalEvent() {
|
|
1055
|
-
_handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function
|
|
1055
|
+
_handleExternalEvent = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee9(props) {
|
|
1056
1056
|
var _evt$payload3, _evt$payload4;
|
|
1057
|
-
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, _evt$payload5, doorStyle, itemCDS, isAll, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2,
|
|
1058
|
-
return _regeneratorRuntime.wrap(function (
|
|
1059
|
-
while (1) switch (
|
|
1057
|
+
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;
|
|
1058
|
+
return _regeneratorRuntime.wrap(function (_context1) {
|
|
1059
|
+
while (1) switch (_context1.prev = _context1.next) {
|
|
1060
1060
|
case 0:
|
|
1061
1061
|
// console.log('***external event****', props);
|
|
1062
1062
|
evt = props.externalEvent;
|
|
1063
1063
|
state = props.state.get('KitchenConfigurator');
|
|
1064
1064
|
_t5 = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
1065
|
-
|
|
1065
|
+
_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;
|
|
1066
1066
|
break;
|
|
1067
1067
|
case 1:
|
|
1068
1068
|
// prepare item data request
|
|
@@ -1077,7 +1077,7 @@ function _handleExternalEvent() {
|
|
|
1077
1077
|
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]];
|
|
1078
1078
|
if (!cdsItems.some(function (v) {
|
|
1079
1079
|
var _it$doorStyle;
|
|
1080
|
-
return it.
|
|
1080
|
+
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;
|
|
1081
1081
|
})) cdsItems.push({
|
|
1082
1082
|
itemID: it.itemID,
|
|
1083
1083
|
prototype: it.prototype,
|
|
@@ -1096,13 +1096,13 @@ function _handleExternalEvent() {
|
|
|
1096
1096
|
i = 0;
|
|
1097
1097
|
case 2:
|
|
1098
1098
|
if (!(i < itemKeys.length)) {
|
|
1099
|
-
|
|
1099
|
+
_context1.next = 4;
|
|
1100
1100
|
break;
|
|
1101
1101
|
}
|
|
1102
|
-
return
|
|
1102
|
+
return _context1.delegateYield(_loop3(), "t0", 3);
|
|
1103
1103
|
case 3:
|
|
1104
1104
|
i++;
|
|
1105
|
-
|
|
1105
|
+
_context1.next = 2;
|
|
1106
1106
|
break;
|
|
1107
1107
|
case 4:
|
|
1108
1108
|
// request item catalog data to host app
|
|
@@ -1143,30 +1143,30 @@ function _handleExternalEvent() {
|
|
|
1143
1143
|
};
|
|
1144
1144
|
}());
|
|
1145
1145
|
}
|
|
1146
|
-
return
|
|
1146
|
+
return _context1.abrupt("continue", 35);
|
|
1147
1147
|
case 5:
|
|
1148
1148
|
props.projectActions.setMode(MODE_IDLE_3D);
|
|
1149
|
-
return
|
|
1149
|
+
return _context1.abrupt("continue", 35);
|
|
1150
1150
|
case 6:
|
|
1151
1151
|
props.projectActions.setMode(MODE_IDLE);
|
|
1152
|
-
return
|
|
1152
|
+
return _context1.abrupt("continue", 35);
|
|
1153
1153
|
case 7:
|
|
1154
1154
|
sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
|
|
1155
1155
|
if (sLineCnt > 0) props.projectActions.setMode(MODE_ELEVATION_VIEW);
|
|
1156
|
-
return
|
|
1156
|
+
return _context1.abrupt("continue", 35);
|
|
1157
1157
|
case 8:
|
|
1158
1158
|
if (state.mode === MODE_IDLE || state.mode === MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
|
|
1159
1159
|
props.projectActions.setMode(MODE_IDLE);
|
|
1160
1160
|
props.linesActions.selectToolDrawingLine('wall');
|
|
1161
1161
|
}
|
|
1162
|
-
return
|
|
1162
|
+
return _context1.abrupt("continue", 35);
|
|
1163
1163
|
case 9:
|
|
1164
1164
|
if (isEmpty(evt === null || evt === void 0 ? void 0 : evt.payload)) {
|
|
1165
|
-
|
|
1165
|
+
_context1.next = 11;
|
|
1166
1166
|
break;
|
|
1167
1167
|
}
|
|
1168
1168
|
element = evt.payload;
|
|
1169
|
-
|
|
1169
|
+
_context1.next = 10;
|
|
1170
1170
|
return addItemToCatalog(element, state, props.catalog, props.projectActions);
|
|
1171
1171
|
case 10:
|
|
1172
1172
|
// start drawing item
|
|
@@ -1190,67 +1190,148 @@ function _handleExternalEvent() {
|
|
|
1190
1190
|
props.projectActions.pushLastSelectedCatalogElementToHistory(element);
|
|
1191
1191
|
props.projectActions.setIsCabinetDrawing(true);
|
|
1192
1192
|
case 11:
|
|
1193
|
-
return
|
|
1193
|
+
return _context1.abrupt("continue", 35);
|
|
1194
1194
|
case 12:
|
|
1195
1195
|
ARRAY_3D_MODES.includes(state.mode) ? props.holesActions.selectToolDrawingHole3D(evt === null || evt === void 0 || (_evt$payload3 = evt.payload) === null || _evt$payload3 === void 0 ? void 0 : _evt$payload3.holeName) : props.holesActions.selectToolDrawingHole(evt === null || evt === void 0 || (_evt$payload4 = evt.payload) === null || _evt$payload4 === void 0 ? void 0 : _evt$payload4.holeName);
|
|
1196
|
-
return
|
|
1196
|
+
return _context1.abrupt("continue", 35);
|
|
1197
1197
|
case 13:
|
|
1198
1198
|
movePan2D3D(props, evt.payload, state);
|
|
1199
|
-
return
|
|
1199
|
+
return _context1.abrupt("continue", 35);
|
|
1200
1200
|
case 14:
|
|
1201
1201
|
defaulTitle = 'Untitle';
|
|
1202
1202
|
props.projectActions.newProject();
|
|
1203
1203
|
props.projectActions.rename(defaulTitle);
|
|
1204
|
-
return
|
|
1204
|
+
return _context1.abrupt("continue", 35);
|
|
1205
1205
|
case 15:
|
|
1206
|
-
_evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll;
|
|
1207
|
-
|
|
1208
|
-
|
|
1206
|
+
_evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll; // prepare item data request
|
|
1207
|
+
layerId = state.getIn(['scene', 'selectedLayer']);
|
|
1208
|
+
_cdsItems = [];
|
|
1209
|
+
allItems = state.getIn(['scene', 'layers', layerId, 'items']).toJS();
|
|
1210
|
+
selectedItemId = state.getIn(['scene', 'layers', layerId]).selected.items.toJS()[0];
|
|
1211
|
+
_itemKeys = isAll ? (_Object$keys = Object.keys(allItems)) !== null && _Object$keys !== void 0 ? _Object$keys : [] : [selectedItemId];
|
|
1212
|
+
_loop4 = /*#__PURE__*/_regeneratorRuntime.mark(function _loop4() {
|
|
1213
|
+
var _itemCDS$find;
|
|
1214
|
+
var item, cdsId;
|
|
1215
|
+
return _regeneratorRuntime.wrap(function (_context0) {
|
|
1216
|
+
while (1) switch (_context0.prev = _context0.next) {
|
|
1217
|
+
case 0:
|
|
1218
|
+
item = allItems[_itemKeys[_i2]];
|
|
1219
|
+
cdsId = (_itemCDS$find = itemCDS.find(function (itCDS) {
|
|
1220
|
+
return itCDS.itemID === item.itemID;
|
|
1221
|
+
})) === null || _itemCDS$find === void 0 ? void 0 : _itemCDS$find.cabinet_door_style_id;
|
|
1222
|
+
if (cdsId && !_cdsItems.some(function (v) {
|
|
1223
|
+
return it.itemID === v.itemID && it.name === v.name && cdsId === v.cdsId;
|
|
1224
|
+
})) _cdsItems.push({
|
|
1225
|
+
itemID: item.itemID,
|
|
1226
|
+
prototype: item.prototype,
|
|
1227
|
+
category: item.category,
|
|
1228
|
+
name: item.name,
|
|
1229
|
+
type: item.type,
|
|
1230
|
+
sku_number: item.sku_number,
|
|
1231
|
+
cdsId: cdsId
|
|
1232
|
+
});
|
|
1233
|
+
case 1:
|
|
1234
|
+
case "end":
|
|
1235
|
+
return _context0.stop();
|
|
1236
|
+
}
|
|
1237
|
+
}, _loop4);
|
|
1238
|
+
});
|
|
1239
|
+
_i2 = 0;
|
|
1209
1240
|
case 16:
|
|
1241
|
+
if (!(_i2 < _itemKeys.length)) {
|
|
1242
|
+
_context1.next = 18;
|
|
1243
|
+
break;
|
|
1244
|
+
}
|
|
1245
|
+
return _context1.delegateYield(_loop4(), "t1", 17);
|
|
1246
|
+
case 17:
|
|
1247
|
+
_i2++;
|
|
1248
|
+
_context1.next = 16;
|
|
1249
|
+
break;
|
|
1250
|
+
case 18:
|
|
1251
|
+
// request item catalog data to host app
|
|
1252
|
+
if (_cdsItems.length > 0) {
|
|
1253
|
+
(_props$onInternalEven2 = props.onInternalEvent) === null || _props$onInternalEven2 === void 0 || _props$onInternalEven2.call(props, {
|
|
1254
|
+
type: INTERNAL_EVENT_ITEMS_CATALOG,
|
|
1255
|
+
value: {
|
|
1256
|
+
cdsItems: _cdsItems
|
|
1257
|
+
}
|
|
1258
|
+
}, /*#__PURE__*/function () {
|
|
1259
|
+
var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(result) {
|
|
1260
|
+
var _i3, _result$elements2;
|
|
1261
|
+
return _regeneratorRuntime.wrap(function (_context9) {
|
|
1262
|
+
while (1) switch (_context9.prev = _context9.next) {
|
|
1263
|
+
case 0:
|
|
1264
|
+
_i3 = 0;
|
|
1265
|
+
case 1:
|
|
1266
|
+
if (!(_i3 < (result === null || result === void 0 || (_result$elements2 = result.elements) === null || _result$elements2 === void 0 ? void 0 : _result$elements2.length))) {
|
|
1267
|
+
_context9.next = 3;
|
|
1268
|
+
break;
|
|
1269
|
+
}
|
|
1270
|
+
_context9.next = 2;
|
|
1271
|
+
return addItemToCatalog(result.elements[_i3], state, props.catalog, props.projectActions);
|
|
1272
|
+
case 2:
|
|
1273
|
+
_i3++;
|
|
1274
|
+
_context9.next = 1;
|
|
1275
|
+
break;
|
|
1276
|
+
case 3:
|
|
1277
|
+
props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1278
|
+
case 4:
|
|
1279
|
+
case "end":
|
|
1280
|
+
return _context9.stop();
|
|
1281
|
+
}
|
|
1282
|
+
}, _callee8);
|
|
1283
|
+
}));
|
|
1284
|
+
return function (_x12) {
|
|
1285
|
+
return _ref3.apply(this, arguments);
|
|
1286
|
+
};
|
|
1287
|
+
}());
|
|
1288
|
+
} else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1289
|
+
return _context1.abrupt("continue", 35);
|
|
1290
|
+
case 19:
|
|
1210
1291
|
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
|
|
1211
1292
|
props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
|
|
1212
|
-
return
|
|
1213
|
-
case
|
|
1293
|
+
return _context1.abrupt("continue", 35);
|
|
1294
|
+
case 20:
|
|
1214
1295
|
value = state.getIn(['viewer2D']).toJS();
|
|
1215
1296
|
value.a += 0.1;
|
|
1216
1297
|
value.d += 0.1;
|
|
1217
1298
|
value.e -= value.SVGWidth * 0.1 / 2;
|
|
1218
1299
|
value.f -= value.SVGHeight * 0.1 / 2;
|
|
1219
1300
|
updateViwer2D(value, props.viewer2DActions);
|
|
1220
|
-
return
|
|
1221
|
-
case
|
|
1301
|
+
return _context1.abrupt("continue", 35);
|
|
1302
|
+
case 21:
|
|
1222
1303
|
_value = state.getIn(['viewer2D']).toJS();
|
|
1223
1304
|
_value.a -= 0.1;
|
|
1224
1305
|
_value.d -= 0.1;
|
|
1225
1306
|
_value.e += _value.SVGWidth * 0.1 / 2;
|
|
1226
1307
|
_value.f += _value.SVGHeight * 0.1 / 2;
|
|
1227
1308
|
updateViwer2D(_value, props.viewer2DActions);
|
|
1228
|
-
return
|
|
1229
|
-
case
|
|
1309
|
+
return _context1.abrupt("continue", 35);
|
|
1310
|
+
case 22:
|
|
1230
1311
|
centering2D(state, props.viewer2DActions);
|
|
1231
|
-
return
|
|
1232
|
-
case
|
|
1312
|
+
return _context1.abrupt("continue", 35);
|
|
1313
|
+
case 23:
|
|
1233
1314
|
props.projectActions.undo();
|
|
1234
|
-
return
|
|
1235
|
-
case
|
|
1315
|
+
return _context1.abrupt("continue", 35);
|
|
1316
|
+
case 24:
|
|
1236
1317
|
props.projectActions.redo();
|
|
1237
|
-
return
|
|
1238
|
-
case
|
|
1318
|
+
return _context1.abrupt("continue", 35);
|
|
1319
|
+
case 25:
|
|
1239
1320
|
_evt$payload7 = evt.payload, moldingInfo = _evt$payload7.moldingInfo, isGlobal = _evt$payload7.isGlobal;
|
|
1240
|
-
|
|
1321
|
+
_context1.next = 26;
|
|
1241
1322
|
return loadMoldingSvg(moldingInfo);
|
|
1242
|
-
case
|
|
1323
|
+
case 26:
|
|
1243
1324
|
props.itemsActions.setMolding(moldingInfo, isGlobal);
|
|
1244
|
-
return
|
|
1245
|
-
case
|
|
1325
|
+
return _context1.abrupt("continue", 35);
|
|
1326
|
+
case 27:
|
|
1246
1327
|
distElement = getElement(evt.payload, state);
|
|
1247
1328
|
if (distElement) props.itemsActions.duplicateSelected(distElement, props.onInternalEvent);
|
|
1248
|
-
return
|
|
1249
|
-
case
|
|
1329
|
+
return _context1.abrupt("continue", 35);
|
|
1330
|
+
case 28:
|
|
1250
1331
|
_distElement = getElement(evt.payload, state);
|
|
1251
1332
|
if (_distElement) props.projectActions.remove(_distElement);
|
|
1252
|
-
return
|
|
1253
|
-
case
|
|
1333
|
+
return _context1.abrupt("continue", 35);
|
|
1334
|
+
case 29:
|
|
1254
1335
|
_evt$payload8 = evt.payload, option = _evt$payload8.option, _value2 = _evt$payload8.value;
|
|
1255
1336
|
if (option === PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
|
|
1256
1337
|
props.viewer2DActions.updateCeilHeight(_value2);
|
|
@@ -1264,23 +1345,23 @@ function _handleExternalEvent() {
|
|
|
1264
1345
|
} else if (option === PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
|
|
1265
1346
|
props.viewer2DActions.changeWindowDoorMeasure(_value2);
|
|
1266
1347
|
}
|
|
1267
|
-
return
|
|
1268
|
-
case
|
|
1269
|
-
|
|
1270
|
-
layer = state.getIn(['scene', 'layers',
|
|
1348
|
+
return _context1.abrupt("continue", 35);
|
|
1349
|
+
case 30:
|
|
1350
|
+
_layerId = state.getIn(['scene', 'selectedLayer']);
|
|
1351
|
+
layer = state.getIn(['scene', 'layers', _layerId]);
|
|
1271
1352
|
_layer$getIn = layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
|
|
1272
|
-
for (
|
|
1273
|
-
for (
|
|
1274
|
-
for (
|
|
1275
|
-
return
|
|
1276
|
-
case
|
|
1353
|
+
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.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1354
|
+
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.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1355
|
+
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.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1356
|
+
return _context1.abrupt("continue", 35);
|
|
1357
|
+
case 31:
|
|
1277
1358
|
_layerID = state.scene.selectedLayer;
|
|
1278
1359
|
_layer = state.scene.getIn(['layers', _layerID]).toJS();
|
|
1279
1360
|
orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
|
|
1280
1361
|
originalItem = _layer === null || _layer === void 0 ? void 0 : _layer.items[orginalItemInfo.id];
|
|
1281
|
-
|
|
1362
|
+
_context1.next = 32;
|
|
1282
1363
|
return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
|
|
1283
|
-
case
|
|
1364
|
+
case 32:
|
|
1284
1365
|
originalItemPos = {
|
|
1285
1366
|
rotation: originalItem.rotation,
|
|
1286
1367
|
selectedItemId: originalItem.id,
|
|
@@ -1295,23 +1376,23 @@ function _handleExternalEvent() {
|
|
|
1295
1376
|
}
|
|
1296
1377
|
};
|
|
1297
1378
|
props.itemsActions.replaceItem(originalItemPos, originalItem, replaceItem);
|
|
1298
|
-
return
|
|
1299
|
-
case
|
|
1379
|
+
return _context1.abrupt("continue", 35);
|
|
1380
|
+
case 33:
|
|
1300
1381
|
setFinishing(props, state, evt.payload);
|
|
1301
|
-
case
|
|
1382
|
+
case 34:
|
|
1302
1383
|
// send scene object from 3DTool to HostApp using internalEvent
|
|
1303
|
-
(_props$
|
|
1384
|
+
(_props$onInternalEven3 = props.onInternalEvent) === null || _props$onInternalEven3 === void 0 || _props$onInternalEven3.call(props, {
|
|
1304
1385
|
type: INTERNAL_EVENT_SYNC_SCENE,
|
|
1305
1386
|
value: {
|
|
1306
1387
|
scene: state.scene.toJS()
|
|
1307
1388
|
}
|
|
1308
1389
|
});
|
|
1309
|
-
return
|
|
1310
|
-
case
|
|
1390
|
+
return _context1.abrupt("continue", 35);
|
|
1391
|
+
case 35:
|
|
1311
1392
|
case "end":
|
|
1312
|
-
return
|
|
1393
|
+
return _context1.stop();
|
|
1313
1394
|
}
|
|
1314
|
-
},
|
|
1395
|
+
}, _callee9);
|
|
1315
1396
|
}));
|
|
1316
1397
|
return _handleExternalEvent.apply(this, arguments);
|
|
1317
1398
|
}
|
|
@@ -28,12 +28,14 @@ function selectToolDrawingLine(sceneComponentType) {
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
function beginDrawingLine(layerID, x, y, snapMask) {
|
|
31
|
+
var onInternalEvent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
|
|
31
32
|
return {
|
|
32
33
|
type: _constants.BEGIN_DRAWING_LINE,
|
|
33
34
|
layerID: layerID,
|
|
34
35
|
x: x,
|
|
35
36
|
y: y,
|
|
36
|
-
snapMask: snapMask
|
|
37
|
+
snapMask: snapMask,
|
|
38
|
+
onInternalEvent: onInternalEvent
|
|
37
39
|
};
|
|
38
40
|
}
|
|
39
41
|
function updateDrawingLine(x, y, relatedLines, snapMask) {
|
|
@@ -464,6 +464,7 @@ function render3DItem(element, layer, scene, sizeinfo, structure_json, is_corner
|
|
|
464
464
|
var tempPlaceholders = structure.tempPlaceholders;
|
|
465
465
|
var tPlaceholders = tempPlaceholders.find(function (el) {
|
|
466
466
|
return el.id === tempDoorStyles.cabinet_door_style_id;
|
|
467
|
+
// return el.id === tempDoorStyles.cds[0].cabinet_door_style_id;
|
|
467
468
|
});
|
|
468
469
|
if (tPlaceholders !== undefined) {
|
|
469
470
|
placeholders = tPlaceholders.placeholders;
|
package/lib/class/item.js
CHANGED
|
@@ -1155,6 +1155,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
|
|
|
1155
1155
|
for (var x in keys) {
|
|
1156
1156
|
tmp[keys[x]] = doorStyle.doorStyles[keys[x]];
|
|
1157
1157
|
}
|
|
1158
|
+
doorStyle.cds = itemCDS;
|
|
1158
1159
|
state = state.setIn(['scene', 'layers', state.scene.selectedLayer, 'doorStyle'], doorStyle);
|
|
1159
1160
|
state = state.merge({
|
|
1160
1161
|
doorStyle: doorStyle
|
package/lib/class/line.js
CHANGED
|
@@ -15,6 +15,7 @@ var _export2 = require("../utils/export");
|
|
|
15
15
|
var Three = _interopRequireWildcard(require("three"));
|
|
16
16
|
var _constants = require("../constants");
|
|
17
17
|
var _helper = require("../utils/helper");
|
|
18
|
+
var _convertUnitsLite = require("../utils/convert-units-lite");
|
|
18
19
|
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); }
|
|
19
20
|
var timeGlobal = 0;
|
|
20
21
|
var TimeRecorder = /*#__PURE__*/function () {
|
|
@@ -435,7 +436,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
|
|
|
435
436
|
}
|
|
436
437
|
}, {
|
|
437
438
|
key: "beginDrawingLine",
|
|
438
|
-
value: function beginDrawingLine(state, layerID, x, y) {
|
|
439
|
+
value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
|
|
439
440
|
// if end drawing by created area
|
|
440
441
|
if (state.mode == _constants.MODE_IDLE) {
|
|
441
442
|
return {
|
|
@@ -488,6 +489,17 @@ var Line = exports["default"] = /*#__PURE__*/function () {
|
|
|
488
489
|
activeSnapElement: snap ? snap.snap : null,
|
|
489
490
|
drawingSupport: drawingSupport
|
|
490
491
|
});
|
|
492
|
+
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
493
|
+
var payload = line.toJS();
|
|
494
|
+
var v_a = layer.vertices.get(line.vertices.get(0));
|
|
495
|
+
var v_b = layer.vertices.get(line.vertices.get(1));
|
|
496
|
+
var distance = _export2.GeometryUtils.pointsDistance(v_a.x, v_a.y, v_b.x, v_b.y);
|
|
497
|
+
var _length = (0, _convertUnitsLite.convert)(distance).from('cm').to('in');
|
|
498
|
+
payload.length = _length;
|
|
499
|
+
if (onInternalEvent) onInternalEvent({
|
|
500
|
+
type: _constants.INTERNAL_EVENT_START_DRAW_WALL,
|
|
501
|
+
value: payload
|
|
502
|
+
});
|
|
491
503
|
return {
|
|
492
504
|
updatedState: state
|
|
493
505
|
};
|
|
@@ -1207,7 +1207,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1207
1207
|
break;
|
|
1208
1208
|
case constants.MODE_WAITING_DRAWING_LINE:
|
|
1209
1209
|
setdrawStart(true);
|
|
1210
|
-
linesActions.beginDrawingLine(layerID, x, y, state.snapMask);
|
|
1210
|
+
linesActions.beginDrawingLine(layerID, x, y, state.snapMask, onInternalEvent);
|
|
1211
1211
|
break;
|
|
1212
1212
|
case constants.MODE_DRAWING_LINE:
|
|
1213
1213
|
// Blocked 90 degree snap.
|
|
@@ -1221,7 +1221,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1221
1221
|
getConnectedLines();
|
|
1222
1222
|
var endInfor = getEndPoint(vertices, x, y, 'END_DRAWIN_LINE');
|
|
1223
1223
|
linesActions.endDrawingLine(endInfor.x, endInfor.y, state.snapMask);
|
|
1224
|
-
linesActions.beginDrawingLine(layerID, endInfor.x, endInfor.y, state.snapMask);
|
|
1224
|
+
linesActions.beginDrawingLine(layerID, endInfor.x, endInfor.y, state.snapMask, onInternalEvent);
|
|
1225
1225
|
break;
|
|
1226
1226
|
case constants.MODE_DRAWING_HOLE:
|
|
1227
1227
|
holesActions.endDrawingHole(layerID, x, y);
|
|
@@ -1272,6 +1272,8 @@ function Viewer2D(_ref, _ref2) {
|
|
|
1272
1272
|
} else if (((_currentObject5 = _currentObject) === null || _currentObject5 === void 0 ? void 0 : _currentObject5.prototype) === 'items') {
|
|
1273
1273
|
// check this cabinet has warning box
|
|
1274
1274
|
payload.isWarning = (0, _utils.isWarningItem)(_currentObject);
|
|
1275
|
+
// check this item is available molding
|
|
1276
|
+
payload.isMoldingAvailable = _export2.MoldingUtils.isEnableItemForMolding(layer, _currentObject);
|
|
1275
1277
|
// check this item is snapped to wall
|
|
1276
1278
|
payload.isAttachedWall = _export2.MoldingUtils.isAttachedWall(layer, _currentObject);
|
|
1277
1279
|
}
|
|
@@ -1198,7 +1198,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
1198
1198
|
if ((evtElement === null || evtElement === void 0 ? void 0 : evtElement.prototype) === 'items') {
|
|
1199
1199
|
// check this cabinet has warning box
|
|
1200
1200
|
payload.isWarning = (0, _utils.isWarningItem)(evtElement);
|
|
1201
|
-
// check this item is
|
|
1201
|
+
// check this item is available molding
|
|
1202
|
+
payload.isMoldingAvailable = _export.MoldingUtils.isEnableItemForMolding(layer, evtElement); // check this item is snapped to wall
|
|
1202
1203
|
payload.isAttachedWall = _export.MoldingUtils.isAttachedWall(layer, evtElement);
|
|
1203
1204
|
// update distArray
|
|
1204
1205
|
if (pointArray) payload.distArray = pointArray;
|
package/lib/constants.js
CHANGED
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.END_ROTATING_ITEM_3D = exports.END_ROTATING_ITEM = exports.END_LOADING = exports.END_FITTING_IMAGE = exports.END_DRAWING_LINE = exports.END_DRAWING_ITEM = exports.END_DRAWING_HOLE_3D = exports.END_DRAWING_HOLE = exports.END_DRAGGING_VERTEX = exports.END_DRAGGING_LINE = exports.END_DRAGGING_ITEM_3D = exports.END_DRAGGING_ITEM = exports.END_DRAGGING_HOLE_3D = exports.END_DRAGGING_HOLE = exports.END_CREATING_HOLE = exports.END_CREATING_CABINET = exports.ELEVATION_VIEW_TITLE = exports.ELEVATION_VIEW_RIGHT = exports.ELEVATION_VIEW_LEFT = exports.ELEVATION_VIEW_KEYWORD = exports.ELEVATION_VIEW_FRONT = exports.ELEVATION_VIEW_BACK = exports.ELEVATION_VIEW = exports.ELEMENT_VERTEX = exports.ELEMENT_LINE = exports.ELEMENT_ITEM = exports.ELEMENT_HOLE = exports.ELEMENT_AREA = exports.EDIT_WIDTH = exports.EDIT = exports.DUPLICATE_SELECTED = exports.DISTANCE_MEASUREMENT_LINE_COLOR = exports.DISTANCE_EPSILON = exports.DIFFERENT_VALUES_PATH_LENGTH = exports.DELTA = exports.DEFAULT_FONT_FAMILY = exports.DECIMAL_PLACES_3 = exports.DECIMAL_PLACES_2 = exports.DASH_LINE_COLOR = exports.CREATE_ROOM_WITH_SHAPE = exports.COPY_PROPERTIES = exports.CLIENTS_NAME = exports.CHANGE_WINDOW_DOOR_MEASURE = exports.CHANGE_WALL_LENGTH_MEASURE = exports.CHANGE_WALL_CABINET_MEASURE = exports.CHANGE_CATALOG_PAGE = exports.CHANGE_BASE_CABINET_MEASURE = exports.CEIL_UNITS_LENGTH = exports.BROWN_COLOR = exports.BOTTOM_MOLDING_LOCATION = exports.BOTTOM = exports.BG_COLOR_OVERLAY = exports.BG_COLOR_HOVER = exports.BG_COLOR_1 = exports.BG_COLOR_0 = exports.BEGIN_UPLOADING_IMAGE = exports.BEGIN_ROTATING_ITEM_3D = exports.BEGIN_ROTATING_ITEM = exports.BEGIN_FITTING_IMAGE = exports.BEGIN_DRAWING_LINE = exports.BEGIN_DRAGGING_VERTEX = exports.BEGIN_DRAGGING_LINE = exports.BEGIN_DRAGGING_ITEM_3D = exports.BEGIN_DRAGGING_ITEM = exports.BEGIN_DRAGGING_HOLE_3D = exports.BEGIN_DRAGGING_HOLE = exports.BASE_ITEM_MEASUREMENT_LINE_COLOR = exports.BASE_CABINET_LAYOUTPOS = exports.BACK_DIST_ANG = exports.ATT_VERTEXT_TWO = exports.ATT_VERTEXT_ONE = exports.ATT_LINE_LENGTH = exports.ATT_ITEM_ROTATION = exports.ATT_ITEM_POS = exports.ATT_HOLE_OFFSET_B = exports.ATT_HOLE_OFFSET_A = exports.ARROW_TEXT_FORECOLOR = exports.ARROW_TEXT_FONTFACE = exports.ARROW_TEXT_BACKCOLOR = exports.ARROW_COLOR = exports.ARRAY_ELEVATION_VIEW_MODES = exports.ARRAY_3D_MODES = exports.AREA_ACTIONS = exports.API_SERVER_URL = exports.ANIMATE_STEP_MIN = exports.ANIMATE_STEP_MAX = exports.ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT = exports.ANIMATE_OBJECT = exports.ALTERATE_STATE = exports.ADD_VERTICAL_GUIDE = exports.ADD_TO_GROUP = exports.ADD_LAYER = exports.ADD_HORIZONTAL_GUIDE = exports.ADD_GROUP_FROM_SELECTED = exports.ADD_GROUP = exports.ADD_ELEMENT_TO_CATALOG = exports.ADD_CIRCULAR_GUIDE = exports.ADD_CABINETS = exports.ADD_APPLIANCES = exports.ACCENT_COLOR = void 0;
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
10
|
-
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = exports.UPDATE_DRAWING_ITEM = void 0;
|
|
7
|
+
exports.MODE_ELEVATION_VIEW = exports.MODE_DRAWING_LINE = exports.MODE_DRAWING_ITEM_3D = exports.MODE_DRAWING_ITEM = exports.MODE_DRAWING_HOLE_3D = exports.MODE_DRAWING_HOLE = exports.MODE_DRAGGING_VERTEX = exports.MODE_DRAGGING_LINE = exports.MODE_DRAGGING_ITEM_3D = exports.MODE_DRAGGING_ITEM = exports.MODE_DRAGGING_HOLE_3D = exports.MODE_DRAGGING_HOLE = exports.MODE_CONFIGURING_PROJECT = exports.MODE_BACK_ELEVATION_VIEW = exports.MODE_3D_VIEW = exports.MODE_3D_FIRST_PERSON = exports.MODE_2D_ZOOM_OUT = exports.MODE_2D_ZOOM_IN = exports.MODE_2D_PAN = exports.MODE = exports.MIN_ANGLE_DISALLOW_DRAW_WALL = exports.MIDDLE_MOLDING_LOCATION = exports.MEPSILON = exports.MAX_ZOOM_IN_SCALE = exports.MAX_ANGLE_SCALE = exports.MAKE_FLOOR_PLAN = exports.LOGOUT = exports.LOGIN_SUCCESS = exports.LOGIN_ERROR = exports.LOCAL_STORAGE_TOKEN_VALUE = exports.LOCAL_STORAGE_TOKEN_NAME = exports.LOCAL_STORAGE_ORIGINAL_TOKEN = exports.LOCAL_STORAGE_CUSTOMER_INFO = exports.LOCAL_STORAGE_CART_ACTION = exports.LOAD_PROJECT = exports.LIST_QUANTITIES = exports.LIST_PARTS = exports.LINE_THICKNESS = exports.LINE_ACTIONS = exports.LEFT_DIST_ANG = exports.LEFT = exports.LABEL_COLOR = exports.KITCHEN_KONFIGURATOR = exports.KEYBOARD_BUTTON_CODE = exports.ITEM_TYPE = exports.ITEM_MOVE_UP = exports.ITEMS_ACTIONS = exports.INVERT = exports.INTERNAL_EVENT_UNSELECT_ALL = exports.INTERNAL_EVENT_SYNC_SCENE = exports.INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_SELECT_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_ITEMS_CATALOG = exports.INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = exports.INSTALLATION_TYPE_SKU_SUFFIX = exports.INSTALLATION_TYPE_NAME = exports.INSTALLATION_SUFFIX_TYPE = exports.INIT_CATALOG = exports.HOLE_NAMES = exports.HOLE_ACTIONS = exports.HDR_URLS = exports.HAS_LOADINGBAR = exports.GROUP_TRANSLATE = exports.GROUP_ROTATE = exports.GROUP_ACTIONS = exports.GO_BACK_TO_CATALOG_PAGE = exports.FRONT_DIST_ANG = exports.FINISHING_TYPE = exports.FINISHING_TOUCH = exports.EXTERNAL_EVENT_ZOOM_OUT = exports.EXTERNAL_EVENT_ZOOM_IN = exports.EXTERNAL_EVENT_UPDATE_PROPERTY = exports.EXTERNAL_EVENT_UPDATE_ATTRIBUTE = exports.EXTERNAL_EVENT_UNDO = exports.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.EXTERNAL_EVENT_TOGGLE_TO_3D = exports.EXTERNAL_EVENT_TOGGLE_TO_2D = exports.EXTERNAL_EVENT_SYNC_SCENE = exports.EXTERNAL_EVENT_SET_MOLDING = exports.EXTERNAL_EVENT_SET_FINISHING = exports.EXTERNAL_EVENT_REPLACE_CABINET = exports.EXTERNAL_EVENT_REDO = exports.EXTERNAL_EVENT_PROJECT_SETTING = exports.EXTERNAL_EVENT_NEW_PROJECT = exports.EXTERNAL_EVENT_MOVE_PAN = exports.EXTERNAL_EVENT_LOAD_PROJECT = exports.EXTERNAL_EVENT_DUPLICATE_ELEMENT = exports.EXTERNAL_EVENT_DELETE_ELEMENT = exports.EXTERNAL_EVENT_CHANGE_DOORSTYLE = exports.EXTERNAL_EVENT_CENTERING_2D = exports.EXTERNAL_EVENT_ADD_WALL = exports.EXTERNAL_EVENT_ADD_ROOM_SHAPE = exports.EXTERNAL_EVENT_ADD_ITEM = exports.EXTERNAL_EVENT_ADD_HOLE = exports.ERROR_DATABASE = exports.EPSILON = exports.END_UPLOADING_IMAGE = void 0;
|
|
8
|
+
exports.SET_GROUP_ATTRIBUTES = exports.SET_FLOOR_STYLES = exports.SET_DOOR_STYLE = exports.SET_DOOR_HANDLE = exports.SET_DISTANT = exports.SET_COUNTER_TOP = exports.SET_BACKSPLASH_VISIBLE = exports.SET_BACKSPLASH = exports.SET_APPLIANCE_MATERIAL = exports.SELECT_TOOL_ZOOM_OUT = exports.SELECT_TOOL_ZOOM_IN = exports.SELECT_TOOL_UPLOAD_IMAGE = exports.SELECT_TOOL_PAN = exports.SELECT_TOOL_EDIT = exports.SELECT_TOOL_DRAWING_LINE = exports.SELECT_TOOL_DRAWING_ITEM_3D = exports.SELECT_TOOL_DRAWING_ITEM = exports.SELECT_TOOL_DRAWING_HOLE_3D = exports.SELECT_TOOL_DRAWING_HOLE = exports.SELECT_TOOL_3D_VIEW = exports.SELECT_TOOL_3D_FIRST_PERSON = exports.SELECT_LINE = exports.SELECT_LAYER = exports.SELECT_ITEM = exports.SELECT_HOLE = exports.SELECT_GROUP = exports.SELECT_DOOR_STYLE = exports.SELECT_AREA = exports.SELECT_ALL = exports.SELECTALL = exports.SECONDARY_PURPLE_COLOR = exports.SECONDARY_BLUE_COLOR = exports.SCENE_ACTIONS = exports.SAVE_PROJECT = exports.SAVE_DESIGN = exports.ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_MEASUREMENT_LINE_COLOR = exports.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = exports.ROLLBACK = exports.RIGHT_DIST_ANG = exports.RIGHT = exports.REVIEW_AND_QUOTE = exports.REQUEST_ASSISTANCE = exports.REPLACE_SUBMODULE = exports.REPLACE_ITEM = exports.REMOVE_VERTICAL_GUIDE = exports.REMOVE_REPLACE_SUBMODULE = exports.REMOVE_LINEAR = exports.REMOVE_LAYER = exports.REMOVE_HORIZONTAL_GUIDE = exports.REMOVE_GROUP_AND_DELETE_ELEMENTS = exports.REMOVE_GROUP = exports.REMOVE_FROM_GROUP = exports.REMOVE_DRAWING_SUPPORT = exports.REMOVE_CIRCULAR_GUIDE = exports.REMOVE = exports.REDO = exports.RECREATE = exports.PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY = exports.PROP_RESIZE_WIDTH = exports.PROP_RESIZE_HEIGHT = exports.PROP_RESIZE_DEPTH = exports.PROP_OPEN_DOORS = exports.PROP_FLIP_DOOR_HANDLE = exports.PROP_ALTITUDE = exports.PROJECT_SETTING_OPTION = exports.PROJECT_RE_NAME = exports.PROJECT_NAME_LENGTH_LIMIT = exports.PROJECT_ACTIONS = exports.PRODUCT = exports.PRIMARY_GREEN_COLOR = exports.PASTE_PROPERTIES = exports.OVERLAP_SOME = exports.OVERLAP_SAME = exports.OVERLAP_NONE = exports.OVERLAP_LINK = exports.OVERLAP_INCLUDED = exports.OPEN_PROJECT_CONFIGURATOR = exports.OPEN_CATALOG = exports.OBJTYPE_MESH = exports.OBJTYPE_GROUP = exports.NO_DATA_DATABASE = exports.NEW_PROJECT_BTN = exports.NEW_PROJECT = exports.NEW_DESIGN = exports.MOVE_COMPONENT = exports.MOLDING_LOCATIONS = exports.MODE_WAITING_DRAWING_LINE = exports.MODE_VIEWING_CATALOG = exports.MODE_UPLOADING_IMAGE = exports.MODE_SNAPPING = exports.MODE_ROTATING_ITEM_3D = exports.MODE_ROTATING_ITEM = exports.MODE_RIGHT_ELEVATION_VIEW = exports.MODE_LEFT_ELEVATION_VIEW = exports.MODE_IDLE_3D = exports.MODE_IDLE = exports.MODE_FRONT_VIEW = exports.MODE_FRONT_ELEVATION_VIEW = exports.MODE_FITTING_IMAGE = void 0;
|
|
9
|
+
exports.UPDATE_DRAWING_HOLE = exports.UPDATE_DRAGGING_VERTEX = exports.UPDATE_DRAGGING_LINE = exports.UPDATE_DRAGGING_ITEM_CHANGED = exports.UPDATE_DRAGGING_ITEM_3DY = exports.UPDATE_DRAGGING_ITEM_3DX = exports.UPDATE_DRAGGING_ITEM = exports.UPDATE_DRAGGING_HOLE_RULER_CHANGED = exports.UPDATE_DRAGGING_HOLE_CHANGED = exports.UPDATE_DRAGGING_HOLE_3D = exports.UPDATE_DRAGGING_HOLE = exports.UPDATE_CEIL_HEIGHT_UNIT = exports.UPDATE_CEIL_HEIGHT = exports.UPDATE_3D_CEIL_HEIGHT_UNIT = exports.UPDATE_3D_CEIL_HEIGHT = exports.UPDATE_2D_CAMERA = exports.UNSELECT_GROUP = exports.UNSELECT_ALL = exports.UNIT_MILLIMETER = exports.UNIT_MILE = exports.UNIT_METER = exports.UNIT_INCH = exports.UNIT_FOOT = exports.UNIT_CENTIMETER = exports.UNIT_ANGLE = exports.UNITS_LENGTH = exports.UNDO = exports.UNCREATE = exports.TWO_D_FLOOR_PLAN = exports.TOP_MOLDING_LOCATION = exports.TOP = exports.TOGGLE_SNAP = exports.TOGGLE_LOADING_CABINET = exports.TOE_KICK_MOLDING = exports.TITLE_SMALL_COLOR = exports.TITLE_COLOR = exports.THROW_WARNING = exports.THROW_ERROR = exports.TEXT_COLOR_NEUTRAL_7 = exports.TEXT_COLOR_NEUTRAL_6 = exports.TEXT_COLOR_NEUTRAL_5 = exports.TEXT_COLOR_NEUTRAL_4 = exports.TEXT_COLOR_NEUTRAL_3 = exports.TEXT_COLOR_NEUTRAL_2 = exports.TEXT_COLOR_NEUTRAL_1 = exports.TEXT_COLOR_NEUTRAL_0 = exports.TEXT_COLOR = exports.TECHNICAL_VIEW = exports.TALL_CABINET_LAYOUTPOS = exports.TAKE_PICTURE = exports.SUBTOTAL = exports.SUBMIT_REQUEST_ASSIST = exports.SUBMIT_DESIGN = exports.SUBMIT_ADD_CART = exports.STORE_DIST_ARRAY = exports.STOP_DRAWING_LINE = exports.STEP_CABINET_CHOOSE_PRODUCT = exports.STATUS_WARNING_LIGHT_COLOR = exports.STATUS_WARNING_COLOR = exports.STATUS_POSITIVE_LIGHT_COLOR = exports.STATUS_POSITIVE_COLOR = exports.STATUS_OVERDUE_LIGHT_COLOR = exports.STATUS_OVERDUE_COLOR = exports.STATUS_NEGATIVE_LIGHT_COLOR = exports.STATUS_NEGATIVE_COLOR = exports.STATUS_INFO_LIGHT_COLOR = exports.STATUS_INFO_COLOR = exports.SHIFT2DON = exports.SHIFT2DOFF = exports.SHAPE_SVG_WIDTH = exports.SHAPE_SVG_PADDING = exports.SHAPE_SVG_DEPTH = exports.SHADE_LIGHT_PURPLE_COLOR = exports.SHADE_LIGHT_GREEN_COLOR = exports.SHADE_LIGHT_BLUE_COLOR = exports.SHADE_DARK_PURPLE_COLOR = exports.SHADE_DARK_GREEN_COLOR = exports.SHADE_DARK_BLUE_COLOR = exports.SET_WALL_COLOR = exports.SET_USER_DATA = exports.SET_STATE_PROPERTIES = exports.SET_ROTATE_STATUS = exports.SET_RELATED_LINE = exports.SET_PROPERTIES = exports.SET_PROJECT_PROPERTIES = exports.SET_PROJECT_ID = exports.SET_MOVE_STATUS = exports.SET_MOLDING = exports.SET_MODELLING = exports.SET_MODE = exports.SET_LINES_ATTRIBUTES = exports.SET_LAYER_PROPERTIES = exports.SET_ITEMS_ATTRIBUTES = exports.SET_IS_HELP = exports.SET_IS_CABINET_DRAWING = exports.SET_INITIAL_DOOR_STYLE = exports.SET_HOLES_ATTRIBUTES = exports.SET_HANDLE_MATERIAL = exports.SET_GROUP_PROPERTIES = exports.SET_GROUP_BARYCENTER = void 0;
|
|
10
|
+
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = exports.UPDATE_DRAWING_ITEM = exports.UPDATE_DRAWING_HOLE_3D = void 0;
|
|
11
11
|
//API server
|
|
12
12
|
// export const API_SERVER = 'http://localhost:3000/';
|
|
13
13
|
// ACTIONS project
|
|
@@ -757,6 +757,7 @@ var INTERNAL_EVENT_DRAG_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = 'INTERNA
|
|
|
757
757
|
var INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNAL_EVENT_DRAW_ELEMENT';
|
|
758
758
|
var INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
|
|
759
759
|
var INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
760
|
+
var INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_START_DRAW_WALL = 'INTERNAL_EVENT_START_DRAW_WALL';
|
|
760
761
|
|
|
761
762
|
// room shape type
|
|
762
763
|
var ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_TYPE = {
|
|
@@ -19,7 +19,7 @@ function _default(state, action) {
|
|
|
19
19
|
state = state.merge({
|
|
20
20
|
sceneHistory: _export2.history.historyPush(state.sceneHistory, state.scene)
|
|
21
21
|
});
|
|
22
|
-
return _export.Line.beginDrawingLine(state, action.layerID, action.x, action.y).updatedState;
|
|
22
|
+
return _export.Line.beginDrawingLine(state, action.layerID, action.x, action.y, action.onInternalEvent).updatedState;
|
|
23
23
|
case _constants.UPDATE_DRAWING_LINE:
|
|
24
24
|
return _export.Line.updateDrawingLine(state, action.x, action.y, action.relatedLines).updatedState;
|
|
25
25
|
case _constants.STOP_DRAWING_LINE:
|
|
@@ -1059,17 +1059,17 @@ function handleExternalEvent(_x10) {
|
|
|
1059
1059
|
return _handleExternalEvent.apply(this, arguments);
|
|
1060
1060
|
}
|
|
1061
1061
|
function _handleExternalEvent() {
|
|
1062
|
-
_handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function
|
|
1062
|
+
_handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee9(props) {
|
|
1063
1063
|
var _evt$payload3, _evt$payload4;
|
|
1064
|
-
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, _evt$payload5, doorStyle, itemCDS, isAll, _evt$payload6, roomShapeType, width, height, _doorStyle, value, _value, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value2,
|
|
1065
|
-
return _regenerator["default"].wrap(function (
|
|
1066
|
-
while (1) switch (
|
|
1064
|
+
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;
|
|
1065
|
+
return _regenerator["default"].wrap(function (_context1) {
|
|
1066
|
+
while (1) switch (_context1.prev = _context1.next) {
|
|
1067
1067
|
case 0:
|
|
1068
1068
|
// console.log('***external event****', props);
|
|
1069
1069
|
evt = props.externalEvent;
|
|
1070
1070
|
state = props.state.get('KitchenConfigurator');
|
|
1071
1071
|
_t5 = evt === null || evt === void 0 ? void 0 : evt.type;
|
|
1072
|
-
|
|
1072
|
+
_context1.next = _t5 === _constants.EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === _constants.EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 14 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 15 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 19 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 20 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 21 : _t5 === _constants.EXTERNAL_EVENT_CENTERING_2D ? 22 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 23 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 24 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 25 : _t5 === _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 27 : _t5 === _constants.EXTERNAL_EVENT_DELETE_ELEMENT ? 28 : _t5 === _constants.EXTERNAL_EVENT_PROJECT_SETTING ? 29 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 30 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_PROPERTY ? 30 : _t5 === _constants.EXTERNAL_EVENT_REPLACE_CABINET ? 31 : _t5 === _constants.EXTERNAL_EVENT_SET_FINISHING ? 33 : _t5 === _constants.EXTERNAL_EVENT_SYNC_SCENE ? 34 : 35;
|
|
1073
1073
|
break;
|
|
1074
1074
|
case 1:
|
|
1075
1075
|
// prepare item data request
|
|
@@ -1084,7 +1084,7 @@ function _handleExternalEvent() {
|
|
|
1084
1084
|
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]];
|
|
1085
1085
|
if (!cdsItems.some(function (v) {
|
|
1086
1086
|
var _it$doorStyle;
|
|
1087
|
-
return it.
|
|
1087
|
+
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;
|
|
1088
1088
|
})) cdsItems.push({
|
|
1089
1089
|
itemID: it.itemID,
|
|
1090
1090
|
prototype: it.prototype,
|
|
@@ -1103,13 +1103,13 @@ function _handleExternalEvent() {
|
|
|
1103
1103
|
i = 0;
|
|
1104
1104
|
case 2:
|
|
1105
1105
|
if (!(i < itemKeys.length)) {
|
|
1106
|
-
|
|
1106
|
+
_context1.next = 4;
|
|
1107
1107
|
break;
|
|
1108
1108
|
}
|
|
1109
|
-
return
|
|
1109
|
+
return _context1.delegateYield(_loop3(), "t0", 3);
|
|
1110
1110
|
case 3:
|
|
1111
1111
|
i++;
|
|
1112
|
-
|
|
1112
|
+
_context1.next = 2;
|
|
1113
1113
|
break;
|
|
1114
1114
|
case 4:
|
|
1115
1115
|
// request item catalog data to host app
|
|
@@ -1150,30 +1150,30 @@ function _handleExternalEvent() {
|
|
|
1150
1150
|
};
|
|
1151
1151
|
}());
|
|
1152
1152
|
}
|
|
1153
|
-
return
|
|
1153
|
+
return _context1.abrupt("continue", 35);
|
|
1154
1154
|
case 5:
|
|
1155
1155
|
props.projectActions.setMode(_constants.MODE_IDLE_3D);
|
|
1156
|
-
return
|
|
1156
|
+
return _context1.abrupt("continue", 35);
|
|
1157
1157
|
case 6:
|
|
1158
1158
|
props.projectActions.setMode(_constants.MODE_IDLE);
|
|
1159
|
-
return
|
|
1159
|
+
return _context1.abrupt("continue", 35);
|
|
1160
1160
|
case 7:
|
|
1161
1161
|
sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
|
|
1162
1162
|
if (sLineCnt > 0) props.projectActions.setMode(_constants.MODE_ELEVATION_VIEW);
|
|
1163
|
-
return
|
|
1163
|
+
return _context1.abrupt("continue", 35);
|
|
1164
1164
|
case 8:
|
|
1165
1165
|
if (state.mode === _constants.MODE_IDLE || state.mode === _constants.MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
|
|
1166
1166
|
props.projectActions.setMode(_constants.MODE_IDLE);
|
|
1167
1167
|
props.linesActions.selectToolDrawingLine('wall');
|
|
1168
1168
|
}
|
|
1169
|
-
return
|
|
1169
|
+
return _context1.abrupt("continue", 35);
|
|
1170
1170
|
case 9:
|
|
1171
1171
|
if ((0, _helper.isEmpty)(evt === null || evt === void 0 ? void 0 : evt.payload)) {
|
|
1172
|
-
|
|
1172
|
+
_context1.next = 11;
|
|
1173
1173
|
break;
|
|
1174
1174
|
}
|
|
1175
1175
|
element = evt.payload;
|
|
1176
|
-
|
|
1176
|
+
_context1.next = 10;
|
|
1177
1177
|
return addItemToCatalog(element, state, props.catalog, props.projectActions);
|
|
1178
1178
|
case 10:
|
|
1179
1179
|
// start drawing item
|
|
@@ -1197,67 +1197,148 @@ function _handleExternalEvent() {
|
|
|
1197
1197
|
props.projectActions.pushLastSelectedCatalogElementToHistory(element);
|
|
1198
1198
|
props.projectActions.setIsCabinetDrawing(true);
|
|
1199
1199
|
case 11:
|
|
1200
|
-
return
|
|
1200
|
+
return _context1.abrupt("continue", 35);
|
|
1201
1201
|
case 12:
|
|
1202
1202
|
_constants.ARRAY_3D_MODES.includes(state.mode) ? props.holesActions.selectToolDrawingHole3D(evt === null || evt === void 0 || (_evt$payload3 = evt.payload) === null || _evt$payload3 === void 0 ? void 0 : _evt$payload3.holeName) : props.holesActions.selectToolDrawingHole(evt === null || evt === void 0 || (_evt$payload4 = evt.payload) === null || _evt$payload4 === void 0 ? void 0 : _evt$payload4.holeName);
|
|
1203
|
-
return
|
|
1203
|
+
return _context1.abrupt("continue", 35);
|
|
1204
1204
|
case 13:
|
|
1205
1205
|
movePan2D3D(props, evt.payload, state);
|
|
1206
|
-
return
|
|
1206
|
+
return _context1.abrupt("continue", 35);
|
|
1207
1207
|
case 14:
|
|
1208
1208
|
defaulTitle = 'Untitle';
|
|
1209
1209
|
props.projectActions.newProject();
|
|
1210
1210
|
props.projectActions.rename(defaulTitle);
|
|
1211
|
-
return
|
|
1211
|
+
return _context1.abrupt("continue", 35);
|
|
1212
1212
|
case 15:
|
|
1213
|
-
_evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll;
|
|
1214
|
-
|
|
1215
|
-
|
|
1213
|
+
_evt$payload5 = evt.payload, doorStyle = _evt$payload5.doorStyle, itemCDS = _evt$payload5.itemCDS, isAll = _evt$payload5.isAll; // prepare item data request
|
|
1214
|
+
layerId = state.getIn(['scene', 'selectedLayer']);
|
|
1215
|
+
_cdsItems = [];
|
|
1216
|
+
allItems = state.getIn(['scene', 'layers', layerId, 'items']).toJS();
|
|
1217
|
+
selectedItemId = state.getIn(['scene', 'layers', layerId]).selected.items.toJS()[0];
|
|
1218
|
+
_itemKeys = isAll ? (_Object$keys = Object.keys(allItems)) !== null && _Object$keys !== void 0 ? _Object$keys : [] : [selectedItemId];
|
|
1219
|
+
_loop4 = /*#__PURE__*/_regenerator["default"].mark(function _loop4() {
|
|
1220
|
+
var _itemCDS$find;
|
|
1221
|
+
var item, cdsId;
|
|
1222
|
+
return _regenerator["default"].wrap(function (_context0) {
|
|
1223
|
+
while (1) switch (_context0.prev = _context0.next) {
|
|
1224
|
+
case 0:
|
|
1225
|
+
item = allItems[_itemKeys[_i2]];
|
|
1226
|
+
cdsId = (_itemCDS$find = itemCDS.find(function (itCDS) {
|
|
1227
|
+
return itCDS.itemID === item.itemID;
|
|
1228
|
+
})) === null || _itemCDS$find === void 0 ? void 0 : _itemCDS$find.cabinet_door_style_id;
|
|
1229
|
+
if (cdsId && !_cdsItems.some(function (v) {
|
|
1230
|
+
return it.itemID === v.itemID && it.name === v.name && cdsId === v.cdsId;
|
|
1231
|
+
})) _cdsItems.push({
|
|
1232
|
+
itemID: item.itemID,
|
|
1233
|
+
prototype: item.prototype,
|
|
1234
|
+
category: item.category,
|
|
1235
|
+
name: item.name,
|
|
1236
|
+
type: item.type,
|
|
1237
|
+
sku_number: item.sku_number,
|
|
1238
|
+
cdsId: cdsId
|
|
1239
|
+
});
|
|
1240
|
+
case 1:
|
|
1241
|
+
case "end":
|
|
1242
|
+
return _context0.stop();
|
|
1243
|
+
}
|
|
1244
|
+
}, _loop4);
|
|
1245
|
+
});
|
|
1246
|
+
_i2 = 0;
|
|
1216
1247
|
case 16:
|
|
1248
|
+
if (!(_i2 < _itemKeys.length)) {
|
|
1249
|
+
_context1.next = 18;
|
|
1250
|
+
break;
|
|
1251
|
+
}
|
|
1252
|
+
return _context1.delegateYield(_loop4(), "t1", 17);
|
|
1253
|
+
case 17:
|
|
1254
|
+
_i2++;
|
|
1255
|
+
_context1.next = 16;
|
|
1256
|
+
break;
|
|
1257
|
+
case 18:
|
|
1258
|
+
// request item catalog data to host app
|
|
1259
|
+
if (_cdsItems.length > 0) {
|
|
1260
|
+
(_props$onInternalEven2 = props.onInternalEvent) === null || _props$onInternalEven2 === void 0 || _props$onInternalEven2.call(props, {
|
|
1261
|
+
type: _constants.INTERNAL_EVENT_ITEMS_CATALOG,
|
|
1262
|
+
value: {
|
|
1263
|
+
cdsItems: _cdsItems
|
|
1264
|
+
}
|
|
1265
|
+
}, /*#__PURE__*/function () {
|
|
1266
|
+
var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(result) {
|
|
1267
|
+
var _i3, _result$elements2;
|
|
1268
|
+
return _regenerator["default"].wrap(function (_context9) {
|
|
1269
|
+
while (1) switch (_context9.prev = _context9.next) {
|
|
1270
|
+
case 0:
|
|
1271
|
+
_i3 = 0;
|
|
1272
|
+
case 1:
|
|
1273
|
+
if (!(_i3 < (result === null || result === void 0 || (_result$elements2 = result.elements) === null || _result$elements2 === void 0 ? void 0 : _result$elements2.length))) {
|
|
1274
|
+
_context9.next = 3;
|
|
1275
|
+
break;
|
|
1276
|
+
}
|
|
1277
|
+
_context9.next = 2;
|
|
1278
|
+
return addItemToCatalog(result.elements[_i3], state, props.catalog, props.projectActions);
|
|
1279
|
+
case 2:
|
|
1280
|
+
_i3++;
|
|
1281
|
+
_context9.next = 1;
|
|
1282
|
+
break;
|
|
1283
|
+
case 3:
|
|
1284
|
+
props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1285
|
+
case 4:
|
|
1286
|
+
case "end":
|
|
1287
|
+
return _context9.stop();
|
|
1288
|
+
}
|
|
1289
|
+
}, _callee8);
|
|
1290
|
+
}));
|
|
1291
|
+
return function (_x12) {
|
|
1292
|
+
return _ref3.apply(this, arguments);
|
|
1293
|
+
};
|
|
1294
|
+
}());
|
|
1295
|
+
} else props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
|
|
1296
|
+
return _context1.abrupt("continue", 35);
|
|
1297
|
+
case 19:
|
|
1217
1298
|
_evt$payload6 = evt.payload, roomShapeType = _evt$payload6.roomShapeType, width = _evt$payload6.width, height = _evt$payload6.height, _doorStyle = _evt$payload6.doorStyle;
|
|
1218
1299
|
props.projectActions.createRoomWithShape(roomShapeType, width, height, _doorStyle);
|
|
1219
|
-
return
|
|
1220
|
-
case
|
|
1300
|
+
return _context1.abrupt("continue", 35);
|
|
1301
|
+
case 20:
|
|
1221
1302
|
value = state.getIn(['viewer2D']).toJS();
|
|
1222
1303
|
value.a += 0.1;
|
|
1223
1304
|
value.d += 0.1;
|
|
1224
1305
|
value.e -= value.SVGWidth * 0.1 / 2;
|
|
1225
1306
|
value.f -= value.SVGHeight * 0.1 / 2;
|
|
1226
1307
|
(0, _helper.updateViwer2D)(value, props.viewer2DActions);
|
|
1227
|
-
return
|
|
1228
|
-
case
|
|
1308
|
+
return _context1.abrupt("continue", 35);
|
|
1309
|
+
case 21:
|
|
1229
1310
|
_value = state.getIn(['viewer2D']).toJS();
|
|
1230
1311
|
_value.a -= 0.1;
|
|
1231
1312
|
_value.d -= 0.1;
|
|
1232
1313
|
_value.e += _value.SVGWidth * 0.1 / 2;
|
|
1233
1314
|
_value.f += _value.SVGHeight * 0.1 / 2;
|
|
1234
1315
|
(0, _helper.updateViwer2D)(_value, props.viewer2DActions);
|
|
1235
|
-
return
|
|
1236
|
-
case
|
|
1316
|
+
return _context1.abrupt("continue", 35);
|
|
1317
|
+
case 22:
|
|
1237
1318
|
(0, _helper.centering2D)(state, props.viewer2DActions);
|
|
1238
|
-
return
|
|
1239
|
-
case
|
|
1319
|
+
return _context1.abrupt("continue", 35);
|
|
1320
|
+
case 23:
|
|
1240
1321
|
props.projectActions.undo();
|
|
1241
|
-
return
|
|
1242
|
-
case
|
|
1322
|
+
return _context1.abrupt("continue", 35);
|
|
1323
|
+
case 24:
|
|
1243
1324
|
props.projectActions.redo();
|
|
1244
|
-
return
|
|
1245
|
-
case
|
|
1325
|
+
return _context1.abrupt("continue", 35);
|
|
1326
|
+
case 25:
|
|
1246
1327
|
_evt$payload7 = evt.payload, moldingInfo = _evt$payload7.moldingInfo, isGlobal = _evt$payload7.isGlobal;
|
|
1247
|
-
|
|
1328
|
+
_context1.next = 26;
|
|
1248
1329
|
return loadMoldingSvg(moldingInfo);
|
|
1249
|
-
case
|
|
1330
|
+
case 26:
|
|
1250
1331
|
props.itemsActions.setMolding(moldingInfo, isGlobal);
|
|
1251
|
-
return
|
|
1252
|
-
case
|
|
1332
|
+
return _context1.abrupt("continue", 35);
|
|
1333
|
+
case 27:
|
|
1253
1334
|
distElement = getElement(evt.payload, state);
|
|
1254
1335
|
if (distElement) props.itemsActions.duplicateSelected(distElement, props.onInternalEvent);
|
|
1255
|
-
return
|
|
1256
|
-
case
|
|
1336
|
+
return _context1.abrupt("continue", 35);
|
|
1337
|
+
case 28:
|
|
1257
1338
|
_distElement = getElement(evt.payload, state);
|
|
1258
1339
|
if (_distElement) props.projectActions.remove(_distElement);
|
|
1259
|
-
return
|
|
1260
|
-
case
|
|
1340
|
+
return _context1.abrupt("continue", 35);
|
|
1341
|
+
case 29:
|
|
1261
1342
|
_evt$payload8 = evt.payload, option = _evt$payload8.option, _value2 = _evt$payload8.value;
|
|
1262
1343
|
if (option === _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
|
|
1263
1344
|
props.viewer2DActions.updateCeilHeight(_value2);
|
|
@@ -1271,23 +1352,23 @@ function _handleExternalEvent() {
|
|
|
1271
1352
|
} else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
|
|
1272
1353
|
props.viewer2DActions.changeWindowDoorMeasure(_value2);
|
|
1273
1354
|
}
|
|
1274
|
-
return
|
|
1275
|
-
case
|
|
1276
|
-
|
|
1277
|
-
layer = state.getIn(['scene', 'layers',
|
|
1355
|
+
return _context1.abrupt("continue", 35);
|
|
1356
|
+
case 30:
|
|
1357
|
+
_layerId = state.getIn(['scene', 'selectedLayer']);
|
|
1358
|
+
layer = state.getIn(['scene', 'layers', _layerId]);
|
|
1278
1359
|
_layer$getIn = layer.getIn(['selected']), selectedLines = _layer$getIn.lines, selectedHoles = _layer$getIn.holes, selectedItems = _layer$getIn.items;
|
|
1279
|
-
for (
|
|
1280
|
-
for (
|
|
1281
|
-
for (
|
|
1282
|
-
return
|
|
1283
|
-
case
|
|
1360
|
+
for (_i4 = 0; _i4 < selectedLines.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['lines', selectedLines.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1361
|
+
for (_i5 = 0; _i5 < selectedHoles.size; _i5++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['holes', selectedHoles.get(_i5)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1362
|
+
for (_i6 = 0; _i6 < selectedItems.size; _i6++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, state, layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(layer.getIn(['items', selectedItems.get(_i6)]), evt.payload, props.catalog, props.projectActions, evt.callback);
|
|
1363
|
+
return _context1.abrupt("continue", 35);
|
|
1364
|
+
case 31:
|
|
1284
1365
|
_layerID = state.scene.selectedLayer;
|
|
1285
1366
|
_layer = state.scene.getIn(['layers', _layerID]).toJS();
|
|
1286
1367
|
orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
|
|
1287
1368
|
originalItem = _layer === null || _layer === void 0 ? void 0 : _layer.items[orginalItemInfo.id];
|
|
1288
|
-
|
|
1369
|
+
_context1.next = 32;
|
|
1289
1370
|
return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
|
|
1290
|
-
case
|
|
1371
|
+
case 32:
|
|
1291
1372
|
originalItemPos = {
|
|
1292
1373
|
rotation: originalItem.rotation,
|
|
1293
1374
|
selectedItemId: originalItem.id,
|
|
@@ -1302,23 +1383,23 @@ function _handleExternalEvent() {
|
|
|
1302
1383
|
}
|
|
1303
1384
|
};
|
|
1304
1385
|
props.itemsActions.replaceItem(originalItemPos, originalItem, replaceItem);
|
|
1305
|
-
return
|
|
1306
|
-
case
|
|
1386
|
+
return _context1.abrupt("continue", 35);
|
|
1387
|
+
case 33:
|
|
1307
1388
|
setFinishing(props, state, evt.payload);
|
|
1308
|
-
case
|
|
1389
|
+
case 34:
|
|
1309
1390
|
// send scene object from 3DTool to HostApp using internalEvent
|
|
1310
|
-
(_props$
|
|
1391
|
+
(_props$onInternalEven3 = props.onInternalEvent) === null || _props$onInternalEven3 === void 0 || _props$onInternalEven3.call(props, {
|
|
1311
1392
|
type: _constants.INTERNAL_EVENT_SYNC_SCENE,
|
|
1312
1393
|
value: {
|
|
1313
1394
|
scene: state.scene.toJS()
|
|
1314
1395
|
}
|
|
1315
1396
|
});
|
|
1316
|
-
return
|
|
1317
|
-
case
|
|
1397
|
+
return _context1.abrupt("continue", 35);
|
|
1398
|
+
case 35:
|
|
1318
1399
|
case "end":
|
|
1319
|
-
return
|
|
1400
|
+
return _context1.stop();
|
|
1320
1401
|
}
|
|
1321
|
-
},
|
|
1402
|
+
}, _callee9);
|
|
1322
1403
|
}));
|
|
1323
1404
|
return _handleExternalEvent.apply(this, arguments);
|
|
1324
1405
|
}
|