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