kitchen-simulator 1.1.1-test.6 → 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 +95 -106
- package/es/KitchenConfiguratorApp.js +145 -154
- 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 +18 -8
- 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 +21 -11
- 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 +84 -35
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +72 -28
- 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 +84 -34
- 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 +9 -3
- package/es/catalog/utils/obj-loader.js +9 -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 -88
- package/es/class/item.js +150 -155
- 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 +29 -19
- package/es/components/disclaimer/disclaimer.js +80 -92
- 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 +73 -47
- package/es/components/style/form-number-input_2.js +44 -42
- package/es/components/style/form-select.js +60 -14
- package/es/components/style/form-slider.js +38 -16
- package/es/components/style/form-submit-button.js +17 -9
- package/es/components/style/form-text-input.js +57 -37
- 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 -11
- package/es/components/viewer2d/grids/grid-streak.js +17 -11
- package/es/components/viewer2d/grids/grid-vertical-streak.js +17 -11
- package/es/components/viewer2d/grids/grids.js +19 -15
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -68
- package/es/components/viewer2d/layer.js +30 -23
- package/es/components/viewer2d/line.js +111 -104
- package/es/components/viewer2d/ruler.js +29 -23
- 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 +42 -46
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -23
- package/es/components/viewer2d/utils.js +65 -21
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +171 -166
- 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 +8 -2
- package/es/components/viewer3d/libs/obj-loader.js +8 -2
- package/es/components/viewer3d/libs/orbit-controls.js +12 -5
- package/es/components/viewer3d/libs/pointer-lock-controls.js +11 -4
- 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 +18 -11
- 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 +208 -209
- package/es/constants.js +358 -349
- package/es/index.js +28 -15
- package/es/models.js +185 -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 -109
- 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 -6
- 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 +35 -0
- package/es/utils/email-validator.js +7 -1
- package/es/utils/export.js +46 -15
- package/es/utils/geometry.js +279 -191
- package/es/utils/get-edges-of-subgraphs.js +9 -1
- package/es/utils/graph-cycles.js +11 -9
- package/es/utils/graph-inner-cycles.js +18 -10
- package/es/utils/graph.js +17 -12
- package/es/utils/helper.js +63 -109
- 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 +177 -158
- 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 +68 -87
- package/lib/KitchenConfiguratorApp.js +94 -110
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +12 -8
- 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 +4 -4
- 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 +14 -14
- 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 +15 -11
- 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 +66 -24
- package/lib/catalog/properties/property-color.js +1 -1
- package/lib/catalog/properties/property-enum.js +52 -15
- package/lib/catalog/properties/property-hidden.js +1 -1
- package/lib/catalog/properties/property-lenght-measure.js +8 -9
- package/lib/catalog/properties/property-length-measure.js +59 -16
- package/lib/catalog/properties/property-length-measure_hole.js +8 -9
- 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 +8 -11
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +29 -35
- package/lib/catalog/utils/mtl-loader.js +7 -3
- package/lib/catalog/utils/obj-loader.js +7 -3
- 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 +23 -34
- 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 +3 -2
- package/lib/components/disclaimer/disclaimer.js +67 -87
- 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 +41 -22
- package/lib/components/style/form-number-input_2.js +13 -18
- package/lib/components/style/form-select.js +51 -14
- package/lib/components/style/form-slider.js +26 -11
- package/lib/components/style/form-submit-button.js +6 -7
- package/lib/components/style/form-text-input.js +44 -31
- package/lib/components/viewer2d/area.js +6 -6
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +1 -2
- package/lib/components/viewer2d/grids/grid-streak.js +1 -2
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +1 -2
- package/lib/components/viewer2d/grids/grids.js +4 -9
- package/lib/components/viewer2d/group.js +2 -2
- package/lib/components/viewer2d/item.js +12 -18
- package/lib/components/viewer2d/layer.js +1 -1
- package/lib/components/viewer2d/line.js +4 -7
- package/lib/components/viewer2d/ruler.js +7 -8
- package/lib/components/viewer2d/rulerDist.js +5 -5
- package/lib/components/viewer2d/rulerX.js +13 -18
- package/lib/components/viewer2d/rulerY.js +13 -18
- package/lib/components/viewer2d/scene.js +22 -33
- package/lib/components/viewer2d/snap.js +2 -2
- package/lib/components/viewer2d/state.js +5 -10
- package/lib/components/viewer2d/utils.js +35 -2
- package/lib/components/viewer2d/vertex.js +2 -2
- package/lib/components/viewer2d/viewer2d.js +38 -40
- 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/libs/mtl-loader.js +6 -2
- package/lib/components/viewer3d/libs/obj-loader.js +6 -2
- package/lib/components/viewer3d/libs/orbit-controls.js +10 -5
- package/lib/components/viewer3d/libs/pointer-lock-controls.js +9 -4
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +8 -8
- package/lib/components/viewer3d/ruler-utils/layer3D.js +33 -33
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +3 -6
- package/lib/components/viewer3d/ruler-utils/scene3D.js +4 -5
- package/lib/components/viewer3d/ruler-utils/state3D.js +1 -1
- package/lib/components/viewer3d/scene-creator.js +40 -45
- 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 +32 -37
- package/lib/index.js +22 -88
- package/lib/models.js +58 -63
- package/lib/plugins/console-debugger.js +3 -6
- package/lib/plugins/export.js +1 -1
- package/lib/reducers/export.js +1 -1
- package/lib/reducers/user-reducer.js +0 -1
- package/lib/reducers/viewer2d-reducer.js +3 -4
- package/lib/reducers/viewer3d-reducer.js +3 -4
- package/lib/styles/export.js +1 -1
- package/lib/translator/translator.js +5 -9
- package/lib/utils/convert-units-lite.js +35 -0
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +20 -28
- package/lib/utils/get-edges-of-subgraphs.js +7 -1
- package/lib/utils/graph-cycles.js +9 -9
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +15 -12
- package/lib/utils/helper.js +14 -83
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +7 -10
- package/lib/utils/molding.js +66 -71
- 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 -54
- package/es/analytics/ga4.js +0 -191
- package/es/analytics/posthog.js +0 -60
- package/lib/analytics/ga4.js +0 -197
- package/lib/analytics/posthog.js +0 -68
|
@@ -1,33 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
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"] = Viewer2D;
|
|
9
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
12
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
13
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
14
|
+
var _reactSvgPanZoom = require("react-svg-pan-zoom");
|
|
15
|
+
var _constants = _interopRequireWildcard(require("../../constants"));
|
|
16
|
+
var constants = _constants;
|
|
17
|
+
var _state = _interopRequireDefault(require("./state"));
|
|
18
|
+
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
19
|
+
var _export = require("./export");
|
|
20
|
+
var _export2 = require("../../utils/export");
|
|
21
|
+
var _formNumberInput = _interopRequireDefault(require("../style/form-number-input"));
|
|
22
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
23
|
+
var _immutable = require("immutable");
|
|
24
|
+
var _math = require("../../utils/math");
|
|
25
|
+
var _helper = require("../../utils/helper");
|
|
26
|
+
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); }
|
|
6
27
|
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; }
|
|
7
|
-
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) {
|
|
8
|
-
|
|
9
|
-
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
|
|
10
|
-
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); }
|
|
11
|
-
function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
|
|
12
|
-
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
13
|
-
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
14
|
-
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
15
|
-
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
16
|
-
function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
|
|
17
|
-
import React, { useEffect, useRef, useState } from 'react';
|
|
18
|
-
import PropTypes from 'prop-types';
|
|
19
|
-
import { ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT, zoom } from 'react-svg-pan-zoom';
|
|
20
|
-
import * as constants from "../../constants";
|
|
21
|
-
import State from "./state";
|
|
22
|
-
import * as SharedStyle from "../../shared-style";
|
|
23
|
-
import { RulerX, RulerY } from "./export";
|
|
24
|
-
import { DECIMAL_PLACES_2, LINE_THICKNESS, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_ELEVATION_VIEW, MODE_IDLE, UNIT_ANGLE } from "../../constants";
|
|
25
|
-
import { GeometryUtils } from "../../utils/export";
|
|
26
|
-
import FormNumberInput from "../style/form-number-input";
|
|
27
|
-
import convert from 'convert-units';
|
|
28
|
-
import { Map } from 'immutable';
|
|
29
|
-
import { formatNumber } from "../../utils/math";
|
|
30
|
-
import { isEmpty } from "../../utils/helper";
|
|
28
|
+
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; }
|
|
29
|
+
// variables
|
|
31
30
|
|
|
32
31
|
// variables
|
|
33
32
|
var pinFlag = false;
|
|
@@ -47,19 +46,19 @@ var allArea;
|
|
|
47
46
|
// /////////
|
|
48
47
|
function mode2Tool(mode) {
|
|
49
48
|
if (pinFlag) {
|
|
50
|
-
return TOOL_NONE;
|
|
49
|
+
return _reactSvgPanZoom.TOOL_NONE;
|
|
51
50
|
}
|
|
52
51
|
switch (mode) {
|
|
53
52
|
case constants.MODE_2D_PAN:
|
|
54
|
-
return TOOL_PAN;
|
|
53
|
+
return _reactSvgPanZoom.TOOL_PAN;
|
|
55
54
|
case constants.MODE_2D_ZOOM_IN:
|
|
56
|
-
return TOOL_ZOOM_IN;
|
|
55
|
+
return _reactSvgPanZoom.TOOL_ZOOM_IN;
|
|
57
56
|
case constants.MODE_2D_ZOOM_OUT:
|
|
58
|
-
return TOOL_ZOOM_OUT;
|
|
57
|
+
return _reactSvgPanZoom.TOOL_ZOOM_OUT;
|
|
59
58
|
case constants.MODE_IDLE:
|
|
60
|
-
return TOOL_AUTO;
|
|
59
|
+
return _reactSvgPanZoom.TOOL_AUTO;
|
|
61
60
|
default:
|
|
62
|
-
return TOOL_NONE;
|
|
61
|
+
return _reactSvgPanZoom.TOOL_NONE;
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
64
|
function mode2PointerEvents(mode) {
|
|
@@ -131,7 +130,7 @@ function extractElementData(node) {
|
|
|
131
130
|
direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
|
|
132
131
|
};
|
|
133
132
|
}
|
|
134
|
-
|
|
133
|
+
function Viewer2D(_ref, _ref2) {
|
|
135
134
|
var state = _ref.state,
|
|
136
135
|
width = _ref.width,
|
|
137
136
|
height = _ref.height,
|
|
@@ -145,29 +144,29 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
145
144
|
areaActions = _ref2.areaActions,
|
|
146
145
|
projectActions = _ref2.projectActions,
|
|
147
146
|
catalog = _ref2.catalog;
|
|
148
|
-
var _useState = useState(null),
|
|
149
|
-
_useState2 =
|
|
147
|
+
var _useState = (0, _react.useState)(null),
|
|
148
|
+
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
150
149
|
rulerEdit = _useState2[0],
|
|
151
150
|
setRulerEdit = _useState2[1];
|
|
152
|
-
var _useState3 = useState(null),
|
|
153
|
-
_useState4 =
|
|
151
|
+
var _useState3 = (0, _react.useState)(null),
|
|
152
|
+
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
|
|
154
153
|
rulerEditID = _useState4[0],
|
|
155
154
|
setRulerEditID = _useState4[1];
|
|
156
|
-
var Viewer = useRef(null);
|
|
155
|
+
var Viewer = (0, _react.useRef)(null);
|
|
157
156
|
var viewer2D = state.viewer2D,
|
|
158
157
|
mode = state.mode,
|
|
159
158
|
scene = state.scene;
|
|
160
159
|
|
|
161
160
|
// let relatedLines = [];
|
|
162
|
-
var _useState5 = useState([]),
|
|
163
|
-
_useState6 =
|
|
161
|
+
var _useState5 = (0, _react.useState)([]),
|
|
162
|
+
_useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
|
|
164
163
|
relatedLines = _useState6[0],
|
|
165
164
|
setRelatedLines = _useState6[1];
|
|
166
|
-
var _useState7 = useState(false),
|
|
167
|
-
_useState8 =
|
|
165
|
+
var _useState7 = (0, _react.useState)(false),
|
|
166
|
+
_useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
|
|
168
167
|
drawStart = _useState8[0],
|
|
169
168
|
setdrawStart = _useState8[1];
|
|
170
|
-
useEffect(function () {
|
|
169
|
+
(0, _react.useEffect)(function () {
|
|
171
170
|
// move viewer point to center
|
|
172
171
|
var selectedLayer = state.scene.layers.get(state.scene.selectedLayer);
|
|
173
172
|
var vertices = selectedLayer.vertices;
|
|
@@ -189,7 +188,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
189
188
|
Viewer.current.setPointOnViewerCenter(moveX, moveY, viewer2D.get('a'));
|
|
190
189
|
}, []);
|
|
191
190
|
var layerID = scene.selectedLayer;
|
|
192
|
-
var wall_thickness = LINE_THICKNESS / 2;
|
|
191
|
+
var wall_thickness = _constants.LINE_THICKNESS / 2;
|
|
193
192
|
var layer = scene.getIn(['layers', layerID]);
|
|
194
193
|
var mapCursorPosition = function mapCursorPosition(_ref3) {
|
|
195
194
|
var x = _ref3.x,
|
|
@@ -206,15 +205,15 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
206
205
|
var prepareSnap = function prepareSnap() {
|
|
207
206
|
var layerID = scene.selectedLayer;
|
|
208
207
|
var layer = scene.layers.get(layerID);
|
|
209
|
-
allLines = GeometryUtils.getAllLines(layer);
|
|
210
|
-
allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
211
|
-
allItemRect = GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
212
|
-
allItemSnap = GeometryUtils.getAllItemSnap(allItemRect);
|
|
213
|
-
allLineSnap = GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
208
|
+
allLines = _export2.GeometryUtils.getAllLines(layer);
|
|
209
|
+
allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
210
|
+
allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
211
|
+
allItemSnap = _export2.GeometryUtils.getAllItemSnap(allItemRect);
|
|
212
|
+
allLineSnap = _export2.GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
214
213
|
allRect = allItemRect.others.concat(allLineRects);
|
|
215
|
-
allItemSnap = GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
216
|
-
allLineSnap = GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
217
|
-
allArea = GeometryUtils.getAllArea(layer);
|
|
214
|
+
allItemSnap = _export2.GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
215
|
+
allLineSnap = _export2.GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
216
|
+
allArea = _export2.GeometryUtils.getAllArea(layer);
|
|
218
217
|
};
|
|
219
218
|
var updateRulerDistAttribute = function updateRulerDistAttribute(elementData, value) {
|
|
220
219
|
var newVal = value.get('length');
|
|
@@ -257,11 +256,11 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
257
256
|
var selectedLine = scene.getIn(['layers', elementData.layer, 'lines', elementData.id]).toJS();
|
|
258
257
|
var v_0 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[0]]);
|
|
259
258
|
var v_1 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[1]]);
|
|
260
|
-
var _GeometryUtils$orderV = GeometryUtils.orderVertices([v_0, v_1]),
|
|
261
|
-
_GeometryUtils$orderV2 =
|
|
259
|
+
var _GeometryUtils$orderV = _export2.GeometryUtils.orderVertices([v_0, v_1]),
|
|
260
|
+
_GeometryUtils$orderV2 = (0, _slicedToArray2["default"])(_GeometryUtils$orderV, 2),
|
|
262
261
|
v_a = _GeometryUtils$orderV2[0],
|
|
263
262
|
v_b = _GeometryUtils$orderV2[1];
|
|
264
|
-
var v_b_new = GeometryUtils.extendLine(v_a.x, v_a.y, v_b.x, v_b.y, value.get('length'), 2);
|
|
263
|
+
var v_b_new = _export2.GeometryUtils.extendLine(v_a.x, v_a.y, v_b.x, v_b.y, value.get('length'), 2);
|
|
265
264
|
|
|
266
265
|
// Blocked function that as wall changed, opposite wall should changed together.
|
|
267
266
|
// let layer = scene.getIn(['layers', elementData.layer]);
|
|
@@ -293,7 +292,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
293
292
|
vertexTwo: v_a
|
|
294
293
|
});
|
|
295
294
|
}
|
|
296
|
-
var attributesFormData = new Map(_objectSpread({}, attributesData));
|
|
295
|
+
var attributesFormData = new _immutable.Map(_objectSpread({}, attributesData));
|
|
297
296
|
setRulerEdit(null);
|
|
298
297
|
projectActions.setLinesAttributes(attributesFormData, true, {
|
|
299
298
|
layerID: elementData.layer,
|
|
@@ -377,7 +376,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
377
376
|
};
|
|
378
377
|
var getEndPoint = function getEndPoint(vertices, x, y, mode) {
|
|
379
378
|
var selLineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
380
|
-
if (isEmpty(selLineID)) {
|
|
379
|
+
if ((0, _helper.isEmpty)(selLineID)) {
|
|
381
380
|
return {
|
|
382
381
|
isEndDrag: true,
|
|
383
382
|
x: x,
|
|
@@ -387,7 +386,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
387
386
|
var draggingLine = state.getIn(['scene', 'layers', layerID, 'lines', selLineID]).toJS();
|
|
388
387
|
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
389
388
|
var dragVertexId = state.getIn(['draggingSupport', 'vertexID']);
|
|
390
|
-
dragVertexId = !isEmpty(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
389
|
+
dragVertexId = !(0, _helper.isEmpty)(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
391
390
|
var vtx, vty;
|
|
392
391
|
var stepUnit = false;
|
|
393
392
|
vtx = vertices[dragVertexId].x;
|
|
@@ -398,7 +397,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
398
397
|
stepUnit = true;
|
|
399
398
|
}
|
|
400
399
|
var endDrag = [];
|
|
401
|
-
if (!isEmpty(relatedLines) && mode !== 'DRAGGING_LINE') {
|
|
400
|
+
if (!(0, _helper.isEmpty)(relatedLines) && mode !== 'DRAGGING_LINE') {
|
|
402
401
|
vertices[dragVertexId].x = x;
|
|
403
402
|
vertices[dragVertexId].y = y;
|
|
404
403
|
}
|
|
@@ -406,17 +405,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
406
405
|
if (draggingLine.vertices[0] !== draggingLine.vertices[1]) {
|
|
407
406
|
for (var i = 0; i < relatedLines.length; i++) {
|
|
408
407
|
var line = relatedLines[i];
|
|
409
|
-
lineAngle = GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
|
|
408
|
+
lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
|
|
410
409
|
absAngle = Math.abs(lineAngle);
|
|
411
410
|
var tmpRelated = [];
|
|
412
|
-
GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
|
|
411
|
+
_export2.GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
|
|
413
412
|
for (var j = 0; j < tmpRelated.length; j++) {
|
|
414
|
-
var tmpAngle = Math.abs(GeometryUtils.angleBetweenTwoLines(tmpRelated[j], line, vertices));
|
|
415
|
-
if (tmpAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || tmpAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
413
|
+
var tmpAngle = Math.abs(_export2.GeometryUtils.angleBetweenTwoLines(tmpRelated[j], line, vertices));
|
|
414
|
+
if (tmpAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || tmpAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
416
415
|
endDrag.push(false);
|
|
417
416
|
} else endDrag.push(true);
|
|
418
417
|
}
|
|
419
|
-
if (absAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
418
|
+
if (absAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
420
419
|
endDrag.push(false);
|
|
421
420
|
} else endDrag.push(true);
|
|
422
421
|
}
|
|
@@ -427,7 +426,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
427
426
|
vtx = x;
|
|
428
427
|
vty = y;
|
|
429
428
|
} else {
|
|
430
|
-
var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
|
|
429
|
+
var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
|
|
431
430
|
// the origin point of rotation(snapping)
|
|
432
431
|
var originVerId = draggingLine.vertices.findIndex(function (vertice) {
|
|
433
432
|
return vertice !== dragVertexId;
|
|
@@ -439,7 +438,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
439
438
|
// determine the direction of rotation.
|
|
440
439
|
rest = lineAngle > 0 ? -rest : rest;
|
|
441
440
|
// rotate the current point to last point around the first point of drawing line.
|
|
442
|
-
var res = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
|
|
441
|
+
var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
|
|
443
442
|
vtx = res.x;
|
|
444
443
|
vty = res.y;
|
|
445
444
|
}
|
|
@@ -448,8 +447,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
448
447
|
// angle snapping as a value of UNIT_ANGLE
|
|
449
448
|
if (!endDrag.some(function (flag) {
|
|
450
449
|
return flag === false;
|
|
451
|
-
}) && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0 && stepUnit) {
|
|
452
|
-
var _result = GeometryUtils.snapAngleByUnit(lineAngle, vertices, draggingLine, vtx, vty, dragVertexId);
|
|
450
|
+
}) && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0 && stepUnit) {
|
|
451
|
+
var _result = _export2.GeometryUtils.snapAngleByUnit(lineAngle, vertices, draggingLine, vtx, vty, dragVertexId);
|
|
453
452
|
vtx = _result.x;
|
|
454
453
|
vty = _result.y;
|
|
455
454
|
}
|
|
@@ -465,7 +464,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
465
464
|
if (!(item !== null && item !== void 0 && (_item$properties = item.properties) !== null && _item$properties !== void 0 && _item$properties.getIn)) return 0;
|
|
466
465
|
var length = item.properties.getIn([property, '_length']);
|
|
467
466
|
var unit = item.properties.getIn([property, '_unit']);
|
|
468
|
-
return length && unit ? convert(length).from(unit).to('cm') : 0;
|
|
467
|
+
return length && unit ? (0, _convertUnitsLite.convert)(length).from(unit).to('cm') : 0;
|
|
469
468
|
};
|
|
470
469
|
var point = function point(x, y) {
|
|
471
470
|
return {
|
|
@@ -480,32 +479,32 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
480
479
|
var pointArray = [];
|
|
481
480
|
curItemInfo.rectCenterPoint.forEach(function (centerpoint) {
|
|
482
481
|
if (!Array.isArray(centerpoint) || centerpoint.length < 2) return;
|
|
483
|
-
var _centerpoint =
|
|
482
|
+
var _centerpoint = (0, _slicedToArray2["default"])(centerpoint, 2),
|
|
484
483
|
pt = _centerpoint[0],
|
|
485
484
|
angle = _centerpoint[1];
|
|
486
485
|
if (!pt) return;
|
|
487
486
|
|
|
488
487
|
// line through centerpoint and reference center
|
|
489
|
-
var rectLine = angle === 180 || angle === 0 ? GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, center_x1, center_y1) : GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, x, y);
|
|
488
|
+
var rectLine = angle === 180 || angle === 0 ? _export2.GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, center_x1, center_y1) : _export2.GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, x, y);
|
|
490
489
|
if (!rectLine) return;
|
|
491
490
|
var minDist;
|
|
492
491
|
allRect.forEach(function (linerect) {
|
|
493
492
|
if (!(linerect !== null && linerect !== void 0 && linerect.rect) || linerect.rect.length < 4) return;
|
|
494
|
-
var p0 = GeometryUtils.clone_point(linerect.rect[2]);
|
|
495
|
-
var p1 = GeometryUtils.clone_point(linerect.rect[3]);
|
|
493
|
+
var p0 = _export2.GeometryUtils.clone_point(linerect.rect[2]);
|
|
494
|
+
var p1 = _export2.GeometryUtils.clone_point(linerect.rect[3]);
|
|
496
495
|
if (!p0 || !p1 || p0.x === p1.x && p0.y === p1.y) return;
|
|
497
|
-
var lineFn = GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
496
|
+
var lineFn = _export2.GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
498
497
|
if (!lineFn) return;
|
|
499
|
-
var ip = GeometryUtils.twoLinesIntersection(lineFn.a, lineFn.b, lineFn.c, rectLine.a, rectLine.b, rectLine.c);
|
|
498
|
+
var ip = _export2.GeometryUtils.twoLinesIntersection(lineFn.a, lineFn.b, lineFn.c, rectLine.a, rectLine.b, rectLine.c);
|
|
500
499
|
if (!ip) return;
|
|
501
500
|
|
|
502
501
|
// intersection must lie within line segment
|
|
503
|
-
var segLen = GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y);
|
|
504
|
-
if (segLen <= GeometryUtils.pointsDistance(p0.x, p0.y, ip.x, ip.y) || segLen <= GeometryUtils.pointsDistance(p1.x, p1.y, ip.x, ip.y)) return;
|
|
502
|
+
var segLen = _export2.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y);
|
|
503
|
+
if (segLen <= _export2.GeometryUtils.pointsDistance(p0.x, p0.y, ip.x, ip.y) || segLen <= _export2.GeometryUtils.pointsDistance(p1.x, p1.y, ip.x, ip.y)) return;
|
|
505
504
|
|
|
506
505
|
// ensure intersection is farther than pt→center
|
|
507
|
-
var distToCenter = GeometryUtils.pointsDistance(ip.x, ip.y, x, y);
|
|
508
|
-
var baseDist = GeometryUtils.pointsDistance(pt.x, pt.y, ip.x, ip.y);
|
|
506
|
+
var distToCenter = _export2.GeometryUtils.pointsDistance(ip.x, ip.y, x, y);
|
|
507
|
+
var baseDist = _export2.GeometryUtils.pointsDistance(pt.x, pt.y, ip.x, ip.y);
|
|
509
508
|
if (distToCenter <= baseDist) return;
|
|
510
509
|
var candidate = baseDist;
|
|
511
510
|
minDist = minDist !== undefined ? Math.min(minDist, candidate) : candidate;
|
|
@@ -562,12 +561,12 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
562
561
|
};
|
|
563
562
|
|
|
564
563
|
// collect geometry
|
|
565
|
-
var _allLines = GeometryUtils.getAllLines(layer) || [];
|
|
566
|
-
var _allLineRects = GeometryUtils.buildRectFromLines(layer, _allLines) || [];
|
|
567
|
-
var _allItemRect = GeometryUtils.getAllItems(scene, catalog, _allLineRects) || {
|
|
564
|
+
var _allLines = _export2.GeometryUtils.getAllLines(layer) || [];
|
|
565
|
+
var _allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, _allLines) || [];
|
|
566
|
+
var _allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, _allLineRects) || {
|
|
568
567
|
others: []
|
|
569
568
|
};
|
|
570
|
-
var _allRect = [].concat(
|
|
569
|
+
var _allRect = [].concat((0, _toConsumableArray2["default"])(_allItemRect.others || []), (0, _toConsumableArray2["default"])(_allLineRects));
|
|
571
570
|
|
|
572
571
|
// current item
|
|
573
572
|
var curItemInfo = getCalcRectFromItem(val);
|
|
@@ -644,7 +643,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
644
643
|
endPoint.y = y;
|
|
645
644
|
} else {
|
|
646
645
|
prepareSnap();
|
|
647
|
-
var _GeometryUtils$calcSn = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
646
|
+
var _GeometryUtils$calcSn = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
648
647
|
nx = _GeometryUtils$calcSn.nx,
|
|
649
648
|
ny = _GeometryUtils$calcSn.ny,
|
|
650
649
|
rot = _GeometryUtils$calcSn.rot,
|
|
@@ -659,10 +658,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
659
658
|
layoutpos: allItemRect.cur && allItemRect.cur.layoutpos,
|
|
660
659
|
is_corner: allItemRect.cur && allItemRect.cur.is_corner
|
|
661
660
|
};
|
|
662
|
-
var _GeometryUtils$getAll = GeometryUtils.getAllHoleRect(scene, _val),
|
|
661
|
+
var _GeometryUtils$getAll = _export2.GeometryUtils.getAllHoleRect(scene, _val),
|
|
663
662
|
_isSect = _GeometryUtils$getAll.isSect,
|
|
664
663
|
_snap = _GeometryUtils$getAll.snap;
|
|
665
|
-
if (!isEmpty(_snap) && _isSect) {
|
|
664
|
+
if (!(0, _helper.isEmpty)(_snap) && _isSect) {
|
|
666
665
|
if (_snap.length == 1) _val.pos = {
|
|
667
666
|
x: _snap[0].x,
|
|
668
667
|
y: _snap[0].y
|
|
@@ -675,7 +674,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
675
674
|
y: _snap[1].y
|
|
676
675
|
};
|
|
677
676
|
}
|
|
678
|
-
var interSect = GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
677
|
+
var interSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
679
678
|
if (interSect) {
|
|
680
679
|
nx = _val.pos.x;
|
|
681
680
|
ny = _val.pos.y;
|
|
@@ -685,7 +684,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
685
684
|
x: nx,
|
|
686
685
|
y: ny
|
|
687
686
|
};
|
|
688
|
-
var _isrectSect = GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
687
|
+
var _isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
689
688
|
if (_isrectSect && _isSect) {
|
|
690
689
|
itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
|
|
691
690
|
itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
|
|
@@ -720,7 +719,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
720
719
|
case constants.MODE_DRAGGING_ITEM:
|
|
721
720
|
calcDistanceArray();
|
|
722
721
|
prepareSnap();
|
|
723
|
-
var _GeometryUtils$calcSn2 = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
722
|
+
var _GeometryUtils$calcSn2 = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
724
723
|
nx = _GeometryUtils$calcSn2.nx,
|
|
725
724
|
ny = _GeometryUtils$calcSn2.ny,
|
|
726
725
|
rot = _GeometryUtils$calcSn2.rot,
|
|
@@ -735,10 +734,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
735
734
|
layoutpos: allItemRect.cur && allItemRect.cur.layoutpos,
|
|
736
735
|
is_corner: allItemRect.cur && allItemRect.cur.is_corner
|
|
737
736
|
};
|
|
738
|
-
var _GeometryUtils$getAll2 = GeometryUtils.getAllHoleRect(scene, val),
|
|
737
|
+
var _GeometryUtils$getAll2 = _export2.GeometryUtils.getAllHoleRect(scene, val),
|
|
739
738
|
isSect = _GeometryUtils$getAll2.isSect,
|
|
740
739
|
snap = _GeometryUtils$getAll2.snap;
|
|
741
|
-
if (!isEmpty(snap) && isSect) {
|
|
740
|
+
if (!(0, _helper.isEmpty)(snap) && isSect) {
|
|
742
741
|
if (snap.length == 1) val.pos = {
|
|
743
742
|
x: snap[0].x,
|
|
744
743
|
y: snap[0].y
|
|
@@ -751,7 +750,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
751
750
|
y: snap[1].y
|
|
752
751
|
};
|
|
753
752
|
}
|
|
754
|
-
var _interSect = GeometryUtils.validInterSect(allItemRect.others, val);
|
|
753
|
+
var _interSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
|
|
755
754
|
if (_interSect) {
|
|
756
755
|
nx = val.pos.x;
|
|
757
756
|
ny = val.pos.y;
|
|
@@ -761,7 +760,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
761
760
|
x: nx,
|
|
762
761
|
y: ny
|
|
763
762
|
};
|
|
764
|
-
var isrectSect = GeometryUtils.validInterSect(allItemRect.others, val);
|
|
763
|
+
var isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
|
|
765
764
|
if (isrectSect && isSect) {
|
|
766
765
|
itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
|
|
767
766
|
itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
|
|
@@ -881,7 +880,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
881
880
|
break;
|
|
882
881
|
} else if (elementData.part === 'elevation') {
|
|
883
882
|
// handle action when click elevation about selected line
|
|
884
|
-
var _mode = MODE_ELEVATION_VIEW;
|
|
883
|
+
var _mode = _constants.MODE_ELEVATION_VIEW;
|
|
885
884
|
projectActions.setMode(_mode);
|
|
886
885
|
break;
|
|
887
886
|
} else {
|
|
@@ -916,9 +915,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
916
915
|
break;
|
|
917
916
|
}
|
|
918
917
|
case 'rulerDist':
|
|
919
|
-
var _length1 = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
920
|
-
var distanceText1 = "".concat(formatNumber(_length1, DECIMAL_PLACES_2));
|
|
921
|
-
var numberInput1 = /*#__PURE__*/
|
|
918
|
+
var _length1 = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
919
|
+
var distanceText1 = "".concat((0, _math.formatNumber)(_length1, _constants.DECIMAL_PLACES_2));
|
|
920
|
+
var numberInput1 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
922
921
|
id: "ruler_numberInput",
|
|
923
922
|
style: {
|
|
924
923
|
position: 'absolute',
|
|
@@ -926,7 +925,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
926
925
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
927
926
|
zIndex: 1000
|
|
928
927
|
}
|
|
929
|
-
}, /*#__PURE__*/
|
|
928
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
930
929
|
style: {
|
|
931
930
|
width: 150,
|
|
932
931
|
height: 50,
|
|
@@ -938,8 +937,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
938
937
|
},
|
|
939
938
|
value: distanceText1,
|
|
940
939
|
onChange: function onChange(event) {
|
|
941
|
-
var value = new Map({
|
|
942
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
940
|
+
var value = new _immutable.Map({
|
|
941
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
943
942
|
_length: event.target.value,
|
|
944
943
|
_unit: scene.rulerUnit
|
|
945
944
|
});
|
|
@@ -951,8 +950,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
951
950
|
projectActions.unselectAll();
|
|
952
951
|
break;
|
|
953
952
|
case 'ruler':
|
|
954
|
-
var _length = convert(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
955
|
-
var numberInput = /*#__PURE__*/
|
|
953
|
+
var _length = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
954
|
+
var numberInput = /*#__PURE__*/_react["default"].createElement("div", {
|
|
956
955
|
id: "ruler_numberInput",
|
|
957
956
|
style: {
|
|
958
957
|
position: 'absolute',
|
|
@@ -960,7 +959,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
960
959
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
961
960
|
zIndex: 1000
|
|
962
961
|
}
|
|
963
|
-
}, /*#__PURE__*/
|
|
962
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
964
963
|
style: {
|
|
965
964
|
width: 150,
|
|
966
965
|
height: 50,
|
|
@@ -970,10 +969,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
970
969
|
lineHeight: '22px',
|
|
971
970
|
fontWeight: 600
|
|
972
971
|
},
|
|
973
|
-
value: formatNumber(_length, DECIMAL_PLACES_2),
|
|
972
|
+
value: (0, _math.formatNumber)(_length, _constants.DECIMAL_PLACES_2),
|
|
974
973
|
onChange: function onChange(event) {
|
|
975
|
-
var value = new Map({
|
|
976
|
-
length: convert(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
974
|
+
var value = new _immutable.Map({
|
|
975
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
977
976
|
_length: event.target.value,
|
|
978
977
|
_unit: selectedLayer.unit
|
|
979
978
|
});
|
|
@@ -985,9 +984,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
985
984
|
projectActions.unselectAll();
|
|
986
985
|
break;
|
|
987
986
|
case 'twoHoleRuler':
|
|
988
|
-
var _lengthTwoHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
989
|
-
var distanceTextTwoHoleRuler = "".concat(formatNumber(_lengthTwoHoleRuler, DECIMAL_PLACES_2));
|
|
990
|
-
var numberInputTwoHoleRuler = /*#__PURE__*/
|
|
987
|
+
var _lengthTwoHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
988
|
+
var distanceTextTwoHoleRuler = "".concat((0, _math.formatNumber)(_lengthTwoHoleRuler, _constants.DECIMAL_PLACES_2));
|
|
989
|
+
var numberInputTwoHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
991
990
|
id: "ruler_numberInput",
|
|
992
991
|
style: {
|
|
993
992
|
position: 'absolute',
|
|
@@ -995,7 +994,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
995
994
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
996
995
|
zIndex: 1000
|
|
997
996
|
}
|
|
998
|
-
}, /*#__PURE__*/
|
|
997
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
999
998
|
style: {
|
|
1000
999
|
width: 150,
|
|
1001
1000
|
height: 50,
|
|
@@ -1007,8 +1006,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1007
1006
|
},
|
|
1008
1007
|
value: distanceTextTwoHoleRuler,
|
|
1009
1008
|
onChange: function onChange(event) {
|
|
1010
|
-
var value = new Map({
|
|
1011
|
-
length: convert(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1009
|
+
var value = new _immutable.Map({
|
|
1010
|
+
length: (0, _convertUnitsLite.convert)(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1012
1011
|
_length: event.target.value / 2,
|
|
1013
1012
|
_unit: scene.rulerUnit
|
|
1014
1013
|
});
|
|
@@ -1020,9 +1019,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1020
1019
|
projectActions.unselectAll();
|
|
1021
1020
|
break;
|
|
1022
1021
|
case 'leftHoleRuler':
|
|
1023
|
-
var _lengthLeftHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1022
|
+
var _lengthLeftHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1024
1023
|
var distanceTextLeftHoleRuler = "".concat(_lengthLeftHoleRuler.toFixed(2));
|
|
1025
|
-
var numberInputLeftHoleRuler = /*#__PURE__*/
|
|
1024
|
+
var numberInputLeftHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1026
1025
|
id: "ruler_numberInput",
|
|
1027
1026
|
style: {
|
|
1028
1027
|
position: 'absolute',
|
|
@@ -1030,7 +1029,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1030
1029
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1031
1030
|
zIndex: 1000
|
|
1032
1031
|
}
|
|
1033
|
-
}, /*#__PURE__*/
|
|
1032
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1034
1033
|
style: {
|
|
1035
1034
|
width: 150,
|
|
1036
1035
|
height: 50,
|
|
@@ -1042,8 +1041,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1042
1041
|
},
|
|
1043
1042
|
value: distanceTextLeftHoleRuler,
|
|
1044
1043
|
onChange: function onChange(event) {
|
|
1045
|
-
var value = new Map({
|
|
1046
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1044
|
+
var value = new _immutable.Map({
|
|
1045
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1047
1046
|
_length: event.target.value,
|
|
1048
1047
|
_unit: scene.rulerUnit
|
|
1049
1048
|
});
|
|
@@ -1055,9 +1054,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1055
1054
|
projectActions.unselectAll();
|
|
1056
1055
|
break;
|
|
1057
1056
|
case 'rulerHole':
|
|
1058
|
-
var _lengthRulerHole = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1059
|
-
var distanceTextRulerHole = "".concat(formatNumber(_lengthRulerHole, DECIMAL_PLACES_2));
|
|
1060
|
-
var numberInputRulerHole = /*#__PURE__*/
|
|
1057
|
+
var _lengthRulerHole = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1058
|
+
var distanceTextRulerHole = "".concat((0, _math.formatNumber)(_lengthRulerHole, _constants.DECIMAL_PLACES_2));
|
|
1059
|
+
var numberInputRulerHole = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1061
1060
|
id: "ruler_numberInput",
|
|
1062
1061
|
style: {
|
|
1063
1062
|
position: 'absolute',
|
|
@@ -1065,7 +1064,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1065
1064
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1066
1065
|
zIndex: 1000
|
|
1067
1066
|
}
|
|
1068
|
-
}, /*#__PURE__*/
|
|
1067
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1069
1068
|
style: {
|
|
1070
1069
|
width: 150,
|
|
1071
1070
|
height: 50,
|
|
@@ -1077,8 +1076,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1077
1076
|
},
|
|
1078
1077
|
value: distanceTextRulerHole,
|
|
1079
1078
|
onChange: function onChange(event) {
|
|
1080
|
-
var value = new Map({
|
|
1081
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1079
|
+
var value = new _immutable.Map({
|
|
1080
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1082
1081
|
_length: event.target.value,
|
|
1083
1082
|
_unit: scene.rulerUnit
|
|
1084
1083
|
});
|
|
@@ -1090,9 +1089,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1090
1089
|
projectActions.unselectAll();
|
|
1091
1090
|
break;
|
|
1092
1091
|
case 'rightHoleRuler':
|
|
1093
|
-
var _lengthRightHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1092
|
+
var _lengthRightHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1094
1093
|
var distanceTextRightHoleRuler = "".concat(_lengthRightHoleRuler.toFixed(2));
|
|
1095
|
-
var numberInputRightHoleRuler = /*#__PURE__*/
|
|
1094
|
+
var numberInputRightHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1096
1095
|
id: "ruler_numberInput",
|
|
1097
1096
|
style: {
|
|
1098
1097
|
position: 'absolute',
|
|
@@ -1100,7 +1099,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1100
1099
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1101
1100
|
zIndex: 1000
|
|
1102
1101
|
}
|
|
1103
|
-
}, /*#__PURE__*/
|
|
1102
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1104
1103
|
style: {
|
|
1105
1104
|
width: 150,
|
|
1106
1105
|
height: 50,
|
|
@@ -1112,8 +1111,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1112
1111
|
},
|
|
1113
1112
|
value: distanceTextRightHoleRuler,
|
|
1114
1113
|
onChange: function onChange(event) {
|
|
1115
|
-
var value = new Map({
|
|
1116
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1114
|
+
var value = new _immutable.Map({
|
|
1115
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1117
1116
|
_length: event.target.value,
|
|
1118
1117
|
_unit: scene.rulerUnit
|
|
1119
1118
|
});
|
|
@@ -1126,7 +1125,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1126
1125
|
break;
|
|
1127
1126
|
case 'angleChange':
|
|
1128
1127
|
var _length2 = elementData.length;
|
|
1129
|
-
var numberInput2 = /*#__PURE__*/
|
|
1128
|
+
var numberInput2 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1130
1129
|
id: "ruler_numberInput",
|
|
1131
1130
|
style: {
|
|
1132
1131
|
position: 'absolute',
|
|
@@ -1134,15 +1133,15 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1134
1133
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1135
1134
|
zIndex: 1000
|
|
1136
1135
|
}
|
|
1137
|
-
}, /*#__PURE__*/
|
|
1136
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1138
1137
|
style: {
|
|
1139
1138
|
width: 50,
|
|
1140
1139
|
height: 50
|
|
1141
1140
|
},
|
|
1142
1141
|
value: _length2,
|
|
1143
1142
|
onChange: function onChange(event) {
|
|
1144
|
-
var value = new Map({
|
|
1145
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1143
|
+
var value = new _immutable.Map({
|
|
1144
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1146
1145
|
_length: event.target.value,
|
|
1147
1146
|
_unit: scene.rulerUnit
|
|
1148
1147
|
});
|
|
@@ -1196,7 +1195,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1196
1195
|
break;
|
|
1197
1196
|
case constants.MODE_DRAGGING_ITEM:
|
|
1198
1197
|
itemsActions.updateMolding();
|
|
1199
|
-
projectActions.setMode(MODE_IDLE);
|
|
1198
|
+
projectActions.setMode(_constants.MODE_IDLE);
|
|
1200
1199
|
break;
|
|
1201
1200
|
case constants.MODE_DRAGGING_HOLE:
|
|
1202
1201
|
holesActions.endDraggingHole(x, y);
|
|
@@ -1241,16 +1240,16 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1241
1240
|
};
|
|
1242
1241
|
var onChangeTool = function onChangeTool(tool) {
|
|
1243
1242
|
switch (tool) {
|
|
1244
|
-
case TOOL_NONE:
|
|
1243
|
+
case _reactSvgPanZoom.TOOL_NONE:
|
|
1245
1244
|
projectActions.selectToolEdit();
|
|
1246
1245
|
break;
|
|
1247
|
-
case TOOL_PAN:
|
|
1246
|
+
case _reactSvgPanZoom.TOOL_PAN:
|
|
1248
1247
|
viewer2DActions.selectToolPan();
|
|
1249
1248
|
break;
|
|
1250
|
-
case TOOL_ZOOM_IN:
|
|
1249
|
+
case _reactSvgPanZoom.TOOL_ZOOM_IN:
|
|
1251
1250
|
viewer2DActions.selectToolZoomIn();
|
|
1252
1251
|
break;
|
|
1253
|
-
case TOOL_ZOOM_OUT:
|
|
1252
|
+
case _reactSvgPanZoom.TOOL_ZOOM_OUT:
|
|
1254
1253
|
viewer2DActions.selectToolZoomOut();
|
|
1255
1254
|
break;
|
|
1256
1255
|
}
|
|
@@ -1276,7 +1275,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1276
1275
|
var sceneZoom = state.zoom || 1;
|
|
1277
1276
|
var rulerXElements = Math.ceil(sceneWidth / rulerUnitPixelSize) + 1;
|
|
1278
1277
|
var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
|
|
1279
|
-
|
|
1278
|
+
console.log('---render viewer2d');
|
|
1279
|
+
console.log(viewer2D.isEmpty());
|
|
1280
|
+
return /*#__PURE__*/_react["default"].createElement("div", null, rulerEdit, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1280
1281
|
style: {
|
|
1281
1282
|
margin: 0,
|
|
1282
1283
|
padding: 0,
|
|
@@ -1287,13 +1288,13 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1287
1288
|
gridTemplateRows: "".concat(rulerSize, "px ").concat(height - rulerSize, "px"),
|
|
1288
1289
|
position: 'relative'
|
|
1289
1290
|
}
|
|
1290
|
-
}, /*#__PURE__*/
|
|
1291
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1291
1292
|
style: {
|
|
1292
1293
|
gridColumn: 1,
|
|
1293
1294
|
gridRow: 1,
|
|
1294
1295
|
backgroundColor: rulerBgColor
|
|
1295
1296
|
}
|
|
1296
|
-
}), /*#__PURE__*/
|
|
1297
|
+
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
1297
1298
|
style: {
|
|
1298
1299
|
gridRow: 1,
|
|
1299
1300
|
gridColumn: 2,
|
|
@@ -1301,7 +1302,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1301
1302
|
overflow: 'hidden'
|
|
1302
1303
|
},
|
|
1303
1304
|
id: "rulerX"
|
|
1304
|
-
}, sceneWidth ? /*#__PURE__*/
|
|
1305
|
+
}, sceneWidth ? /*#__PURE__*/_react["default"].createElement(_export.RulerX, {
|
|
1305
1306
|
unitPixelSize: rulerUnitPixelSize,
|
|
1306
1307
|
zoom: sceneZoom,
|
|
1307
1308
|
mouseX: state.mouse.get('x'),
|
|
@@ -1312,7 +1313,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1312
1313
|
markerColor: rulerMkColor,
|
|
1313
1314
|
positiveUnitsNumber: rulerXElements,
|
|
1314
1315
|
negativeUnitsNumber: 0
|
|
1315
|
-
}) : null), /*#__PURE__*/
|
|
1316
|
+
}) : null), /*#__PURE__*/_react["default"].createElement("div", {
|
|
1316
1317
|
style: {
|
|
1317
1318
|
gridColumn: 1,
|
|
1318
1319
|
gridRow: 2,
|
|
@@ -1320,7 +1321,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1320
1321
|
overflow: 'hidden'
|
|
1321
1322
|
},
|
|
1322
1323
|
id: "rulerY"
|
|
1323
|
-
}, sceneHeight ? /*#__PURE__*/
|
|
1324
|
+
}, sceneHeight ? /*#__PURE__*/_react["default"].createElement(_export.RulerY, {
|
|
1324
1325
|
unitPixelSize: rulerUnitPixelSize,
|
|
1325
1326
|
zoom: sceneZoom,
|
|
1326
1327
|
mouseY: state.mouse.get('y'),
|
|
@@ -1331,7 +1332,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1331
1332
|
markerColor: rulerMkColor,
|
|
1332
1333
|
positiveUnitsNumber: rulerYElements,
|
|
1333
1334
|
negativeUnitsNumber: 0
|
|
1334
|
-
}) : null), /*#__PURE__*/
|
|
1335
|
+
}) : null), /*#__PURE__*/_react["default"].createElement(_reactSvgPanZoom.ReactSVGPanZoom, {
|
|
1335
1336
|
style: {
|
|
1336
1337
|
gridColumn: 2,
|
|
1337
1338
|
gridRow: 2
|
|
@@ -1346,35 +1347,39 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1346
1347
|
onMouseDown: onMouseDown,
|
|
1347
1348
|
onMouseMove: onMouseMove,
|
|
1348
1349
|
onMouseUp: onMouseUp,
|
|
1349
|
-
|
|
1350
|
-
|
|
1350
|
+
miniatureProps: {
|
|
1351
|
+
position: 'none'
|
|
1352
|
+
},
|
|
1353
|
+
toolbarProps: {
|
|
1354
|
+
position: 'right'
|
|
1355
|
+
},
|
|
1351
1356
|
detectPinchGesture: false,
|
|
1352
1357
|
disableDoubleClickZoomWithToolAuto: true,
|
|
1353
1358
|
ref: Viewer
|
|
1354
|
-
}, /*#__PURE__*/
|
|
1359
|
+
}, /*#__PURE__*/_react["default"].createElement("svg", {
|
|
1355
1360
|
width: scene.width,
|
|
1356
1361
|
height: scene.height
|
|
1357
|
-
}, /*#__PURE__*/
|
|
1362
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("pattern", {
|
|
1358
1363
|
id: "diagonalFill",
|
|
1359
1364
|
patternUnits: "userSpaceOnUse",
|
|
1360
1365
|
width: "4",
|
|
1361
1366
|
height: "4",
|
|
1362
1367
|
fill: "#FFF"
|
|
1363
|
-
}, /*#__PURE__*/
|
|
1368
|
+
}, /*#__PURE__*/_react["default"].createElement("rect", {
|
|
1364
1369
|
x: "0",
|
|
1365
1370
|
y: "0",
|
|
1366
1371
|
width: "4",
|
|
1367
1372
|
height: "4",
|
|
1368
1373
|
fill: "#FFF"
|
|
1369
|
-
}), /*#__PURE__*/
|
|
1374
|
+
}), /*#__PURE__*/_react["default"].createElement("path", {
|
|
1370
1375
|
d: "M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2",
|
|
1371
1376
|
style: {
|
|
1372
1377
|
stroke: '#8E9BA2',
|
|
1373
1378
|
strokeWidth: 1
|
|
1374
1379
|
}
|
|
1375
|
-
}))), /*#__PURE__*/
|
|
1380
|
+
}))), /*#__PURE__*/_react["default"].createElement("g", {
|
|
1376
1381
|
style: Object.assign(mode2Cursor(mode), mode2PointerEvents(mode))
|
|
1377
|
-
}, /*#__PURE__*/
|
|
1382
|
+
}, /*#__PURE__*/_react["default"].createElement(_state["default"], {
|
|
1378
1383
|
state: state,
|
|
1379
1384
|
catalog: catalog,
|
|
1380
1385
|
viewer2DActions: viewer2DActions,
|
|
@@ -1382,17 +1387,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1382
1387
|
}))))));
|
|
1383
1388
|
}
|
|
1384
1389
|
Viewer2D.propTypes = {
|
|
1385
|
-
state:
|
|
1386
|
-
width:
|
|
1387
|
-
height:
|
|
1390
|
+
state: _propTypes["default"].object.isRequired,
|
|
1391
|
+
width: _propTypes["default"].number.isRequired,
|
|
1392
|
+
height: _propTypes["default"].number.isRequired
|
|
1388
1393
|
};
|
|
1389
1394
|
Viewer2D.contextTypes = {
|
|
1390
|
-
viewer2DActions:
|
|
1391
|
-
linesActions:
|
|
1392
|
-
holesActions:
|
|
1393
|
-
verticesActions:
|
|
1394
|
-
itemsActions:
|
|
1395
|
-
areaActions:
|
|
1396
|
-
projectActions:
|
|
1397
|
-
catalog:
|
|
1395
|
+
viewer2DActions: _propTypes["default"].object.isRequired,
|
|
1396
|
+
linesActions: _propTypes["default"].object.isRequired,
|
|
1397
|
+
holesActions: _propTypes["default"].object.isRequired,
|
|
1398
|
+
verticesActions: _propTypes["default"].object.isRequired,
|
|
1399
|
+
itemsActions: _propTypes["default"].object.isRequired,
|
|
1400
|
+
areaActions: _propTypes["default"].object.isRequired,
|
|
1401
|
+
projectActions: _propTypes["default"].object.isRequired,
|
|
1402
|
+
catalog: _propTypes["default"].object.isRequired
|
|
1398
1403
|
};
|