kitchen-simulator 1.1.1-test.60 → 1.1.1-test.61
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 +92 -96
- package/es/KitchenConfiguratorApp.js +143 -136
- 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 -24
- package/es/catalog/factories/area-factory-3d.js +31 -22
- package/es/catalog/factories/area-factory.js +20 -14
- 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 -27
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +31 -29
- package/es/catalog/properties/property-hidden.js +16 -9
- package/es/catalog/properties/property-lenght-measure.js +45 -39
- package/es/catalog/properties/property-length-measure.js +43 -42
- package/es/catalog/properties/property-length-measure_hole.js +45 -39
- 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 -11
- package/es/catalog/utils/exporter.js +15 -11
- package/es/catalog/utils/geom-utils.js +29 -13
- package/es/catalog/utils/item-loader.js +97 -91
- 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 -11
- package/es/class/area.js +28 -26
- package/es/class/export.js +95 -23
- package/es/class/group.js +59 -62
- package/es/class/guide.js +21 -19
- package/es/class/hole.js +89 -87
- package/es/class/item.js +147 -150
- package/es/class/layer.js +65 -63
- package/es/class/line.js +143 -144
- package/es/class/project.js +98 -94
- package/es/class/vertex.js +35 -33
- 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 -30
- package/es/components/style/cancel-button.js +14 -8
- package/es/components/style/content-container.js +16 -12
- package/es/components/style/content-title.js +20 -15
- package/es/components/style/delete-button.js +17 -9
- package/es/components/style/export.js +120 -30
- package/es/components/style/form-block.js +15 -12
- package/es/components/style/form-color-input.js +14 -8
- package/es/components/style/form-label.js +15 -12
- package/es/components/style/form-number-input.js +49 -47
- package/es/components/style/form-number-input_2.js +44 -42
- package/es/components/style/form-select.js +24 -26
- package/es/components/style/form-slider.js +17 -11
- package/es/components/style/form-submit-button.js +17 -9
- package/es/components/style/form-text-input.js +34 -33
- 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 -15
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -66
- 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 -45
- package/es/components/viewer2d/rulerY.js +45 -43
- package/es/components/viewer2d/scene.js +41 -45
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -23
- package/es/components/viewer2d/utils.js +37 -29
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +163 -164
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +23 -24
- package/es/components/viewer3d/dcm.js +7 -1
- package/es/components/viewer3d/fbm.js +7 -1
- package/es/components/viewer3d/front3D.js +21 -17
- 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 -42
- 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 +227 -198
- package/es/components/viewer3d/three-memory-cleaner.js +12 -3
- package/es/components/viewer3d/viewer3d-first-person.js +46 -46
- package/es/components/viewer3d/viewer3d.js +202 -202
- package/es/constants.js +358 -349
- package/es/index.js +13 -6
- package/es/models.js +184 -183
- package/es/plugins/SVGLoader.js +53 -48
- package/es/plugins/autosave.js +9 -3
- package/es/plugins/console-debugger.js +12 -8
- 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 -17
- 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 -190
- 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 -13
- package/es/utils/helper.js +63 -41
- package/es/utils/history.js +15 -8
- package/es/utils/id-broker.js +15 -12
- package/es/utils/logger.js +7 -1
- package/es/utils/math.js +12 -5
- package/es/utils/molding.js +144 -125
- package/es/utils/name-generator.js +13 -11
- package/es/utils/objects-utils.js +19 -7
- package/es/utils/phone-validator.js +7 -1
- package/es/utils/process-black-list.js +10 -6
- package/es/utils/react-if.js +12 -6
- package/es/utils/snap-scene.js +34 -32
- package/es/utils/snap.js +59 -51
- package/es/utils/summarizeCart.js +7 -1
- package/es/utils/threeCSG.es6.js +22 -17
- package/es/version.js +7 -1
- package/lib/@history.js +1 -1
- package/lib/AppContext.js +1 -1
- package/lib/KitchenConfigurator.js +37 -49
- package/lib/KitchenConfiguratorApp.js +60 -61
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +1 -1
- package/lib/catalog/catalog.js +7 -15
- package/lib/catalog/factories/area-factory-3d.js +1 -1
- package/lib/catalog/factories/area-factory.js +4 -6
- package/lib/catalog/factories/export.js +1 -1
- package/lib/catalog/factories/wall-factory-3d.js +2 -2
- package/lib/catalog/factories/wall-factory.js +2 -2
- package/lib/catalog/holes/door-closet/planner-element.js +2 -2
- package/lib/catalog/holes/door-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-exterior/planner-element.js +2 -2
- package/lib/catalog/holes/door-interior/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-sliding/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-framed/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-frameless/planner-element.js +2 -2
- package/lib/catalog/holes/export.js +2 -2
- package/lib/catalog/holes/window-clear/planner-element.js +2 -2
- package/lib/catalog/holes/window-cross/planner-element.js +2 -2
- package/lib/catalog/holes/window-double-hung/planner-element.js +2 -2
- package/lib/catalog/holes/window-vertical/planner-element.js +2 -2
- package/lib/catalog/lines/wall/planner-element.js +1 -1
- package/lib/catalog/molding/molding-dcm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-fbm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-lrm/planner-element.js +2 -2
- package/lib/catalog/properties/export.js +1 -1
- package/lib/catalog/properties/property-checkbox.js +3 -6
- package/lib/catalog/properties/property-color.js +1 -1
- package/lib/catalog/properties/property-enum.js +4 -9
- package/lib/catalog/properties/property-hidden.js +1 -1
- package/lib/catalog/properties/property-lenght-measure.js +5 -6
- package/lib/catalog/properties/property-length-measure.js +7 -13
- package/lib/catalog/properties/property-length-measure_hole.js +5 -6
- package/lib/catalog/properties/property-number.js +1 -1
- package/lib/catalog/properties/property-read-only.js +1 -1
- package/lib/catalog/properties/property-string.js +1 -1
- package/lib/catalog/properties/property-toggle.js +1 -1
- package/lib/catalog/utils/FuseUtils.js +8 -10
- package/lib/catalog/utils/exporter.js +3 -5
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +9 -14
- package/lib/class/FuseUtils.js +8 -10
- package/lib/class/area.js +7 -10
- package/lib/class/export.js +1 -1
- package/lib/class/group.js +11 -19
- package/lib/class/guide.js +9 -12
- package/lib/class/hole.js +5 -8
- package/lib/class/item.js +10 -18
- package/lib/class/layer.js +5 -8
- package/lib/class/line.js +12 -19
- package/lib/class/project.js +8 -10
- package/lib/class/vertex.js +7 -10
- package/lib/components/content.js +2 -2
- package/lib/components/disclaimer/disclaimer.js +1 -1
- package/lib/components/export.js +1 -1
- package/lib/components/style/button.js +15 -21
- package/lib/components/style/cancel-button.js +5 -6
- package/lib/components/style/content-container.js +3 -6
- package/lib/components/style/content-title.js +8 -11
- package/lib/components/style/delete-button.js +6 -7
- package/lib/components/style/export.js +1 -1
- package/lib/components/style/form-block.js +7 -11
- package/lib/components/style/form-color-input.js +5 -6
- package/lib/components/style/form-label.js +7 -11
- package/lib/components/style/form-number-input.js +13 -18
- package/lib/components/style/form-number-input_2.js +13 -18
- package/lib/components/style/form-select.js +10 -19
- package/lib/components/style/form-slider.js +5 -6
- package/lib/components/style/form-submit-button.js +6 -7
- package/lib/components/style/form-text-input.js +17 -22
- package/lib/components/viewer2d/area.js +1 -1
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer2d/grids/grid-streak.js +1 -1
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer2d/grids/grids.js +4 -9
- package/lib/components/viewer2d/group.js +2 -2
- package/lib/components/viewer2d/item.js +5 -10
- package/lib/components/viewer2d/layer.js +1 -1
- package/lib/components/viewer2d/line.js +2 -2
- package/lib/components/viewer2d/ruler.js +1 -1
- package/lib/components/viewer2d/rulerDist.js +1 -1
- package/lib/components/viewer2d/rulerX.js +13 -18
- package/lib/components/viewer2d/rulerY.js +13 -18
- package/lib/components/viewer2d/scene.js +21 -32
- package/lib/components/viewer2d/snap.js +2 -2
- package/lib/components/viewer2d/state.js +5 -10
- package/lib/components/viewer2d/utils.js +5 -9
- package/lib/components/viewer2d/vertex.js +2 -2
- package/lib/components/viewer2d/viewer2d.js +13 -23
- package/lib/components/viewer3d/camera-controls-module/camera-controls.module.js +14 -20
- package/lib/components/viewer3d/front3D.js +4 -9
- package/lib/components/viewer3d/grid-creator.js +2 -2
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +1 -1
- package/lib/components/viewer3d/ruler-utils/layer3D.js +1 -1
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +3 -6
- package/lib/components/viewer3d/ruler-utils/scene3D.js +1 -1
- package/lib/components/viewer3d/ruler-utils/state3D.js +1 -1
- package/lib/components/viewer3d/scene-creator.js +16 -21
- package/lib/components/viewer3d/three-memory-cleaner.js +1 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +11 -16
- package/lib/components/viewer3d/viewer3d.js +15 -20
- package/lib/index.js +1 -1
- package/lib/models.js +51 -56
- package/lib/plugins/console-debugger.js +3 -6
- package/lib/plugins/export.js +1 -1
- package/lib/reducers/export.js +1 -1
- package/lib/styles/export.js +1 -1
- package/lib/translator/translator.js +5 -9
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +11 -18
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +7 -10
- package/lib/utils/helper.js +7 -7
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +5 -8
- package/lib/utils/molding.js +14 -19
- package/lib/utils/name-generator.js +5 -8
- package/lib/utils/objects-utils.js +5 -3
- package/lib/utils/process-black-list.js +3 -5
- package/lib/utils/react-if.js +1 -1
- package/lib/utils/snap-scene.js +3 -7
- package/lib/utils/snap.js +22 -26
- package/lib/utils/threeCSG.es6.js +14 -14
- package/package.json +24 -18
package/es/class/project.js
CHANGED
|
@@ -1,25 +1,30 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports["default"] = void 0;
|
|
9
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
|
+
var _immutable = require("immutable");
|
|
13
|
+
var _constants = _interopRequireWildcard(require("../constants"));
|
|
14
|
+
var constants = _constants;
|
|
15
|
+
var _models = require("../models");
|
|
16
|
+
var _export = require("../utils/export");
|
|
17
|
+
var _export2 = require("../class/export");
|
|
18
|
+
var viewer2DActions = _interopRequireWildcard(require("../actions/viewer2d-actions"));
|
|
19
|
+
var _helper = require("../utils/helper");
|
|
20
|
+
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); }
|
|
2
21
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
3
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
|
|
4
|
-
|
|
5
|
-
function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
|
|
6
|
-
function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
|
|
7
|
-
function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
|
|
8
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
9
|
-
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
10
|
-
import { List, Map } from 'immutable';
|
|
11
|
-
import * as constants from "../constants";
|
|
12
|
-
import { ARRAY_3D_MODES, END_DRAWING_LINE, MODE_CONFIGURING_PROJECT, MODE_DRAWING_HOLE, MODE_DRAWING_ITEM, MODE_DRAWING_ITEM_3D, MODE_DRAWING_LINE, MODE_IDLE, MODE_IDLE_3D, MODE_VIEWING_CATALOG, MODE_WAITING_DRAWING_LINE } from "../constants";
|
|
13
|
-
import { Catalog, Scene, State } from "../models";
|
|
14
|
-
import { GeometryUtils, history } from "../utils/export";
|
|
15
|
-
import { Area, Group, Hole, HorizontalGuide, Item, Layer, Line, VerticalGuide } from "../class/export";
|
|
16
|
-
import * as viewer2DActions from "../actions/viewer2d-actions";
|
|
17
|
-
import { isEmpty } from "../utils/helper";
|
|
18
|
-
var Project = /*#__PURE__*/function () {
|
|
22
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
23
|
+
var Project = exports["default"] = /*#__PURE__*/function () {
|
|
19
24
|
function Project() {
|
|
20
|
-
|
|
25
|
+
(0, _classCallCheck2["default"])(this, Project);
|
|
21
26
|
}
|
|
22
|
-
return
|
|
27
|
+
return (0, _createClass2["default"])(Project, null, [{
|
|
23
28
|
key: "setAlterate",
|
|
24
29
|
value: function setAlterate(state) {
|
|
25
30
|
return {
|
|
@@ -29,7 +34,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
29
34
|
}, {
|
|
30
35
|
key: "openCatalog",
|
|
31
36
|
value: function openCatalog(state) {
|
|
32
|
-
state = this.setMode(state, MODE_VIEWING_CATALOG).updatedState;
|
|
37
|
+
state = this.setMode(state, _constants.MODE_VIEWING_CATALOG).updatedState;
|
|
33
38
|
return {
|
|
34
39
|
updatedState: state
|
|
35
40
|
};
|
|
@@ -49,7 +54,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
49
54
|
a: 0.99,
|
|
50
55
|
d: 0.99
|
|
51
56
|
});
|
|
52
|
-
state = new State({});
|
|
57
|
+
state = new _models.State({});
|
|
53
58
|
state = state.merge({
|
|
54
59
|
doorStyle: doorStyle,
|
|
55
60
|
oStyle: oStyle,
|
|
@@ -97,20 +102,20 @@ var Project = /*#__PURE__*/function () {
|
|
|
97
102
|
for (var x in json_items) {
|
|
98
103
|
_loop(x);
|
|
99
104
|
}
|
|
100
|
-
var newScene = new Scene(sceneJSON);
|
|
101
|
-
state = new State({
|
|
105
|
+
var newScene = new _models.Scene(sceneJSON);
|
|
106
|
+
state = new _models.State({
|
|
102
107
|
scene: newScene.toJS(),
|
|
103
108
|
catalog: state.catalog.toJS()
|
|
104
109
|
});
|
|
105
110
|
state = state.merge({
|
|
106
|
-
sceneHistory: history.historyPush(oldSceneHistory, oldScene)
|
|
111
|
+
sceneHistory: _export.history.historyPush(oldSceneHistory, oldScene)
|
|
107
112
|
});
|
|
108
113
|
if (state.scene.title === '') {
|
|
109
114
|
state = state.mergeIn(['scene', 'title'], oldScene.title);
|
|
110
115
|
}
|
|
111
116
|
|
|
112
117
|
//Validate item positions after loading project.
|
|
113
|
-
state = Item.validateItemPositions(state, layerID).updatedState;
|
|
118
|
+
state = _export2.Item.validateItemPositions(state, layerID).updatedState;
|
|
114
119
|
|
|
115
120
|
// get counterTop and floorStyle is after state created from sceneJSON
|
|
116
121
|
if (state.getIn(['scene', 'layers', layerID, 'counterTop']).uri) {
|
|
@@ -168,8 +173,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
168
173
|
oStyle: oStyle,
|
|
169
174
|
viewer2D: _viewer2D
|
|
170
175
|
});
|
|
171
|
-
state = Item.setCounterTop(state, counterTop).updatedState;
|
|
172
|
-
state = Area.setFloorStyles(state, floorStyle).updatedState;
|
|
176
|
+
state = _export2.Item.setCounterTop(state, counterTop).updatedState;
|
|
177
|
+
state = _export2.Area.setFloorStyles(state, floorStyle).updatedState;
|
|
173
178
|
if (state.getIn(['scene', 'layers', layerID, 'doorStyle']) && !state.getIn(['scene', 'layers', layerID, 'doorStyle', 'install'])) {
|
|
174
179
|
var layerDoorStyle = state.getIn(['scene', 'layers', layerID, 'doorStyle']);
|
|
175
180
|
var install = '';
|
|
@@ -203,8 +208,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
203
208
|
updatedState: state
|
|
204
209
|
};
|
|
205
210
|
}
|
|
206
|
-
state = Layer.setPropertiesOnSelected(state, layerID, properties).updatedState;
|
|
207
|
-
state = Layer.updateMovingState(state, false).updatedState;
|
|
211
|
+
state = _export2.Layer.setPropertiesOnSelected(state, layerID, properties).updatedState;
|
|
212
|
+
state = _export2.Layer.updateMovingState(state, false).updatedState;
|
|
208
213
|
return {
|
|
209
214
|
updatedState: state
|
|
210
215
|
};
|
|
@@ -212,7 +217,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
212
217
|
}, {
|
|
213
218
|
key: "updateProperties",
|
|
214
219
|
value: function updateProperties(state, layerID, properties) {
|
|
215
|
-
state = Layer.updatePropertiesOnSelected(state, layerID, properties).updatedState;
|
|
220
|
+
state = _export2.Layer.updatePropertiesOnSelected(state, layerID, properties).updatedState;
|
|
216
221
|
return {
|
|
217
222
|
updatedState: state
|
|
218
223
|
};
|
|
@@ -221,9 +226,9 @@ var Project = /*#__PURE__*/function () {
|
|
|
221
226
|
key: "setItemsAttributes",
|
|
222
227
|
value: function setItemsAttributes(state, attributes) {
|
|
223
228
|
//TODO apply only to items
|
|
224
|
-
state = Layer.updateMovingState(state, false).updatedState;
|
|
229
|
+
state = _export2.Layer.updateMovingState(state, false).updatedState;
|
|
225
230
|
state.getIn(['scene', 'layers']).forEach(function (layer) {
|
|
226
|
-
state = Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
231
|
+
state = _export2.Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
227
232
|
});
|
|
228
233
|
return {
|
|
229
234
|
updatedState: state
|
|
@@ -235,12 +240,12 @@ var Project = /*#__PURE__*/function () {
|
|
|
235
240
|
//TODO apply only to lines
|
|
236
241
|
if (!isDirect) {
|
|
237
242
|
state.getIn(['scene', 'layers']).forEach(function (layer) {
|
|
238
|
-
state = Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
243
|
+
state = _export2.Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
239
244
|
});
|
|
240
245
|
} else if (isDirect && directData !== null) {
|
|
241
246
|
var layerID = directData.layerID,
|
|
242
247
|
lineID = directData.lineID;
|
|
243
|
-
if (layerID && lineID) state = Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
248
|
+
if (layerID && lineID) state = _export2.Line.setAttributes(state, layerID, lineID, attributes).updatedState;
|
|
244
249
|
}
|
|
245
250
|
return {
|
|
246
251
|
updatedState: state
|
|
@@ -251,7 +256,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
251
256
|
value: function setHolesAttributes(state, attributes) {
|
|
252
257
|
//TODO apply only to holes
|
|
253
258
|
state.getIn(['scene', 'layers']).forEach(function (layer) {
|
|
254
|
-
state = Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
259
|
+
state = _export2.Layer.setAttributesOnSelected(state, layer.id, attributes).updatedState;
|
|
255
260
|
});
|
|
256
261
|
return {
|
|
257
262
|
updatedState: state
|
|
@@ -262,19 +267,19 @@ var Project = /*#__PURE__*/function () {
|
|
|
262
267
|
value: function unselectAll(state) {
|
|
263
268
|
state.getIn(['scene', 'layers']).forEach(function (_ref) {
|
|
264
269
|
var layerID = _ref.id;
|
|
265
|
-
state = Layer.unselectAll(state, layerID).updatedState;
|
|
270
|
+
state = _export2.Layer.unselectAll(state, layerID).updatedState;
|
|
266
271
|
});
|
|
267
272
|
state.getIn(['scene', 'groups']).forEach(function (group) {
|
|
268
|
-
state = Group.unselect(state, group.get('id')).updatedState;
|
|
273
|
+
state = _export2.Group.unselect(state, group.get('id')).updatedState;
|
|
269
274
|
});
|
|
270
275
|
var mode = state.getIn(['mode']);
|
|
271
276
|
if (mode === constants.MODE_DRAGGING_LINE || mode === constants.MODE_DRAGGING_VERTEX) {
|
|
272
277
|
if (mode.includes('3D')) {
|
|
273
|
-
state = state.setIn(['mode'], MODE_IDLE_3D);
|
|
274
|
-
} else state = state.setIn(['mode'], MODE_IDLE);
|
|
278
|
+
state = state.setIn(['mode'], _constants.MODE_IDLE_3D);
|
|
279
|
+
} else state = state.setIn(['mode'], _constants.MODE_IDLE);
|
|
275
280
|
state = state.merge({
|
|
276
281
|
activeSnapElement: null,
|
|
277
|
-
snapElements: new List()
|
|
282
|
+
snapElements: new _immutable.List()
|
|
278
283
|
});
|
|
279
284
|
}
|
|
280
285
|
return {
|
|
@@ -287,7 +292,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
287
292
|
if (value == null) {
|
|
288
293
|
state.getIn(['scene', 'layers']).forEach(function (_ref2) {
|
|
289
294
|
var layerID = _ref2.id;
|
|
290
|
-
state = Layer.selectAll(state, layerID).updatedState;
|
|
295
|
+
state = _export2.Layer.selectAll(state, layerID).updatedState;
|
|
291
296
|
});
|
|
292
297
|
} else {
|
|
293
298
|
var layerID = state.getIn(['scene', 'selectedLayer']);
|
|
@@ -328,33 +333,33 @@ var Project = /*#__PURE__*/function () {
|
|
|
328
333
|
var allVertices = state.getIn(['scene', 'layers', selectedLayer, 'vertices']).toJS();
|
|
329
334
|
var selLines = state.getIn(['scene', 'layers', selectedLayer, 'selected', 'lines']).toJS();
|
|
330
335
|
var lineID = selLines[0];
|
|
331
|
-
var delLine = !isEmpty(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
|
|
336
|
+
var delLine = !(0, _helper.isEmpty)(lineID) && state.getIn(['scene', 'layers', selectedLayer, 'lines', lineID]).toJS();
|
|
332
337
|
var allLines = state.getIn(['scene', 'layers', selectedLayer, 'lines']).toJS();
|
|
333
338
|
var relatedLines = [];
|
|
334
|
-
delLine && GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
|
|
339
|
+
delLine && _export.GeometryUtils.getRelatedLines(relatedLines, delLine, allVertices, allLines);
|
|
335
340
|
selectedLines.forEach(function (lineID) {
|
|
336
|
-
state = Line.remove(state, selectedLayer, lineID).updatedState;
|
|
341
|
+
state = _export2.Line.remove(state, selectedLayer, lineID).updatedState;
|
|
337
342
|
});
|
|
338
343
|
selectedHoles.forEach(function (holeID) {
|
|
339
|
-
state = Hole.remove(state, selectedLayer, holeID).updatedState;
|
|
344
|
+
state = _export2.Hole.remove(state, selectedLayer, holeID).updatedState;
|
|
340
345
|
});
|
|
341
346
|
selectedItems.forEach(function (itemID) {
|
|
342
|
-
state = Item.remove(state, selectedLayer, itemID).updatedState;
|
|
347
|
+
state = _export2.Item.remove(state, selectedLayer, itemID).updatedState;
|
|
343
348
|
});
|
|
344
|
-
if (!isEmpty(relatedLines)) {
|
|
345
|
-
state = state.setIn(['mode'], MODE_DRAWING_LINE);
|
|
349
|
+
if (!(0, _helper.isEmpty)(relatedLines)) {
|
|
350
|
+
state = state.setIn(['mode'], _constants.MODE_DRAWING_LINE);
|
|
346
351
|
relatedLines.forEach(function (relLine, index) {
|
|
347
|
-
state = Line.select(state, selectedLayer, relLine.id).updatedState;
|
|
348
|
-
state = Line.applyWallChanges(state, END_DRAWING_LINE).updatedState;
|
|
352
|
+
state = _export2.Line.select(state, selectedLayer, relLine.id).updatedState;
|
|
353
|
+
state = _export2.Line.applyWallChanges(state, _constants.END_DRAWING_LINE).updatedState;
|
|
349
354
|
});
|
|
350
355
|
}
|
|
351
|
-
state = Layer.unselectAll(state, selectedLayer).updatedState;
|
|
356
|
+
state = _export2.Layer.unselectAll(state, selectedLayer).updatedState;
|
|
352
357
|
var mode = state.getIn(['mode']);
|
|
353
358
|
if (mode.includes('DRAWING') || mode.includes('DRAGGING') || mode.includes('ROTATING')) {
|
|
354
359
|
state = state.merge({
|
|
355
360
|
activeSnapElement: null
|
|
356
361
|
});
|
|
357
|
-
if (mode.endsWith('3D')) state = state.setIn(['mode'], MODE_IDLE_3D);else state = state.setIn(['mode'], MODE_IDLE);
|
|
362
|
+
if (mode.endsWith('3D')) state = state.setIn(['mode'], _constants.MODE_IDLE_3D);else state = state.setIn(['mode'], _constants.MODE_IDLE);
|
|
358
363
|
}
|
|
359
364
|
return {
|
|
360
365
|
updatedState: state
|
|
@@ -371,15 +376,15 @@ var Project = /*#__PURE__*/function () {
|
|
|
371
376
|
var forRedo = window.forRedo;
|
|
372
377
|
window.forRedo = forRedo;
|
|
373
378
|
if (state.scene === sceneHistory.last && sceneHistory.list.size > 1) {
|
|
374
|
-
sceneHistory = history.historyPop(sceneHistory);
|
|
379
|
+
sceneHistory = _export.history.historyPop(sceneHistory);
|
|
375
380
|
}
|
|
376
381
|
forRedo.push(state.scene);
|
|
377
382
|
var mode;
|
|
378
|
-
if (ARRAY_3D_MODES.includes(state.mode)) mode = MODE_IDLE_3D;else mode = MODE_IDLE;
|
|
383
|
+
if (_constants.ARRAY_3D_MODES.includes(state.mode)) mode = _constants.MODE_IDLE_3D;else mode = _constants.MODE_IDLE;
|
|
379
384
|
state = state.merge({
|
|
380
385
|
mode: mode,
|
|
381
386
|
scene: sceneHistory.last,
|
|
382
|
-
sceneHistory: history.historyPop(sceneHistory)
|
|
387
|
+
sceneHistory: _export.history.historyPop(sceneHistory)
|
|
383
388
|
});
|
|
384
389
|
return {
|
|
385
390
|
updatedState: state
|
|
@@ -394,11 +399,11 @@ var Project = /*#__PURE__*/function () {
|
|
|
394
399
|
};
|
|
395
400
|
var scene = forRedo.pop();
|
|
396
401
|
var mode;
|
|
397
|
-
if (ARRAY_3D_MODES.includes(state.mode)) mode = MODE_IDLE_3D;else mode = MODE_IDLE;
|
|
402
|
+
if (_constants.ARRAY_3D_MODES.includes(state.mode)) mode = _constants.MODE_IDLE_3D;else mode = _constants.MODE_IDLE;
|
|
398
403
|
state = state.merge({
|
|
399
404
|
mode: mode,
|
|
400
405
|
scene: scene,
|
|
401
|
-
sceneHistory: history.historyPush(state.sceneHistory, state.scene)
|
|
406
|
+
sceneHistory: _export.history.historyPush(state.sceneHistory, state.scene)
|
|
402
407
|
});
|
|
403
408
|
window.forRedo = forRedo;
|
|
404
409
|
return {
|
|
@@ -427,7 +432,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
427
432
|
key: "recreate",
|
|
428
433
|
value: function recreate(state) {
|
|
429
434
|
if (state.getIn(['drawingSupport', 'type']) !== undefined) state = state.merge({
|
|
430
|
-
mode: MODE_DRAWING_ITEM_3D,
|
|
435
|
+
mode: _constants.MODE_DRAWING_ITEM_3D,
|
|
431
436
|
popup: true
|
|
432
437
|
});
|
|
433
438
|
return {
|
|
@@ -449,10 +454,10 @@ var Project = /*#__PURE__*/function () {
|
|
|
449
454
|
value: function shift2doff(state) {
|
|
450
455
|
if (state.getIn(['drawingSupport', 'type']) !== undefined) {
|
|
451
456
|
if (state.get('selectedElementsHistory')._tail.array[0].prototype === 'holes') state = state.merge({
|
|
452
|
-
mode: MODE_DRAWING_HOLE,
|
|
457
|
+
mode: _constants.MODE_DRAWING_HOLE,
|
|
453
458
|
popup: true
|
|
454
459
|
});else state = state.merge({
|
|
455
|
-
mode: MODE_DRAWING_ITEM,
|
|
460
|
+
mode: _constants.MODE_DRAWING_ITEM,
|
|
456
461
|
popup: true
|
|
457
462
|
});
|
|
458
463
|
}
|
|
@@ -474,22 +479,22 @@ var Project = /*#__PURE__*/function () {
|
|
|
474
479
|
}
|
|
475
480
|
|
|
476
481
|
// ESC event doesn't need when mode = MODE_IDLE || MODE_IDLE_3D
|
|
477
|
-
if (state.mode == MODE_IDLE_3D || state.mode == MODE_IDLE) {
|
|
482
|
+
if (state.mode == _constants.MODE_IDLE_3D || state.mode == _constants.MODE_IDLE) {
|
|
478
483
|
return {
|
|
479
484
|
updatedState: state
|
|
480
485
|
};
|
|
481
486
|
}
|
|
482
487
|
var mode;
|
|
483
|
-
if (state.mode == MODE_DRAWING_ITEM_3D) {
|
|
484
|
-
mode = MODE_IDLE_3D;
|
|
485
|
-
if (state.drawingSupport.has('currentID')) state = Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
|
|
488
|
+
if (state.mode == _constants.MODE_DRAWING_ITEM_3D) {
|
|
489
|
+
mode = _constants.MODE_IDLE_3D;
|
|
490
|
+
if (state.drawingSupport.has('currentID')) state = _export2.Layer.removeElement(state, state.scene.selectedLayer, 'items', state.drawingSupport.get('currentID')).updatedState;
|
|
486
491
|
state = state.merge({
|
|
487
492
|
mode: mode,
|
|
488
|
-
snapElements: new List(),
|
|
493
|
+
snapElements: new _immutable.List(),
|
|
489
494
|
activeSnapElement: null,
|
|
490
|
-
drawingSupport: new Map(),
|
|
491
|
-
draggingSupport: new Map(),
|
|
492
|
-
rotatingSupport: new Map()
|
|
495
|
+
drawingSupport: new _immutable.Map(),
|
|
496
|
+
draggingSupport: new _immutable.Map(),
|
|
497
|
+
rotatingSupport: new _immutable.Map()
|
|
493
498
|
});
|
|
494
499
|
return {
|
|
495
500
|
updatedState: state
|
|
@@ -497,30 +502,30 @@ var Project = /*#__PURE__*/function () {
|
|
|
497
502
|
}
|
|
498
503
|
|
|
499
504
|
// when Add Walls button clicked
|
|
500
|
-
if (state.mode == MODE_WAITING_DRAWING_LINE) {
|
|
501
|
-
mode = MODE_IDLE;
|
|
505
|
+
if (state.mode == _constants.MODE_WAITING_DRAWING_LINE) {
|
|
506
|
+
mode = _constants.MODE_IDLE;
|
|
502
507
|
state = state.merge({
|
|
503
508
|
mode: mode,
|
|
504
|
-
snapElements: new List(),
|
|
509
|
+
snapElements: new _immutable.List(),
|
|
505
510
|
activeSnapElement: null,
|
|
506
|
-
drawingSupport: new Map(),
|
|
507
|
-
draggingSupport: new Map(),
|
|
508
|
-
rotatingSupport: new Map()
|
|
511
|
+
drawingSupport: new _immutable.Map(),
|
|
512
|
+
draggingSupport: new _immutable.Map(),
|
|
513
|
+
rotatingSupport: new _immutable.Map()
|
|
509
514
|
});
|
|
510
515
|
return {
|
|
511
516
|
updatedState: state
|
|
512
517
|
};
|
|
513
518
|
}
|
|
514
|
-
if (ARRAY_3D_MODES.includes(state.mode)) mode = MODE_IDLE_3D;else mode = MODE_IDLE;
|
|
519
|
+
if (_constants.ARRAY_3D_MODES.includes(state.mode)) mode = _constants.MODE_IDLE_3D;else mode = _constants.MODE_IDLE;
|
|
515
520
|
state = state.merge({
|
|
516
521
|
mode: mode,
|
|
517
522
|
scene: sceneHistory.last,
|
|
518
|
-
sceneHistory: history.historyPush(sceneHistory, sceneHistory.last),
|
|
519
|
-
snapElements: new List(),
|
|
523
|
+
sceneHistory: _export.history.historyPush(sceneHistory, sceneHistory.last),
|
|
524
|
+
snapElements: new _immutable.List(),
|
|
520
525
|
activeSnapElement: null,
|
|
521
|
-
drawingSupport: new Map(),
|
|
522
|
-
draggingSupport: new Map(),
|
|
523
|
-
rotatingSupport: new Map()
|
|
526
|
+
drawingSupport: new _immutable.Map(),
|
|
527
|
+
draggingSupport: new _immutable.Map(),
|
|
528
|
+
rotatingSupport: new _immutable.Map()
|
|
524
529
|
});
|
|
525
530
|
return {
|
|
526
531
|
updatedState: state
|
|
@@ -531,7 +536,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
531
536
|
value: function removeDrawingSupport(state) {
|
|
532
537
|
var sceneHistory = state.sceneHistory;
|
|
533
538
|
var mode = state.mode;
|
|
534
|
-
if (!sceneHistory.last && sceneHistory.list.isEmpty() || mode != MODE_DRAWING_ITEM_3D) {
|
|
539
|
+
if (!sceneHistory.last && sceneHistory.list.isEmpty() || mode != _constants.MODE_DRAWING_ITEM_3D) {
|
|
535
540
|
return {
|
|
536
541
|
updatedState: state
|
|
537
542
|
};
|
|
@@ -539,8 +544,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
539
544
|
state = this.unselectAll(state).updatedState;
|
|
540
545
|
state = state.merge({
|
|
541
546
|
scene: sceneHistory.last,
|
|
542
|
-
sceneHistory: history.historyPush(sceneHistory, sceneHistory.last),
|
|
543
|
-
drawingSupport: new Map()
|
|
547
|
+
sceneHistory: _export.history.historyPush(sceneHistory, sceneHistory.last),
|
|
548
|
+
drawingSupport: new _immutable.Map()
|
|
544
549
|
});
|
|
545
550
|
return {
|
|
546
551
|
updatedState: state
|
|
@@ -551,7 +556,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
551
556
|
value: function setProjectProperties(state, properties) {
|
|
552
557
|
var scene = state.scene.merge(properties);
|
|
553
558
|
state = state.merge({
|
|
554
|
-
mode: MODE_IDLE,
|
|
559
|
+
mode: _constants.MODE_IDLE,
|
|
555
560
|
scene: scene
|
|
556
561
|
});
|
|
557
562
|
return {
|
|
@@ -573,7 +578,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
573
578
|
key: "openProjectConfigurator",
|
|
574
579
|
value: function openProjectConfigurator(state) {
|
|
575
580
|
state = state.merge({
|
|
576
|
-
mode: MODE_CONFIGURING_PROJECT
|
|
581
|
+
mode: _constants.MODE_CONFIGURING_PROJECT
|
|
577
582
|
});
|
|
578
583
|
return {
|
|
579
584
|
updatedState: state
|
|
@@ -583,7 +588,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
583
588
|
key: "initCatalog",
|
|
584
589
|
value: function initCatalog(state, catalog) {
|
|
585
590
|
try {
|
|
586
|
-
state = state.set('catalog', new Catalog(catalog));
|
|
591
|
+
state = state.set('catalog', new _models.Catalog(catalog));
|
|
587
592
|
return {
|
|
588
593
|
updatedState: state
|
|
589
594
|
};
|
|
@@ -597,7 +602,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
597
602
|
}, {
|
|
598
603
|
key: "updateMouseCoord",
|
|
599
604
|
value: function updateMouseCoord(state, coords) {
|
|
600
|
-
state = state.set('mouse', new Map(coords));
|
|
605
|
+
state = state.set('mouse', new _immutable.Map(coords));
|
|
601
606
|
return {
|
|
602
607
|
updatedState: state
|
|
603
608
|
};
|
|
@@ -649,7 +654,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
649
654
|
updatedState: state
|
|
650
655
|
};else {
|
|
651
656
|
state = state.merge({
|
|
652
|
-
mode: MODE_WAITING_DRAWING_LINE,
|
|
657
|
+
mode: _constants.MODE_WAITING_DRAWING_LINE,
|
|
653
658
|
activeSnapElement: null
|
|
654
659
|
});
|
|
655
660
|
return {
|
|
@@ -715,7 +720,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
715
720
|
}, {
|
|
716
721
|
key: "addHorizontalGuide",
|
|
717
722
|
value: function addHorizontalGuide(state, coordinate) {
|
|
718
|
-
state = HorizontalGuide.create(state, coordinate).updatedState;
|
|
723
|
+
state = _export2.HorizontalGuide.create(state, coordinate).updatedState;
|
|
719
724
|
return {
|
|
720
725
|
updatedState: state
|
|
721
726
|
};
|
|
@@ -723,7 +728,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
723
728
|
}, {
|
|
724
729
|
key: "addVerticalGuide",
|
|
725
730
|
value: function addVerticalGuide(state, coordinate) {
|
|
726
|
-
state = VerticalGuide.create(state, coordinate).updatedState;
|
|
731
|
+
state = _export2.VerticalGuide.create(state, coordinate).updatedState;
|
|
727
732
|
return {
|
|
728
733
|
updatedState: state
|
|
729
734
|
};
|
|
@@ -739,7 +744,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
739
744
|
}, {
|
|
740
745
|
key: "removeHorizontalGuide",
|
|
741
746
|
value: function removeHorizontalGuide(state, guideID) {
|
|
742
|
-
state = HorizontalGuide.remove(state, guideID).updatedState;
|
|
747
|
+
state = _export2.HorizontalGuide.remove(state, guideID).updatedState;
|
|
743
748
|
return {
|
|
744
749
|
updatedState: state
|
|
745
750
|
};
|
|
@@ -747,7 +752,7 @@ var Project = /*#__PURE__*/function () {
|
|
|
747
752
|
}, {
|
|
748
753
|
key: "removeVerticalGuide",
|
|
749
754
|
value: function removeVerticalGuide(state, guideID) {
|
|
750
|
-
state = VerticalGuide.remove(state, guideID).updatedState;
|
|
755
|
+
state = _export2.VerticalGuide.remove(state, guideID).updatedState;
|
|
751
756
|
return {
|
|
752
757
|
updatedState: state
|
|
753
758
|
};
|
|
@@ -789,5 +794,4 @@ var Project = /*#__PURE__*/function () {
|
|
|
789
794
|
};
|
|
790
795
|
}
|
|
791
796
|
}]);
|
|
792
|
-
}();
|
|
793
|
-
export { Project as default };
|
|
797
|
+
}();
|
package/es/class/vertex.js
CHANGED
|
@@ -1,25 +1,28 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
var
|
|
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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
+
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
|
+
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
11
|
+
var _immutable = require("immutable");
|
|
12
|
+
var _models = require("../models");
|
|
13
|
+
var _export = require("../utils/export");
|
|
14
|
+
var _constants = require("../constants");
|
|
15
|
+
var _export2 = require("../class/export");
|
|
16
|
+
var _helper = require("../utils/helper");
|
|
17
|
+
var Vertex = exports["default"] = /*#__PURE__*/function () {
|
|
15
18
|
function Vertex() {
|
|
16
|
-
|
|
19
|
+
(0, _classCallCheck2["default"])(this, Vertex);
|
|
17
20
|
}
|
|
18
|
-
return
|
|
21
|
+
return (0, _createClass2["default"])(Vertex, null, [{
|
|
19
22
|
key: "add",
|
|
20
23
|
value: function add(state, layerID, x, y, relatedPrototype, relatedID) {
|
|
21
24
|
var vertex = state.getIn(['scene', 'layers', layerID, 'vertices']).find(function (vertex) {
|
|
22
|
-
return GeometryUtils.samePoints(vertex, {
|
|
25
|
+
return _export.GeometryUtils.samePoints(vertex, {
|
|
23
26
|
x: x,
|
|
24
27
|
y: y
|
|
25
28
|
});
|
|
@@ -29,12 +32,12 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
29
32
|
return related.push(relatedID);
|
|
30
33
|
});
|
|
31
34
|
} else {
|
|
32
|
-
vertex = new
|
|
33
|
-
id: IDBroker.acquireID(),
|
|
35
|
+
vertex = new _models.Vertex((0, _defineProperty2["default"])({
|
|
36
|
+
id: _export.IDBroker.acquireID(),
|
|
34
37
|
name: 'Vertex',
|
|
35
38
|
x: x,
|
|
36
39
|
y: y
|
|
37
|
-
}, relatedPrototype, new List([relatedID])));
|
|
40
|
+
}, relatedPrototype, new _immutable.List([relatedID])));
|
|
38
41
|
}
|
|
39
42
|
state = state.setIn(['scene', 'layers', layerID, 'vertices', vertex.id], vertex);
|
|
40
43
|
return {
|
|
@@ -124,11 +127,11 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
124
127
|
}, {
|
|
125
128
|
key: "beginDraggingVertex",
|
|
126
129
|
value: function beginDraggingVertex(state, layerID, vertexID, x, y) {
|
|
127
|
-
var snapElements = SnapSceneUtils.sceneSnapElements(state.scene, new List(), state.snapMask);
|
|
130
|
+
var snapElements = _export.SnapSceneUtils.sceneSnapElements(state.scene, new _immutable.List(), state.snapMask);
|
|
128
131
|
state = state.merge({
|
|
129
|
-
mode: MODE_DRAGGING_VERTEX,
|
|
132
|
+
mode: _constants.MODE_DRAGGING_VERTEX,
|
|
130
133
|
snapElements: snapElements,
|
|
131
|
-
draggingSupport: Map({
|
|
134
|
+
draggingSupport: (0, _immutable.Map)({
|
|
132
135
|
layerID: layerID,
|
|
133
136
|
vertexID: vertexID,
|
|
134
137
|
previousMode: state.get('mode')
|
|
@@ -147,7 +150,7 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
147
150
|
scene = _state.scene;
|
|
148
151
|
var snap = null;
|
|
149
152
|
if (state.snapMask && !state.snapMask.isEmpty()) {
|
|
150
|
-
snap = SnapUtils.nearestSnap(snapElements, x, y, state.snapMask);
|
|
153
|
+
snap = _export.SnapUtils.nearestSnap(snapElements, x, y, state.snapMask);
|
|
151
154
|
if (snap) {
|
|
152
155
|
var _snap$point = snap.point;
|
|
153
156
|
x = _snap$point.x;
|
|
@@ -178,12 +181,12 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
178
181
|
if (lines) {
|
|
179
182
|
state = lines.reduce(function (reducedState, lineID) {
|
|
180
183
|
var eachLine = reducedState.getIn(['scene', 'layers', layerID, 'lines', lineID]);
|
|
181
|
-
if (isEmpty(eachLine)) return reducedState;
|
|
182
|
-
reducedState = Layer.removeZeroLengthLines(reducedState, layerID).updatedState;
|
|
183
|
-
reducedState = Layer.mergeEqualsVertices(reducedState, layerID, vertexID).updatedState;
|
|
184
|
-
reducedState = Line.select(reducedState, layerID, eachLine.id).updatedState;
|
|
185
|
-
reducedState = reducedState.setIn(['mode'], MODE_DRAGGING_VERTEX);
|
|
186
|
-
reducedState = Line.applyWallChanges(reducedState, END_DRAGGING_VERTEX).updatedState;
|
|
184
|
+
if ((0, _helper.isEmpty)(eachLine)) return reducedState;
|
|
185
|
+
reducedState = _export2.Layer.removeZeroLengthLines(reducedState, layerID).updatedState;
|
|
186
|
+
reducedState = _export2.Layer.mergeEqualsVertices(reducedState, layerID, vertexID).updatedState;
|
|
187
|
+
reducedState = _export2.Line.select(reducedState, layerID, eachLine.id).updatedState;
|
|
188
|
+
reducedState = reducedState.setIn(['mode'], _constants.MODE_DRAGGING_VERTEX);
|
|
189
|
+
reducedState = _export2.Line.applyWallChanges(reducedState, _constants.END_DRAGGING_VERTEX).updatedState;
|
|
187
190
|
return reducedState;
|
|
188
191
|
}, state);
|
|
189
192
|
}
|
|
@@ -191,12 +194,11 @@ var Vertex = /*#__PURE__*/function () {
|
|
|
191
194
|
mode: draggingSupport.get('previousMode'),
|
|
192
195
|
draggingSupport: null,
|
|
193
196
|
activeSnapElement: null,
|
|
194
|
-
snapElements: new List()
|
|
197
|
+
snapElements: new _immutable.List()
|
|
195
198
|
});
|
|
196
199
|
return {
|
|
197
200
|
updatedState: state
|
|
198
201
|
};
|
|
199
202
|
}
|
|
200
203
|
}]);
|
|
201
|
-
}();
|
|
202
|
-
export { Vertex as default };
|
|
204
|
+
}();
|