kitchen-simulator 1.1.1-test.71 → 1.1.1-test.72
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/@history.js +5 -2
- package/es/AppContext.js +6 -3
- package/es/KitchenConfigurator.js +86 -87
- package/es/KitchenConfiguratorApp.js +128 -135
- package/es/actions/area-actions.js +8 -5
- package/es/actions/export.js +24 -12
- package/es/actions/groups-actions.js +41 -27
- package/es/actions/holes-actions.js +51 -34
- package/es/actions/items-actions.js +141 -94
- package/es/actions/lines-actions.js +32 -21
- package/es/actions/project-actions.js +141 -94
- package/es/actions/scene-actions.js +17 -11
- package/es/actions/vertices-actions.js +11 -7
- package/es/actions/viewer2d-actions.js +32 -21
- package/es/actions/viewer3d-actions.js +14 -9
- package/es/catalog/areas/area/planner-element.js +5 -2
- package/es/catalog/catalog.js +17 -15
- package/es/catalog/factories/area-factory-3d.js +26 -22
- package/es/catalog/factories/area-factory.js +15 -13
- package/es/catalog/factories/export.js +10 -6
- package/es/catalog/factories/wall-factory-3d.js +36 -31
- package/es/catalog/factories/wall-factory.js +26 -21
- package/es/catalog/holes/door-closet/planner-element.js +19 -15
- package/es/catalog/holes/door-double/planner-element.js +19 -15
- package/es/catalog/holes/door-exterior/planner-element.js +20 -16
- package/es/catalog/holes/door-interior/planner-element.js +20 -16
- package/es/catalog/holes/door-panic/planner-element.js +11 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +19 -15
- package/es/catalog/holes/door-sliding/planner-element.js +21 -17
- package/es/catalog/holes/doorway-framed/planner-element.js +15 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +11 -7
- package/es/catalog/holes/export.js +29 -13
- package/es/catalog/holes/window-clear/planner-element.js +14 -10
- package/es/catalog/holes/window-cross/planner-element.js +14 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +14 -10
- package/es/catalog/holes/window-vertical/planner-element.js +14 -10
- package/es/catalog/lines/wall/planner-element.js +5 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +9 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +9 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +9 -5
- package/es/catalog/properties/export.js +31 -20
- package/es/catalog/properties/property-checkbox.js +29 -28
- package/es/catalog/properties/property-color.js +19 -16
- package/es/catalog/properties/property-enum.js +27 -24
- package/es/catalog/properties/property-hidden.js +12 -9
- package/es/catalog/properties/property-lenght-measure.js +41 -38
- package/es/catalog/properties/property-length-measure.js +39 -36
- package/es/catalog/properties/property-length-measure_hole.js +41 -38
- package/es/catalog/properties/property-number.js +20 -17
- package/es/catalog/properties/property-read-only.js +19 -16
- package/es/catalog/properties/property-string.js +19 -16
- package/es/catalog/properties/property-toggle.js +19 -16
- package/es/catalog/properties/shared-property-style.js +3 -1
- package/es/catalog/utils/FuseUtils.js +13 -12
- package/es/catalog/utils/exporter.js +11 -10
- package/es/catalog/utils/geom-utils.js +24 -13
- package/es/catalog/utils/item-loader.js +92 -86
- package/es/catalog/utils/load-obj.js +24 -20
- package/es/catalog/utils/mtl-loader.js +4 -3
- package/es/catalog/utils/obj-loader.js +4 -3
- package/es/class/FuseUtils.js +13 -12
- package/es/class/area.js +24 -24
- package/es/class/export.js +36 -23
- package/es/class/group.js +55 -53
- package/es/class/guide.js +17 -15
- package/es/class/hole.js +85 -83
- package/es/class/item.js +155 -155
- package/es/class/layer.js +61 -59
- package/es/class/line.js +138 -135
- package/es/class/project.js +94 -93
- package/es/class/vertex.js +31 -29
- package/es/components/content.js +23 -19
- package/es/components/disclaimer/disclaimer.js +13 -10
- package/es/components/export.js +13 -8
- package/es/components/style/button.js +25 -25
- package/es/components/style/cancel-button.js +10 -7
- package/es/components/style/content-container.js +12 -11
- package/es/components/style/content-title.js +15 -13
- package/es/components/style/delete-button.js +12 -8
- package/es/components/style/export.js +46 -30
- package/es/components/style/form-block.js +11 -10
- package/es/components/style/form-color-input.js +10 -7
- package/es/components/style/form-label.js +11 -10
- package/es/components/style/form-number-input.js +43 -45
- package/es/components/style/form-number-input_2.js +39 -41
- package/es/components/style/form-select.js +20 -19
- package/es/components/style/form-slider.js +13 -10
- package/es/components/style/form-submit-button.js +12 -8
- package/es/components/style/form-text-input.js +28 -30
- package/es/components/viewer2d/area.js +20 -17
- package/es/components/viewer2d/export.js +46 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +13 -10
- package/es/components/viewer2d/grids/grids.js +14 -10
- package/es/components/viewer2d/group.js +19 -15
- package/es/components/viewer2d/item.js +65 -61
- package/es/components/viewer2d/layer.js +26 -23
- package/es/components/viewer2d/line.js +106 -101
- package/es/components/viewer2d/ruler.js +25 -22
- package/es/components/viewer2d/rulerDist.js +24 -21
- package/es/components/viewer2d/rulerX.js +44 -46
- package/es/components/viewer2d/rulerY.js +42 -44
- package/es/components/viewer2d/scene.js +34 -35
- package/es/components/viewer2d/snap.js +17 -13
- package/es/components/viewer2d/state.js +22 -18
- package/es/components/viewer2d/utils.js +33 -24
- package/es/components/viewer2d/vertex.js +12 -8
- package/es/components/viewer2d/viewer2d.js +159 -156
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +19 -21
- package/es/components/viewer3d/dcm.js +3 -1
- package/es/components/viewer3d/fbm.js +3 -1
- package/es/components/viewer3d/front3D.js +16 -12
- package/es/components/viewer3d/grid-creator.js +12 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +9 -6
- package/es/components/viewer3d/grids/grid-streak.js +8 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +9 -6
- package/es/components/viewer3d/libs/first-person-controls.js +5 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +3 -1
- package/es/components/viewer3d/libs/mtl-loader.js +3 -1
- package/es/components/viewer3d/libs/obj-loader.js +3 -1
- package/es/components/viewer3d/libs/orbit-controls.js +4 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +4 -2
- package/es/components/viewer3d/lrm.js +3 -1
- package/es/components/viewer3d/model.js +3 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +6 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +21 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +62 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +43 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +13 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +7 -4
- package/es/components/viewer3d/scene-creator.js +223 -197
- package/es/components/viewer3d/three-memory-cleaner.js +7 -3
- package/es/components/viewer3d/viewer3d-first-person.js +42 -42
- package/es/components/viewer3d/viewer3d.js +198 -200
- package/es/constants.js +354 -349
- package/es/index.js +11 -7
- package/es/models.js +191 -193
- package/es/plugins/SVGLoader.js +49 -48
- package/es/plugins/autosave.js +5 -3
- package/es/plugins/console-debugger.js +7 -6
- package/es/plugins/export.js +13 -8
- package/es/plugins/keyboard.js +31 -29
- package/es/reducers/areas-reducer.js +9 -7
- package/es/reducers/export.js +37 -24
- package/es/reducers/groups-reducer.js +33 -31
- package/es/reducers/holes-reducer.js +45 -43
- package/es/reducers/items-reducer.js +108 -106
- package/es/reducers/lines-reducer.js +30 -28
- package/es/reducers/project-reducer.js +107 -105
- package/es/reducers/reducer.js +19 -16
- package/es/reducers/scene-reducer.js +17 -15
- package/es/reducers/user-reducer.js +7 -5
- package/es/reducers/vertices-reducer.js +13 -11
- package/es/reducers/viewer2d-reducer.js +20 -18
- package/es/reducers/viewer3d-reducer.js +18 -16
- package/es/shared-style.js +12 -10
- package/es/styles/export.js +6 -3
- package/es/translator/en.js +3 -1
- package/es/translator/it.js +3 -1
- package/es/translator/ru.js +3 -1
- package/es/translator/translator.js +15 -13
- package/es/utils/browser.js +5 -2
- package/es/utils/convert-units-lite.js +3 -1
- package/es/utils/email-validator.js +3 -1
- package/es/utils/export.js +29 -15
- package/es/utils/geometry.js +280 -190
- package/es/utils/get-edges-of-subgraphs.js +5 -2
- package/es/utils/graph-cycles.js +7 -8
- package/es/utils/graph-inner-cycles.js +14 -10
- package/es/utils/graph.js +13 -9
- package/es/utils/helper.js +58 -41
- package/es/utils/history.js +11 -8
- package/es/utils/id-broker.js +11 -8
- package/es/utils/logger.js +3 -1
- package/es/utils/math.js +8 -5
- package/es/utils/molding.js +146 -130
- package/es/utils/name-generator.js +9 -7
- package/es/utils/objects-utils.js +14 -7
- package/es/utils/phone-validator.js +3 -1
- package/es/utils/process-black-list.js +6 -5
- package/es/utils/react-if.js +9 -7
- package/es/utils/snap-scene.js +30 -27
- package/es/utils/snap.js +57 -53
- package/es/utils/summarizeCart.js +3 -1
- package/es/utils/threeCSG.es6.js +17 -13
- package/es/version.js +3 -1
- package/package.json +1 -1
package/es/class/layer.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
2
|
+
exports.__esModule = true;
|
|
3
|
+
exports["default"] = void 0;
|
|
4
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/classCallCheck"));
|
|
5
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createClass"));
|
|
6
|
+
var _immutable = require("immutable");
|
|
7
|
+
var _export = require("./export");
|
|
8
|
+
var _export2 = require("../utils/export");
|
|
9
|
+
var _models = require("../models");
|
|
10
|
+
var _helper = require("../utils/helper");
|
|
8
11
|
var sameSet = function sameSet(set1, set2) {
|
|
9
12
|
return set1.size === set2.size && set1.isSuperset(set2) && set1.isSubset(set2);
|
|
10
13
|
};
|
|
@@ -17,17 +20,17 @@ var sameDirection = function sameDirection(list1, list2) {
|
|
|
17
20
|
var i1 = list2.indexOf(l1);
|
|
18
21
|
return (i1 - i0 - 1) % list1.size == 0;
|
|
19
22
|
};
|
|
20
|
-
var Layer = /*#__PURE__*/function () {
|
|
23
|
+
var Layer = exports["default"] = /*#__PURE__*/function () {
|
|
21
24
|
function Layer() {
|
|
22
|
-
|
|
25
|
+
(0, _classCallCheck2["default"])(this, Layer);
|
|
23
26
|
}
|
|
24
|
-
return
|
|
27
|
+
return (0, _createClass2["default"])(Layer, null, [{
|
|
25
28
|
key: "create",
|
|
26
29
|
value: function create(state, name, altitude) {
|
|
27
|
-
var layerID = IDBroker.acquireID();
|
|
30
|
+
var layerID = _export2.IDBroker.acquireID();
|
|
28
31
|
name = name || "layer ".concat(layerID);
|
|
29
32
|
altitude = altitude || 0;
|
|
30
|
-
var layer = new
|
|
33
|
+
var layer = new _models.Layer({
|
|
31
34
|
id: layerID,
|
|
32
35
|
name: name,
|
|
33
36
|
altitude: altitude
|
|
@@ -41,7 +44,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
41
44
|
}, {
|
|
42
45
|
key: "select",
|
|
43
46
|
value: function select(state, layerID) {
|
|
44
|
-
if (!state.get('alterate')) state = Project.unselectAll(state).updatedState;
|
|
47
|
+
if (!state.get('alterate')) state = _export.Project.unselectAll(state).updatedState;
|
|
45
48
|
state = state.setIn(['scene', 'selectedLayer'], layerID);
|
|
46
49
|
return {
|
|
47
50
|
updatedState: state
|
|
@@ -50,7 +53,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
50
53
|
}, {
|
|
51
54
|
key: "selectAll",
|
|
52
55
|
value: function selectAll(state, layerID) {
|
|
53
|
-
if (!state.get('alterate')) state = Project.unselectAll(state).updatedState;
|
|
56
|
+
if (!state.get('alterate')) state = _export.Project.unselectAll(state).updatedState;
|
|
54
57
|
state = state.setIn(['scene', 'selectedLayer'], layerID);
|
|
55
58
|
var layer = state.scene.layers.get(layerID);
|
|
56
59
|
layer.items.forEach(function (data) {
|
|
@@ -117,16 +120,16 @@ var Layer = /*#__PURE__*/function () {
|
|
|
117
120
|
items = _state$getIn.items,
|
|
118
121
|
areas = _state$getIn.areas;
|
|
119
122
|
if (lines) lines.forEach(function (line) {
|
|
120
|
-
state = Line.unselect(state, layerID, line.id).updatedState;
|
|
123
|
+
state = _export.Line.unselect(state, layerID, line.id).updatedState;
|
|
121
124
|
});
|
|
122
125
|
if (holes) holes.forEach(function (hole) {
|
|
123
|
-
state = Hole.unselect(state, layerID, hole.id).updatedState;
|
|
126
|
+
state = _export.Hole.unselect(state, layerID, hole.id).updatedState;
|
|
124
127
|
});
|
|
125
128
|
if (items) items.forEach(function (item) {
|
|
126
|
-
state = Item.unselect(state, layerID, item.id).updatedState;
|
|
129
|
+
state = _export.Item.unselect(state, layerID, item.id).updatedState;
|
|
127
130
|
});
|
|
128
131
|
if (areas) areas.forEach(function (area) {
|
|
129
|
-
state = Area.unselect(state, layerID, area.id).updatedState;
|
|
132
|
+
state = _export.Area.unselect(state, layerID, area.id).updatedState;
|
|
130
133
|
});
|
|
131
134
|
return {
|
|
132
135
|
updatedState: state
|
|
@@ -193,9 +196,9 @@ var Layer = /*#__PURE__*/function () {
|
|
|
193
196
|
checkLines.push(relatedLine);
|
|
194
197
|
checkLines.push(line);
|
|
195
198
|
var relatedLines = [];
|
|
196
|
-
GeometryUtils.getRelatedLines(relatedLines, line, vertices, allLines);
|
|
199
|
+
_export2.GeometryUtils.getRelatedLines(relatedLines, line, vertices, allLines);
|
|
197
200
|
var delflag = false;
|
|
198
|
-
if (isEmpty(allLines[line.id])) {
|
|
201
|
+
if ((0, _helper.isEmpty)(allLines[line.id])) {
|
|
199
202
|
delflag = true;
|
|
200
203
|
}
|
|
201
204
|
if (relatedLines.length > 1) {
|
|
@@ -219,8 +222,8 @@ var Layer = /*#__PURE__*/function () {
|
|
|
219
222
|
value: function interiorsurfacedetect(state, drawingLine, vertices, allLineArray, layerID) {
|
|
220
223
|
var relatedLines = [];
|
|
221
224
|
var allLines = allLineArray.toJS();
|
|
222
|
-
GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
223
|
-
if (isEmpty(relatedLines)) {
|
|
225
|
+
_export2.GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
226
|
+
if ((0, _helper.isEmpty)(relatedLines)) {
|
|
224
227
|
return {
|
|
225
228
|
updatedState: state
|
|
226
229
|
};
|
|
@@ -230,7 +233,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
230
233
|
this.lineInterior(relatedLines[0], drawingLine, changeLines, vertices, allLines, checkLines);
|
|
231
234
|
for (var i = 0; i < changeLines.length; i++) {
|
|
232
235
|
// if (changeLines[i].vertices.length === 2)
|
|
233
|
-
if (!isEmpty(allLines[changeLines[i].id])) {
|
|
236
|
+
if (!(0, _helper.isEmpty)(allLines[changeLines[i].id])) {
|
|
234
237
|
state = state.mergeIn(['scene', 'layers', layerID, 'lines', changeLines[i].id, 'vertices'], changeLines[i].vertices);
|
|
235
238
|
}
|
|
236
239
|
}
|
|
@@ -243,7 +246,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
243
246
|
tallLinesArray.forEach(function (tline) {
|
|
244
247
|
var line = tline.toJS();
|
|
245
248
|
var relatedLines = [];
|
|
246
|
-
GeometryUtils.getRelatedLines(relatedLines, line, vertices, tallLines);
|
|
249
|
+
_export2.GeometryUtils.getRelatedLines(relatedLines, line, vertices, tallLines);
|
|
247
250
|
relatedLines.forEach(function (relLine) {
|
|
248
251
|
if (relLine.vertices[0] === line.vertices[1]) {
|
|
249
252
|
if (!reverseLines.some(function (reverseLine) {
|
|
@@ -340,15 +343,15 @@ var Layer = /*#__PURE__*/function () {
|
|
|
340
343
|
// if (vertexCount > 1 && !linesArray.some(line => (line[0]==0 && line[1]==vertexCount-1) || (line[1]==0 && line[0]==vertexCount-1))) {
|
|
341
344
|
// linesArray = linesArray.set(IDBroker.acquireID(), [0, vertexCount-1]);
|
|
342
345
|
// }
|
|
343
|
-
var innerCyclesByVerticesArrayIndex = GraphInnerCycles.calculateInnerCycles(verticesArray, linesArray);
|
|
344
|
-
var innerCyclesByVerticesID = new List(innerCyclesByVerticesArrayIndex).map(function (cycle) {
|
|
345
|
-
return new List(cycle.map(function (vertexIndex) {
|
|
346
|
+
var innerCyclesByVerticesArrayIndex = _export2.GraphInnerCycles.calculateInnerCycles(verticesArray, linesArray);
|
|
347
|
+
var innerCyclesByVerticesID = new _immutable.List(innerCyclesByVerticesArrayIndex).map(function (cycle) {
|
|
348
|
+
return new _immutable.List(cycle.map(function (vertexIndex) {
|
|
346
349
|
return verticesArrayIndex_to_vertexID[vertexIndex];
|
|
347
350
|
}));
|
|
348
351
|
});
|
|
349
352
|
// All area vertices should be ordered in counterclockwise order
|
|
350
353
|
innerCyclesByVerticesID = innerCyclesByVerticesID.map(function (area) {
|
|
351
|
-
return GraphInnerCycles.isClockWiseOrder(area.map(function (vertexID) {
|
|
354
|
+
return _export2.GraphInnerCycles.isClockWiseOrder(area.map(function (vertexID) {
|
|
352
355
|
return state.getIn(['scene', 'layers', layerID, 'vertices', vertexID]);
|
|
353
356
|
})) ? area.reverse() : area;
|
|
354
357
|
});
|
|
@@ -360,7 +363,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
360
363
|
return sameDirection(vertices, area.vertices);
|
|
361
364
|
});
|
|
362
365
|
if (!areaInUse) {
|
|
363
|
-
state = Area.remove(state, layerID, area.id).updatedState;
|
|
366
|
+
state = _export.Area.remove(state, layerID, area.id).updatedState;
|
|
364
367
|
}
|
|
365
368
|
});
|
|
366
369
|
|
|
@@ -371,12 +374,12 @@ var Layer = /*#__PURE__*/function () {
|
|
|
371
374
|
});
|
|
372
375
|
if (areaInUse) {
|
|
373
376
|
areaIDs[ind] = areaInUse.id;
|
|
374
|
-
state = state.setIn(['scene', 'layers', layerID, 'areas', areaIDs[ind], 'holes'], new List());
|
|
377
|
+
state = state.setIn(['scene', 'layers', layerID, 'areas', areaIDs[ind], 'holes'], new _immutable.List());
|
|
375
378
|
} else {
|
|
376
379
|
var areaVerticesCoords = cycle.map(function (vertexID) {
|
|
377
380
|
return state.getIn(['scene', 'layers', layerID, 'vertices', vertexID]);
|
|
378
381
|
});
|
|
379
|
-
var resultAdd = Area.add(state, layerID, 'area', areaVerticesCoords, state.catalog);
|
|
382
|
+
var resultAdd = _export.Area.add(state, layerID, 'area', areaVerticesCoords, state.catalog);
|
|
380
383
|
areaIDs[ind] = resultAdd.area.id;
|
|
381
384
|
state = resultAdd.updatedState;
|
|
382
385
|
}
|
|
@@ -388,7 +391,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
388
391
|
var _state$getIn2 = state.getIn(['scene', 'layers', layerID, 'vertices', vertexID]),
|
|
389
392
|
x = _state$getIn2.x,
|
|
390
393
|
y = _state$getIn2.y;
|
|
391
|
-
return new List([x, y]);
|
|
394
|
+
return new _immutable.List([x, y]);
|
|
392
395
|
});
|
|
393
396
|
return {
|
|
394
397
|
id: id,
|
|
@@ -399,11 +402,11 @@ var Layer = /*#__PURE__*/function () {
|
|
|
399
402
|
// Find all holes for an area
|
|
400
403
|
var i, j;
|
|
401
404
|
for (i = 0; i < verticesCoordsForArea.length; i++) {
|
|
402
|
-
var holesList = new List(); // The holes for this area
|
|
405
|
+
var holesList = new _immutable.List(); // The holes for this area
|
|
403
406
|
var areaVerticesList = verticesCoordsForArea[i].vertices.flatten().toArray();
|
|
404
407
|
for (j = 0; j < verticesCoordsForArea.length; j++) {
|
|
405
408
|
if (i !== j) {
|
|
406
|
-
var isHole = GeometryUtils.ContainsPoint(areaVerticesList, verticesCoordsForArea[j].vertices.get(0).get(0), verticesCoordsForArea[j].vertices.get(0).get(1));
|
|
409
|
+
var isHole = _export2.GeometryUtils.ContainsPoint(areaVerticesList, verticesCoordsForArea[j].vertices.get(0).get(0), verticesCoordsForArea[j].vertices.get(0).get(1));
|
|
407
410
|
if (isHole) {
|
|
408
411
|
holesList = holesList.push(verticesCoordsForArea[j].id);
|
|
409
412
|
}
|
|
@@ -430,7 +433,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
430
433
|
|
|
431
434
|
// update direction of lines surrounding area
|
|
432
435
|
var layer = state.getIn(['scene', 'layers', layerID]);
|
|
433
|
-
var allAreaLines = GeometryUtils.getAllAreaLines(layer);
|
|
436
|
+
var allAreaLines = _export2.GeometryUtils.getAllAreaLines(layer);
|
|
434
437
|
// check whether the room is colsed. in this case, the allAreaLines have some values and if doesn't close, this value has nothing.
|
|
435
438
|
layer.lines.forEach(function (line) {
|
|
436
439
|
allAreaLines.some(function (l) {
|
|
@@ -459,7 +462,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
459
462
|
// layer.vertices.get(line.vertices.get(0)).toJS()
|
|
460
463
|
// );
|
|
461
464
|
if (!isAreaLine) {
|
|
462
|
-
if (!(GeometryUtils.isPointInArea(GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(0))) && GeometryUtils.isPointInArea(GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(1))))) {
|
|
465
|
+
if (!(_export2.GeometryUtils.isPointInArea(_export2.GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(0))) && _export2.GeometryUtils.isPointInArea(_export2.GeometryUtils.getAllArea(layer), layer.vertices.get(line.vertices.get(1))))) {
|
|
463
466
|
separatedLine.push(line);
|
|
464
467
|
}
|
|
465
468
|
}
|
|
@@ -487,7 +490,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
487
490
|
pointArray.push(point);
|
|
488
491
|
});
|
|
489
492
|
pointArray.reverse();
|
|
490
|
-
var resultAdd = Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
493
|
+
var resultAdd = _export.Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
491
494
|
state = resultAdd.updatedState;
|
|
492
495
|
});
|
|
493
496
|
} else if (separatedLineCnt > 1) {
|
|
@@ -524,12 +527,12 @@ var Layer = /*#__PURE__*/function () {
|
|
|
524
527
|
x: ptXMin,
|
|
525
528
|
y: ptYMAX
|
|
526
529
|
});
|
|
527
|
-
var resultAdd = Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
530
|
+
var resultAdd = _export.Area.add(state, layerID, 'area', pointArray, state.catalog);
|
|
528
531
|
state = resultAdd.updatedState;
|
|
529
|
-
if (!isEmpty(drawingInfor)) {
|
|
532
|
+
if (!(0, _helper.isEmpty)(drawingInfor)) {
|
|
530
533
|
var allVertices = state.getIn(['scene', 'layers', layerID, 'vertices']);
|
|
531
534
|
var resultInterior = this.interiorsurfacedetect(state, drawingInfor.drawingLine.toJS(), allVertices.toJS(), allLinesArray, layerID);
|
|
532
|
-
if (!isEmpty(resultInterior)) {
|
|
535
|
+
if (!(0, _helper.isEmpty)(resultInterior)) {
|
|
533
536
|
state = resultInterior.updatedState;
|
|
534
537
|
}
|
|
535
538
|
}
|
|
@@ -546,8 +549,8 @@ var Layer = /*#__PURE__*/function () {
|
|
|
546
549
|
var v_id1 = line.getIn(['vertices', 1]);
|
|
547
550
|
var v0 = newState.getIn(['scene', 'layers', layerID, 'vertices', v_id0]);
|
|
548
551
|
var v1 = newState.getIn(['scene', 'layers', layerID, 'vertices', v_id1]);
|
|
549
|
-
if (GeometryUtils.verticesDistance(v0, v1) === 0) {
|
|
550
|
-
newState = Line.remove(newState, layerID, line.id).updatedState;
|
|
552
|
+
if (_export2.GeometryUtils.verticesDistance(v0, v1) === 0) {
|
|
553
|
+
newState = _export.Line.remove(newState, layerID, line.id).updatedState;
|
|
551
554
|
}
|
|
552
555
|
return newState;
|
|
553
556
|
}, state);
|
|
@@ -564,7 +567,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
564
567
|
updatedState: state
|
|
565
568
|
};
|
|
566
569
|
var doubleVertices = state.getIn(['scene', 'layers', layerID, 'vertices']).filter(function (v) {
|
|
567
|
-
return v.id !== vertexID && GeometryUtils.samePoints(vertex, v) // &&
|
|
570
|
+
return v.id !== vertexID && _export2.GeometryUtils.samePoints(vertex, v) // &&
|
|
568
571
|
//!v.lines.contains( vertexID ) &&
|
|
569
572
|
//!v.areas.contains( vertexID )
|
|
570
573
|
;
|
|
@@ -581,7 +584,7 @@ var Layer = /*#__PURE__*/function () {
|
|
|
581
584
|
});
|
|
582
585
|
}
|
|
583
586
|
});
|
|
584
|
-
reducedState = Vertex.addElement(reducedState, layerID, vertexID, 'lines', lineID).updatedState;
|
|
587
|
+
reducedState = _export.Vertex.addElement(reducedState, layerID, vertexID, 'lines', lineID).updatedState;
|
|
585
588
|
return reducedState;
|
|
586
589
|
}, state);
|
|
587
590
|
var biReduced = doubleVertex.areas.reduce(function (reducedState, areaID) {
|
|
@@ -590,10 +593,10 @@ var Layer = /*#__PURE__*/function () {
|
|
|
590
593
|
return v === doubleVertex.id ? vertexID : v;
|
|
591
594
|
});
|
|
592
595
|
});
|
|
593
|
-
reducedState = Vertex.addElement(reducedState, layerID, vertexID, 'areas', areaID).updatedState;
|
|
596
|
+
reducedState = _export.Vertex.addElement(reducedState, layerID, vertexID, 'areas', areaID).updatedState;
|
|
594
597
|
return reducedState;
|
|
595
598
|
}, reduced);
|
|
596
|
-
state = Vertex.remove(biReduced, layerID, doubleVertex.id, null, null, true).updatedState;
|
|
599
|
+
state = _export.Vertex.remove(biReduced, layerID, doubleVertex.id, null, null, true).updatedState;
|
|
597
600
|
});
|
|
598
601
|
return {
|
|
599
602
|
updatedState: state
|
|
@@ -604,16 +607,16 @@ var Layer = /*#__PURE__*/function () {
|
|
|
604
607
|
value: function setPropertiesOnSelected(state, layerID, properties) {
|
|
605
608
|
var selected = state.getIn(['scene', 'layers', layerID, 'selected']);
|
|
606
609
|
selected.lines.forEach(function (lineID) {
|
|
607
|
-
return state = Line.setProperties(state, layerID, lineID, properties).updatedState;
|
|
610
|
+
return state = _export.Line.setProperties(state, layerID, lineID, properties).updatedState;
|
|
608
611
|
});
|
|
609
612
|
selected.holes.forEach(function (holeID) {
|
|
610
|
-
return state = Hole.setProperties(state, layerID, holeID, properties).updatedState;
|
|
613
|
+
return state = _export.Hole.setProperties(state, layerID, holeID, properties).updatedState;
|
|
611
614
|
});
|
|
612
615
|
selected.areas.forEach(function (areaID) {
|
|
613
|
-
return state = Area.setProperties(state, layerID, areaID, properties).updatedState;
|
|
616
|
+
return state = _export.Area.setProperties(state, layerID, areaID, properties).updatedState;
|
|
614
617
|
});
|
|
615
618
|
selected.items.forEach(function (itemID) {
|
|
616
|
-
return state = Item.setProperties(state, layerID, itemID, properties).updatedState;
|
|
619
|
+
return state = _export.Item.setProperties(state, layerID, itemID, properties).updatedState;
|
|
617
620
|
});
|
|
618
621
|
return {
|
|
619
622
|
updatedState: state
|
|
@@ -624,16 +627,16 @@ var Layer = /*#__PURE__*/function () {
|
|
|
624
627
|
value: function updatePropertiesOnSelected(state, layerID, properties) {
|
|
625
628
|
var selected = state.getIn(['scene', 'layers', layerID, 'selected']);
|
|
626
629
|
selected.lines.forEach(function (lineID) {
|
|
627
|
-
return state = Line.updateProperties(state, layerID, lineID, properties).updatedState;
|
|
630
|
+
return state = _export.Line.updateProperties(state, layerID, lineID, properties).updatedState;
|
|
628
631
|
});
|
|
629
632
|
selected.holes.forEach(function (holeID) {
|
|
630
|
-
return state = Hole.updateProperties(state, layerID, holeID, properties).updatedState;
|
|
633
|
+
return state = _export.Hole.updateProperties(state, layerID, holeID, properties).updatedState;
|
|
631
634
|
});
|
|
632
635
|
selected.areas.forEach(function (areaID) {
|
|
633
|
-
return state = Area.updateProperties(state, layerID, areaID, properties).updatedState;
|
|
636
|
+
return state = _export.Area.updateProperties(state, layerID, areaID, properties).updatedState;
|
|
634
637
|
});
|
|
635
638
|
selected.items.forEach(function (itemID) {
|
|
636
|
-
return state = Item.updateProperties(state, layerID, itemID, properties).updatedState;
|
|
639
|
+
return state = _export.Item.updateProperties(state, layerID, itemID, properties).updatedState;
|
|
637
640
|
});
|
|
638
641
|
return {
|
|
639
642
|
updatedState: state
|
|
@@ -644,13 +647,13 @@ var Layer = /*#__PURE__*/function () {
|
|
|
644
647
|
value: function setAttributesOnSelected(state, layerID, attributes) {
|
|
645
648
|
var selected = state.getIn(['scene', 'layers', layerID, 'selected']);
|
|
646
649
|
selected.lines.forEach(function (lineID) {
|
|
647
|
-
return state = Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
650
|
+
return state = _export.Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
648
651
|
});
|
|
649
652
|
selected.holes.forEach(function (holeID) {
|
|
650
|
-
return state = Hole.setAttributes(state, layerID, holeID, attributes).updatedState;
|
|
653
|
+
return state = _export.Hole.setAttributes(state, layerID, holeID, attributes).updatedState;
|
|
651
654
|
});
|
|
652
655
|
selected.items.forEach(function (itemID) {
|
|
653
|
-
return state = Item.setAttributes(state, layerID, itemID, attributes).updatedState;
|
|
656
|
+
return state = _export.Item.setAttributes(state, layerID, itemID, attributes).updatedState;
|
|
654
657
|
});
|
|
655
658
|
//selected.areas.forEach(areaID => state = Area.setAttributes( state, layerID, areaID, attributes ).updatedState);
|
|
656
659
|
|
|
@@ -659,5 +662,4 @@ var Layer = /*#__PURE__*/function () {
|
|
|
659
662
|
};
|
|
660
663
|
}
|
|
661
664
|
}]);
|
|
662
|
-
}();
|
|
663
|
-
export { Layer as default };
|
|
665
|
+
}();
|