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,11 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
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.compareVertices = compareVertices;
|
|
9
|
+
exports["default"] = Line;
|
|
10
|
+
var _react = _interopRequireDefault(require("react"));
|
|
11
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
12
|
+
var _export = require("../../utils/export");
|
|
13
|
+
var _ruler = _interopRequireDefault(require("./ruler"));
|
|
14
|
+
var _constants = require("../../constants");
|
|
15
|
+
var Three = _interopRequireWildcard(require("three"));
|
|
16
|
+
var _utils = require("./utils");
|
|
17
|
+
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); }
|
|
9
18
|
var STYLE = {
|
|
10
19
|
stroke: 'rgb(77, 77, 77)',
|
|
11
20
|
strokeWidth: '1px'
|
|
@@ -24,10 +33,10 @@ var STYLE_TEXT = {
|
|
|
24
33
|
fontWeight: 'middle',
|
|
25
34
|
fontFamily: "'Microsoft YaHei UI', Courier, monospace"
|
|
26
35
|
};
|
|
27
|
-
|
|
36
|
+
function compareVertices(v0, v1) {
|
|
28
37
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
29
38
|
}
|
|
30
|
-
|
|
39
|
+
function Line(_ref) {
|
|
31
40
|
var _state$getIn;
|
|
32
41
|
var line = _ref.line,
|
|
33
42
|
allLine = _ref.allLine,
|
|
@@ -43,7 +52,7 @@ export default function Line(_ref) {
|
|
|
43
52
|
showWindowDoorMeasure = scene.showWindowDoorMeasure;
|
|
44
53
|
var vertex0 = layer.vertices.get(line.vertices.get(0));
|
|
45
54
|
var vertex1 = layer.vertices.get(line.vertices.get(1));
|
|
46
|
-
if (vertex0.id === vertex1.id || GeometryUtils.samePoints(vertex0, vertex1)) return null; //avoid 0-length lines
|
|
55
|
+
if (vertex0.id === vertex1.id || _export.GeometryUtils.samePoints(vertex0, vertex1)) return null; //avoid 0-length lines
|
|
47
56
|
var x1 = vertex0.x,
|
|
48
57
|
y1 = vertex0.y;
|
|
49
58
|
var x2 = vertex1.x,
|
|
@@ -61,24 +70,24 @@ export default function Line(_ref) {
|
|
|
61
70
|
relatedvertice1y = relatedVertice.point.y;
|
|
62
71
|
}
|
|
63
72
|
});
|
|
64
|
-
var thickness = LINE_THICKNESS;
|
|
73
|
+
var thickness = _constants.LINE_THICKNESS;
|
|
65
74
|
var half_thickness = thickness / 2;
|
|
66
75
|
// if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
67
76
|
// ({ x: x1, y: y1 } = vertex1);
|
|
68
77
|
// ({ x: x2, y: y2 } = vertex0);
|
|
69
78
|
// }
|
|
70
79
|
|
|
71
|
-
var length = GeometryUtils.pointsDistance(x1, y1, x2, y2);
|
|
80
|
+
var length = _export.GeometryUtils.pointsDistance(x1, y1, x2, y2);
|
|
72
81
|
// let length = GeometryUtils.pointsDistance(relatedvertice0x,relatedvertice0y,relatedvertice1x,relatedvertice1y);
|
|
73
82
|
var rightHoleLength, leftHoleLength, holeLength;
|
|
74
|
-
var angle = GeometryUtils.angleBetweenTwoPointsAndOrigin(x1, y1, x2, y2);
|
|
83
|
+
var angle = _export.GeometryUtils.angleBetweenTwoPointsAndOrigin(x1, y1, x2, y2);
|
|
75
84
|
var baseSpace = 20;
|
|
76
|
-
var base_item = GeometryUtils.getAllItemSpecified(scene, catalog, BASE_CABINET_LAYOUTPOS);
|
|
85
|
+
var base_item = _export.GeometryUtils.getAllItemSpecified(scene, catalog, _constants.BASE_CABINET_LAYOUTPOS);
|
|
77
86
|
// let relatedLines = [];
|
|
78
87
|
var angleVertices = [];
|
|
79
88
|
var layerID = state.getIn(['scene', 'selectedLayer']);
|
|
80
89
|
var drawingLineID = (_state$getIn = state.getIn(['scene', 'layers', layerID, 'selected', 'lines'])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.toJS();
|
|
81
|
-
if (!isEmpty(drawingLineID)) {
|
|
90
|
+
if (!(0, _utils.isEmpty)(drawingLineID)) {
|
|
82
91
|
var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', drawingLineID[0]]).toJS();
|
|
83
92
|
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
84
93
|
var allLinesArray = state.getIn(['scene', 'layers', layerID, 'lines']).toArray();
|
|
@@ -93,14 +102,14 @@ export default function Line(_ref) {
|
|
|
93
102
|
});
|
|
94
103
|
if (reget) {
|
|
95
104
|
relatedLines = [];
|
|
96
|
-
GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
105
|
+
_export.GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
97
106
|
}
|
|
98
107
|
// get the angle of two lines and check the angle.
|
|
99
108
|
if (drawingLine.vertices[0] !== drawingLine.vertices[1]) {
|
|
100
109
|
relatedLines.forEach(function (line) {
|
|
101
110
|
// get the points of two lines(drawing line and related line)
|
|
102
111
|
// the first value is overlapped point of two lines as a center of angle.
|
|
103
|
-
if (!isEmpty(line)) {
|
|
112
|
+
if (!(0, _utils.isEmpty)(line)) {
|
|
104
113
|
var points = [];
|
|
105
114
|
var anglePoints = [];
|
|
106
115
|
line.vertices.forEach(function (vt) {
|
|
@@ -148,7 +157,7 @@ export default function Line(_ref) {
|
|
|
148
157
|
var r1 = itemRect.rect[1];
|
|
149
158
|
var r2 = itemRect.rect[2];
|
|
150
159
|
var r3 = itemRect.rect[3];
|
|
151
|
-
var delta23 = GeometryUtils.verticesDistance(l2, r3) + GeometryUtils.verticesDistance(r3, r2) + GeometryUtils.verticesDistance(r2, l3) - GeometryUtils.verticesDistance(l3, l2);
|
|
160
|
+
var delta23 = _export.GeometryUtils.verticesDistance(l2, r3) + _export.GeometryUtils.verticesDistance(r3, r2) + _export.GeometryUtils.verticesDistance(r2, l3) - _export.GeometryUtils.verticesDistance(l3, l2);
|
|
152
161
|
if (delta23 < 0.1) {
|
|
153
162
|
return true;
|
|
154
163
|
} else {
|
|
@@ -172,7 +181,7 @@ export default function Line(_ref) {
|
|
|
172
181
|
base_posArray.push(l2);
|
|
173
182
|
base_posArray.push(l3);
|
|
174
183
|
var base_posAndwidth = [];
|
|
175
|
-
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || GeometryUtils.almostEqual(y1, y2)) {
|
|
184
|
+
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || _export.GeometryUtils.almostEqual(y1, y2)) {
|
|
176
185
|
base_posArray.sort(function (a, b) {
|
|
177
186
|
return a.x - b.x;
|
|
178
187
|
});
|
|
@@ -204,22 +213,22 @@ export default function Line(_ref) {
|
|
|
204
213
|
}
|
|
205
214
|
baseRuler = base_posAndwidth.map(function (pAw) {
|
|
206
215
|
if (pAw.length > 1) {
|
|
207
|
-
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || GeometryUtils.almostEqual(y1, y2)) {
|
|
216
|
+
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || _export.GeometryUtils.almostEqual(y1, y2)) {
|
|
208
217
|
if (x1 - x2 > 0) {
|
|
209
|
-
return /*#__PURE__*/
|
|
218
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
210
219
|
x1: pAw.pos.x + pAw.length,
|
|
211
220
|
y1: pAw.pos.y,
|
|
212
221
|
x2: pAw.pos.x + pAw.length,
|
|
213
222
|
y2: pAw.pos.y - thickness / 2 - baseSpace,
|
|
214
223
|
style: STYLE
|
|
215
|
-
}), /*#__PURE__*/
|
|
224
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
216
225
|
key: 4,
|
|
217
226
|
layer: layer,
|
|
218
227
|
unit: scene.unit,
|
|
219
228
|
rulerUnit: scene.rulerUnit,
|
|
220
229
|
length: pAw.length,
|
|
221
230
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y - thickness / 2 - baseSpace, " ) rotate(").concat(angle + 180, ", 0, 0)")
|
|
222
|
-
}), /*#__PURE__*/
|
|
231
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
223
232
|
x1: pAw.pos.x,
|
|
224
233
|
y1: pAw.pos.y,
|
|
225
234
|
x2: pAw.pos.x,
|
|
@@ -227,20 +236,20 @@ export default function Line(_ref) {
|
|
|
227
236
|
style: STYLE
|
|
228
237
|
}));
|
|
229
238
|
} else {
|
|
230
|
-
return /*#__PURE__*/
|
|
239
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
231
240
|
x1: pAw.pos.x + pAw.length,
|
|
232
241
|
y1: pAw.pos.y,
|
|
233
242
|
x2: pAw.pos.x + pAw.length,
|
|
234
243
|
y2: pAw.pos.y + thickness / 2 + baseSpace,
|
|
235
244
|
style: STYLE
|
|
236
|
-
}), /*#__PURE__*/
|
|
245
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
237
246
|
key: 4,
|
|
238
247
|
layer: layer,
|
|
239
248
|
unit: scene.unit,
|
|
240
249
|
rulerUnit: scene.rulerUnit,
|
|
241
250
|
length: pAw.length,
|
|
242
251
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y + thickness / 2 + baseSpace, " ) rotate(").concat(angle, ", 0, 0)")
|
|
243
|
-
}), /*#__PURE__*/
|
|
252
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
244
253
|
x1: pAw.pos.x,
|
|
245
254
|
y1: pAw.pos.y,
|
|
246
255
|
x2: pAw.pos.x,
|
|
@@ -250,21 +259,21 @@ export default function Line(_ref) {
|
|
|
250
259
|
}
|
|
251
260
|
} else {
|
|
252
261
|
if (y1 - y2 > 0) {
|
|
253
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
254
|
-
return /*#__PURE__*/
|
|
262
|
+
if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
|
|
263
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
255
264
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
256
265
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
257
266
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
258
267
|
y2: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
259
268
|
style: STYLE
|
|
260
|
-
}), /*#__PURE__*/
|
|
269
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
261
270
|
key: 5,
|
|
262
271
|
layer: layer,
|
|
263
272
|
unit: scene.unit,
|
|
264
273
|
rulerUnit: scene.rulerUnit,
|
|
265
274
|
length: pAw.length,
|
|
266
275
|
transform: "translate(".concat(pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0)")
|
|
267
|
-
}), /*#__PURE__*/
|
|
276
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
268
277
|
x1: pAw.pos.x,
|
|
269
278
|
y1: pAw.pos.y,
|
|
270
279
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -272,20 +281,20 @@ export default function Line(_ref) {
|
|
|
272
281
|
style: STYLE
|
|
273
282
|
}));
|
|
274
283
|
} else {
|
|
275
|
-
return /*#__PURE__*/
|
|
284
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
276
285
|
x1: pAw.pos.x,
|
|
277
286
|
y1: pAw.pos.y,
|
|
278
287
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
279
288
|
y2: pAw.pos.y + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
280
289
|
style: STYLE
|
|
281
|
-
}), /*#__PURE__*/
|
|
290
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
282
291
|
key: 5,
|
|
283
292
|
layer: layer,
|
|
284
293
|
unit: scene.unit,
|
|
285
294
|
rulerUnit: scene.rulerUnit,
|
|
286
295
|
length: pAw.length,
|
|
287
296
|
transform: "translate(".concat(pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0) scale(-1, -1)")
|
|
288
|
-
}), /*#__PURE__*/
|
|
297
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
289
298
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
290
299
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
291
300
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -294,21 +303,21 @@ export default function Line(_ref) {
|
|
|
294
303
|
}));
|
|
295
304
|
}
|
|
296
305
|
} else {
|
|
297
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
298
|
-
return /*#__PURE__*/
|
|
306
|
+
if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
|
|
307
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
299
308
|
x1: pAw.pos.x,
|
|
300
309
|
y1: pAw.pos.y,
|
|
301
310
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
302
311
|
y2: pAw.pos.y + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
303
312
|
style: STYLE
|
|
304
|
-
}), /*#__PURE__*/
|
|
313
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
305
314
|
key: 5,
|
|
306
315
|
layer: layer,
|
|
307
316
|
unit: scene.unit,
|
|
308
317
|
rulerUnit: scene.rulerUnit,
|
|
309
318
|
length: pAw.length,
|
|
310
319
|
transform: "translate(".concat(pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0)")
|
|
311
|
-
}), /*#__PURE__*/
|
|
320
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
312
321
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
313
322
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
314
323
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -316,20 +325,20 @@ export default function Line(_ref) {
|
|
|
316
325
|
style: STYLE
|
|
317
326
|
}));
|
|
318
327
|
} else {
|
|
319
|
-
return /*#__PURE__*/
|
|
328
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
320
329
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
321
330
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
322
331
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
323
332
|
y2: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
324
333
|
style: STYLE
|
|
325
|
-
}), /*#__PURE__*/
|
|
334
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
326
335
|
key: 5,
|
|
327
336
|
layer: layer,
|
|
328
337
|
unit: scene.unit,
|
|
329
338
|
rulerUnit: scene.rulerUnit,
|
|
330
339
|
length: pAw.length,
|
|
331
340
|
transform: "translate(".concat(pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0) scale(-1, -1)")
|
|
332
|
-
}), /*#__PURE__*/
|
|
341
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
333
342
|
x1: pAw.pos.x,
|
|
334
343
|
y1: pAw.pos.y,
|
|
335
344
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -349,7 +358,7 @@ export default function Line(_ref) {
|
|
|
349
358
|
}
|
|
350
359
|
var startAt = length * hole.offset;
|
|
351
360
|
var renderedHole = catalog.getElement(hole.type).render2D(hole, layer, scene);
|
|
352
|
-
return /*#__PURE__*/
|
|
361
|
+
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
353
362
|
key: holeID,
|
|
354
363
|
transform: "translate(".concat(startAt, ", 3.5)"),
|
|
355
364
|
"data-element-root": true,
|
|
@@ -386,7 +395,7 @@ export default function Line(_ref) {
|
|
|
386
395
|
|
|
387
396
|
// wall cabinet
|
|
388
397
|
var wallSpace = doorSpace + 20;
|
|
389
|
-
var wall_item = GeometryUtils.getAllItemSpecified(scene, catalog, WALL_CABINET_LAYOUTPOS);
|
|
398
|
+
var wall_item = _export.GeometryUtils.getAllItemSpecified(scene, catalog, _constants.WALL_CABINET_LAYOUTPOS);
|
|
390
399
|
var wallRuler = [];
|
|
391
400
|
var wall_posArray = [];
|
|
392
401
|
if (wall_item.cur) {
|
|
@@ -403,7 +412,7 @@ export default function Line(_ref) {
|
|
|
403
412
|
wall_posArray.push(l2);
|
|
404
413
|
wall_posArray.push(l3);
|
|
405
414
|
var wall_posAndwidth = [];
|
|
406
|
-
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || GeometryUtils.almostEqual(y1, y2)) {
|
|
415
|
+
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || _export.GeometryUtils.almostEqual(y1, y2)) {
|
|
407
416
|
wall_posArray.sort(function (a, b) {
|
|
408
417
|
return a.x - b.x;
|
|
409
418
|
});
|
|
@@ -435,22 +444,22 @@ export default function Line(_ref) {
|
|
|
435
444
|
}
|
|
436
445
|
wallRuler = wall_posAndwidth.map(function (pAw) {
|
|
437
446
|
if (pAw.length > 1) {
|
|
438
|
-
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || GeometryUtils.almostEqual(y1, y2)) {
|
|
447
|
+
if (Math.abs(angle) === 0 || Math.abs(angle) === 180 || _export.GeometryUtils.almostEqual(y1, y2)) {
|
|
439
448
|
if (x1 - x2 > 0) {
|
|
440
|
-
return /*#__PURE__*/
|
|
449
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
441
450
|
x1: pAw.pos.x + pAw.length,
|
|
442
451
|
y1: pAw.pos.y,
|
|
443
452
|
x2: pAw.pos.x + pAw.length,
|
|
444
453
|
y2: pAw.pos.y - thickness / 2 - wallSpace,
|
|
445
454
|
style: STYLE
|
|
446
|
-
}), /*#__PURE__*/
|
|
455
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
447
456
|
key: 4,
|
|
448
457
|
layer: layer,
|
|
449
458
|
unit: scene.unit,
|
|
450
459
|
rulerUnit: scene.rulerUnit,
|
|
451
460
|
length: pAw.length,
|
|
452
461
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y - thickness / 2 - wallSpace, " ) rotate(").concat(angle + 180, ", 0, 0)")
|
|
453
|
-
}), /*#__PURE__*/
|
|
462
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
454
463
|
x1: pAw.pos.x,
|
|
455
464
|
y1: pAw.pos.y,
|
|
456
465
|
x2: pAw.pos.x,
|
|
@@ -458,20 +467,20 @@ export default function Line(_ref) {
|
|
|
458
467
|
style: STYLE
|
|
459
468
|
}));
|
|
460
469
|
} else {
|
|
461
|
-
return /*#__PURE__*/
|
|
470
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
462
471
|
x1: pAw.pos.x + pAw.length,
|
|
463
472
|
y1: pAw.pos.y,
|
|
464
473
|
x2: pAw.pos.x + pAw.length,
|
|
465
474
|
y2: pAw.pos.y + thickness / 2 + wallSpace,
|
|
466
475
|
style: STYLE
|
|
467
|
-
}), /*#__PURE__*/
|
|
476
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
468
477
|
key: 4,
|
|
469
478
|
layer: layer,
|
|
470
479
|
unit: scene.unit,
|
|
471
480
|
rulerUnit: scene.rulerUnit,
|
|
472
481
|
length: pAw.length,
|
|
473
482
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y + thickness / 2 + wallSpace, " ) rotate(").concat(angle, ", 0, 0)")
|
|
474
|
-
}), /*#__PURE__*/
|
|
483
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
475
484
|
x1: pAw.pos.x,
|
|
476
485
|
y1: pAw.pos.y,
|
|
477
486
|
x2: pAw.pos.x,
|
|
@@ -481,21 +490,21 @@ export default function Line(_ref) {
|
|
|
481
490
|
}
|
|
482
491
|
} else {
|
|
483
492
|
if (y1 - y2 > 0) {
|
|
484
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
485
|
-
return /*#__PURE__*/
|
|
493
|
+
if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
|
|
494
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
486
495
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
487
496
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
488
497
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
489
498
|
y2: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
490
499
|
style: STYLE
|
|
491
|
-
}), /*#__PURE__*/
|
|
500
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
492
501
|
key: 5,
|
|
493
502
|
layer: layer,
|
|
494
503
|
unit: scene.unit,
|
|
495
504
|
rulerUnit: scene.rulerUnit,
|
|
496
505
|
length: pAw.length,
|
|
497
506
|
transform: "translate(".concat(pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0)")
|
|
498
|
-
}), /*#__PURE__*/
|
|
507
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
499
508
|
x1: pAw.pos.x,
|
|
500
509
|
y1: pAw.pos.y,
|
|
501
510
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -503,20 +512,20 @@ export default function Line(_ref) {
|
|
|
503
512
|
style: STYLE
|
|
504
513
|
}));
|
|
505
514
|
} else {
|
|
506
|
-
return /*#__PURE__*/
|
|
515
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
507
516
|
x1: pAw.pos.x,
|
|
508
517
|
y1: pAw.pos.y,
|
|
509
518
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
510
519
|
y2: pAw.pos.y + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
511
520
|
style: STYLE
|
|
512
|
-
}), /*#__PURE__*/
|
|
521
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
513
522
|
key: 5,
|
|
514
523
|
layer: layer,
|
|
515
524
|
unit: scene.unit,
|
|
516
525
|
rulerUnit: scene.rulerUnit,
|
|
517
526
|
length: pAw.length,
|
|
518
527
|
transform: "translate(".concat(pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0) scale(-1, -1)")
|
|
519
|
-
}), /*#__PURE__*/
|
|
528
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
520
529
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
521
530
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
522
531
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -525,21 +534,21 @@ export default function Line(_ref) {
|
|
|
525
534
|
}));
|
|
526
535
|
}
|
|
527
536
|
} else {
|
|
528
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
529
|
-
return /*#__PURE__*/
|
|
537
|
+
if (x1 - x2 < 0 || _export.GeometryUtils.almostEqual(x1, x2)) {
|
|
538
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
530
539
|
x1: pAw.pos.x,
|
|
531
540
|
y1: pAw.pos.y,
|
|
532
541
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
533
542
|
y2: pAw.pos.y + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
534
543
|
style: STYLE
|
|
535
|
-
}), /*#__PURE__*/
|
|
544
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
536
545
|
key: 5,
|
|
537
546
|
layer: layer,
|
|
538
547
|
unit: scene.unit,
|
|
539
548
|
rulerUnit: scene.rulerUnit,
|
|
540
549
|
length: pAw.length,
|
|
541
550
|
transform: "translate(".concat(pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0)")
|
|
542
|
-
}), /*#__PURE__*/
|
|
551
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
543
552
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
544
553
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
545
554
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -547,20 +556,20 @@ export default function Line(_ref) {
|
|
|
547
556
|
style: STYLE
|
|
548
557
|
}));
|
|
549
558
|
} else {
|
|
550
|
-
return /*#__PURE__*/
|
|
559
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
551
560
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
552
561
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
553
562
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
554
563
|
y2: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
555
564
|
style: STYLE
|
|
556
|
-
}), /*#__PURE__*/
|
|
565
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
557
566
|
key: 5,
|
|
558
567
|
layer: layer,
|
|
559
568
|
unit: scene.unit,
|
|
560
569
|
rulerUnit: scene.rulerUnit,
|
|
561
570
|
length: pAw.length,
|
|
562
571
|
transform: "translate(".concat(pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI), ", ").concat(pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI), " ) rotate(").concat(angle, ", 0, 0) scale(-1, -1)")
|
|
563
|
-
}), /*#__PURE__*/
|
|
572
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
564
573
|
x1: pAw.pos.x,
|
|
565
574
|
y1: pAw.pos.y,
|
|
566
575
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -578,20 +587,20 @@ export default function Line(_ref) {
|
|
|
578
587
|
//the space from the dimensioning line to the bottom
|
|
579
588
|
var lineSpacedimension2 = 15;
|
|
580
589
|
if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
581
|
-
renderedRuler.push(/*#__PURE__*/
|
|
590
|
+
renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
582
591
|
x1: length,
|
|
583
592
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
584
593
|
x2: length,
|
|
585
594
|
y2: half_thickness + lineSpacedimension2,
|
|
586
595
|
style: STYLE
|
|
587
|
-
}), /*#__PURE__*/
|
|
596
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
588
597
|
key: 0,
|
|
589
598
|
layer: layer,
|
|
590
599
|
unit: scene.unit,
|
|
591
600
|
rulerUnit: scene.rulerUnit,
|
|
592
601
|
length: length,
|
|
593
602
|
transform: "translate(".concat(length, ", ").concat(half_thickness + lineSpace, ") scale(-1, -1)")
|
|
594
|
-
}), /*#__PURE__*/
|
|
603
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
595
604
|
x1: 0,
|
|
596
605
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
597
606
|
x2: 0,
|
|
@@ -599,20 +608,20 @@ export default function Line(_ref) {
|
|
|
599
608
|
style: STYLE
|
|
600
609
|
})));
|
|
601
610
|
} else {
|
|
602
|
-
renderedRuler.push(/*#__PURE__*/
|
|
611
|
+
renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
603
612
|
x1: 0,
|
|
604
613
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
605
614
|
x2: 0,
|
|
606
615
|
y2: half_thickness + lineSpacedimension2,
|
|
607
616
|
style: STYLE
|
|
608
|
-
}), /*#__PURE__*/
|
|
617
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
609
618
|
key: 0,
|
|
610
619
|
layer: layer,
|
|
611
620
|
unit: scene.unit,
|
|
612
621
|
rulerUnit: scene.rulerUnit,
|
|
613
622
|
length: length,
|
|
614
623
|
transform: "translate(0, ".concat(half_thickness + lineSpace, ")")
|
|
615
|
-
}), /*#__PURE__*/
|
|
624
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
616
625
|
x1: length,
|
|
617
626
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
618
627
|
x2: length,
|
|
@@ -646,22 +655,22 @@ export default function Line(_ref) {
|
|
|
646
655
|
dataProtoType = 'rulerHole';
|
|
647
656
|
}
|
|
648
657
|
if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
649
|
-
renderedAllRuler.push(/*#__PURE__*/
|
|
658
|
+
renderedAllRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
|
|
650
659
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
|
|
651
|
-
}, /*#__PURE__*/
|
|
660
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
652
661
|
x1: allRuler[index],
|
|
653
662
|
y1: half_thickness,
|
|
654
663
|
x2: allRuler[index],
|
|
655
664
|
y2: half_thickness + doorSpace,
|
|
656
665
|
style: STYLE
|
|
657
|
-
}), /*#__PURE__*/
|
|
666
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
658
667
|
key: "allRuler_".concat(index),
|
|
659
668
|
layer: layer,
|
|
660
669
|
unit: scene.unit,
|
|
661
670
|
rulerUnit: scene.rulerUnit,
|
|
662
671
|
length: element,
|
|
663
672
|
transform: "translate(".concat(allRuler[index] + element, ", ").concat(half_thickness + doorSpace, " ) scale(-1, -1)")
|
|
664
|
-
}), /*#__PURE__*/
|
|
673
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
665
674
|
x1: allRuler[index] + element,
|
|
666
675
|
y1: half_thickness,
|
|
667
676
|
x2: allRuler[index] + element,
|
|
@@ -669,22 +678,22 @@ export default function Line(_ref) {
|
|
|
669
678
|
style: STYLE
|
|
670
679
|
})));
|
|
671
680
|
} else {
|
|
672
|
-
renderedAllRuler.push(/*#__PURE__*/
|
|
681
|
+
renderedAllRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
|
|
673
682
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
|
|
674
|
-
}, /*#__PURE__*/
|
|
683
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
675
684
|
x1: allRuler[index],
|
|
676
685
|
y1: half_thickness,
|
|
677
686
|
x2: allRuler[index],
|
|
678
687
|
y2: half_thickness + doorSpace,
|
|
679
688
|
style: STYLE
|
|
680
|
-
}), /*#__PURE__*/
|
|
689
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
681
690
|
key: "allRuler_".concat(index),
|
|
682
691
|
layer: layer,
|
|
683
692
|
unit: scene.unit,
|
|
684
693
|
rulerUnit: scene.rulerUnit,
|
|
685
694
|
length: element,
|
|
686
695
|
transform: "translate(".concat(allRuler[index], ", ").concat(half_thickness + doorSpace, " )")
|
|
687
|
-
}), /*#__PURE__*/
|
|
696
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
688
697
|
x1: allRuler[index] + element,
|
|
689
698
|
y1: half_thickness,
|
|
690
699
|
x2: allRuler[index] + element,
|
|
@@ -695,7 +704,7 @@ export default function Line(_ref) {
|
|
|
695
704
|
}
|
|
696
705
|
});
|
|
697
706
|
}
|
|
698
|
-
return /*#__PURE__*/
|
|
707
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
|
|
699
708
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)"),
|
|
700
709
|
"data-element-root": true,
|
|
701
710
|
"data-prototype": 'ruler',
|
|
@@ -758,13 +767,13 @@ export default function Line(_ref) {
|
|
|
758
767
|
pos2 = pos1.clone().rotateAround(cen2, t * angle * Math.PI / 180);
|
|
759
768
|
|
|
760
769
|
// Angle SVG Path
|
|
761
|
-
lines.push(/*#__PURE__*/
|
|
770
|
+
lines.push(/*#__PURE__*/_react["default"].createElement("path", {
|
|
762
771
|
style: STYLE_ANGLE,
|
|
763
772
|
d: "\n M ".concat(vertex[0].x, ",").concat(vertex[0].y, " L ").concat(pos1.x, ",").concat(pos1.y, " A 30,30 ").concat(angle, " 0 ").concat(t > 0 ? 1 : 0, " ").concat(pos2.x, ",").concat(pos2.y, " z\n ")
|
|
764
773
|
}));
|
|
765
774
|
var length = angle;
|
|
766
775
|
// draw angle and angle text
|
|
767
|
-
return /*#__PURE__*/
|
|
776
|
+
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
768
777
|
key: index,
|
|
769
778
|
transform: "translate(".concat(tx, ", ").concat(ty, ")"),
|
|
770
779
|
"data-element-root": true,
|
|
@@ -773,17 +782,17 @@ export default function Line(_ref) {
|
|
|
773
782
|
"data-selected": "true",
|
|
774
783
|
"data-id": [vertex[0].id, vertex[1].id, rotDir],
|
|
775
784
|
"data-length": length
|
|
776
|
-
}, lines, /*#__PURE__*/
|
|
785
|
+
}, lines, /*#__PURE__*/_react["default"].createElement("text", {
|
|
777
786
|
transform: "translate(".concat(angleTextO.x, ", ").concat(angleTextO.y, ") scale(1.5, -1.5)"),
|
|
778
787
|
style: STYLE_TEXT
|
|
779
|
-
}, angle), /*#__PURE__*/
|
|
788
|
+
}, angle), /*#__PURE__*/_react["default"].createElement("circle", {
|
|
780
789
|
transform: "translate(".concat(angleTextO.x, ", ").concat(angleTextO.y, ") translate(10, 9)"),
|
|
781
790
|
fill: "transparent",
|
|
782
791
|
stroke: "rgb(77, 77, 77)",
|
|
783
792
|
strokeWidth: 1,
|
|
784
793
|
r: 2
|
|
785
794
|
}));
|
|
786
|
-
}), showWindowDoorMeasure ? renderedAllRuler : null, showBaseCabinetMeasure ? baseRuler : null, showWallCabinetMeasure ? wallRuler : null, /*#__PURE__*/
|
|
795
|
+
}), showWindowDoorMeasure ? renderedAllRuler : null, showBaseCabinetMeasure ? baseRuler : null, showWallCabinetMeasure ? wallRuler : null, /*#__PURE__*/_react["default"].createElement("g", {
|
|
787
796
|
"data-element-root": true,
|
|
788
797
|
"data-prototype": line.prototype,
|
|
789
798
|
"data-id": line.id,
|
|
@@ -793,24 +802,22 @@ export default function Line(_ref) {
|
|
|
793
802
|
style: line.selected ? {
|
|
794
803
|
cursor: 'move'
|
|
795
804
|
} : {}
|
|
796
|
-
}, renderedLine, /*#__PURE__*/
|
|
805
|
+
}, renderedLine, /*#__PURE__*/_react["default"].createElement("g", {
|
|
797
806
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
|
|
798
|
-
}, renderedHoles)), line.selected && /*#__PURE__*/
|
|
799
|
-
title: "Elevation View"
|
|
800
|
-
}, /*#__PURE__*/React.createElement("g", {
|
|
807
|
+
}, renderedHoles)), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
|
|
801
808
|
id: 'elevation-button',
|
|
802
809
|
key: 1,
|
|
803
810
|
transform: "translate(".concat(x1 + 35, ", ").concat(y1 - 15, ")"),
|
|
804
811
|
style: {
|
|
805
812
|
cursor: 'pointer'
|
|
806
813
|
}
|
|
807
|
-
}, /*#__PURE__*/
|
|
814
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("filter", {
|
|
808
815
|
id: "shadow"
|
|
809
|
-
}, /*#__PURE__*/
|
|
816
|
+
}, /*#__PURE__*/_react["default"].createElement("feDropShadow", {
|
|
810
817
|
dx: "0",
|
|
811
818
|
dy: "0",
|
|
812
819
|
stdDeviation: "0.6"
|
|
813
|
-
}))), /*#__PURE__*/
|
|
820
|
+
}))), /*#__PURE__*/_react["default"].createElement("rect", {
|
|
814
821
|
rx: "4",
|
|
815
822
|
ry: "4",
|
|
816
823
|
y: "20",
|
|
@@ -818,7 +825,7 @@ export default function Line(_ref) {
|
|
|
818
825
|
width: "22",
|
|
819
826
|
fill: "white",
|
|
820
827
|
filter: "url(#shadow)"
|
|
821
|
-
}), /*#__PURE__*/
|
|
828
|
+
}), /*#__PURE__*/_react["default"].createElement("image", {
|
|
822
829
|
href: "/assets/img/svg/bottombar/elevation.svg",
|
|
823
830
|
x: "5",
|
|
824
831
|
y: "-36",
|
|
@@ -827,20 +834,20 @@ export default function Line(_ref) {
|
|
|
827
834
|
style: {
|
|
828
835
|
transform: 'rotateX(180deg)'
|
|
829
836
|
}
|
|
830
|
-
}))
|
|
837
|
+
})), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
|
|
831
838
|
id: 'remove-button',
|
|
832
839
|
key: 2,
|
|
833
840
|
transform: "translate(".concat(x1 + 10, ", ").concat(y1, ")"),
|
|
834
841
|
style: {
|
|
835
842
|
cursor: 'pointer'
|
|
836
843
|
}
|
|
837
|
-
}, /*#__PURE__*/
|
|
844
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("filter", {
|
|
838
845
|
id: "shadow"
|
|
839
|
-
}, /*#__PURE__*/
|
|
846
|
+
}, /*#__PURE__*/_react["default"].createElement("feDropShadow", {
|
|
840
847
|
dx: "0",
|
|
841
848
|
dy: "0",
|
|
842
849
|
stdDeviation: "0.6"
|
|
843
|
-
}))), /*#__PURE__*/
|
|
850
|
+
}))), /*#__PURE__*/_react["default"].createElement("rect", {
|
|
844
851
|
rx: "4",
|
|
845
852
|
ry: "4",
|
|
846
853
|
y: "5",
|
|
@@ -848,7 +855,7 @@ export default function Line(_ref) {
|
|
|
848
855
|
width: "22",
|
|
849
856
|
fill: "white",
|
|
850
857
|
filter: "url(#shadow)"
|
|
851
|
-
}), /*#__PURE__*/
|
|
858
|
+
}), /*#__PURE__*/_react["default"].createElement("image", {
|
|
852
859
|
href: "/assets/img/svg/delete.svg",
|
|
853
860
|
x: "3",
|
|
854
861
|
y: "-24",
|
|
@@ -857,7 +864,7 @@ export default function Line(_ref) {
|
|
|
857
864
|
style: {
|
|
858
865
|
transform: 'rotateX(180deg)'
|
|
859
866
|
}
|
|
860
|
-
})), /*#__PURE__*/
|
|
867
|
+
})), /*#__PURE__*/_react["default"].createElement("use", {
|
|
861
868
|
id: 'use elevation button',
|
|
862
869
|
xlinkHref: '#elevation-button',
|
|
863
870
|
"data-element-root": true,
|
|
@@ -866,7 +873,7 @@ export default function Line(_ref) {
|
|
|
866
873
|
"data-selected": line.selected,
|
|
867
874
|
"data-layer": layer.id,
|
|
868
875
|
"data-part": "elevation"
|
|
869
|
-
}), /*#__PURE__*/
|
|
876
|
+
}), /*#__PURE__*/_react["default"].createElement("use", {
|
|
870
877
|
id: 'use remove button',
|
|
871
878
|
xlinkHref: '#remove-button',
|
|
872
879
|
"data-element-root": true,
|
|
@@ -878,8 +885,8 @@ export default function Line(_ref) {
|
|
|
878
885
|
}));
|
|
879
886
|
}
|
|
880
887
|
Line.propTypes = {
|
|
881
|
-
line:
|
|
882
|
-
layer:
|
|
883
|
-
scene:
|
|
884
|
-
catalog:
|
|
888
|
+
line: _propTypes["default"].object.isRequired,
|
|
889
|
+
layer: _propTypes["default"].object.isRequired,
|
|
890
|
+
scene: _propTypes["default"].object.isRequired,
|
|
891
|
+
catalog: _propTypes["default"].object.isRequired
|
|
885
892
|
};
|