kitchen-simulator 1.1.1-test.60 → 1.1.1-test.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/@history.js +10 -2
- package/es/AppContext.js +10 -3
- package/es/KitchenConfigurator.js +92 -96
- package/es/KitchenConfiguratorApp.js +143 -136
- package/es/actions/area-actions.js +12 -5
- package/es/actions/export.js +29 -12
- package/es/actions/groups-actions.js +45 -27
- package/es/actions/holes-actions.js +55 -34
- package/es/actions/items-actions.js +145 -94
- package/es/actions/lines-actions.js +36 -21
- package/es/actions/project-actions.js +145 -94
- package/es/actions/scene-actions.js +21 -11
- package/es/actions/vertices-actions.js +15 -7
- package/es/actions/viewer2d-actions.js +36 -21
- package/es/actions/viewer3d-actions.js +18 -9
- package/es/catalog/areas/area/planner-element.js +9 -2
- package/es/catalog/catalog.js +21 -24
- package/es/catalog/factories/area-factory-3d.js +31 -22
- package/es/catalog/factories/area-factory.js +20 -14
- package/es/catalog/factories/export.js +24 -6
- package/es/catalog/factories/wall-factory-3d.js +41 -31
- package/es/catalog/factories/wall-factory.js +31 -21
- package/es/catalog/holes/door-closet/planner-element.js +24 -15
- package/es/catalog/holes/door-double/planner-element.js +24 -15
- package/es/catalog/holes/door-exterior/planner-element.js +25 -16
- package/es/catalog/holes/door-interior/planner-element.js +25 -16
- package/es/catalog/holes/door-panic/planner-element.js +16 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +24 -15
- package/es/catalog/holes/door-sliding/planner-element.js +25 -16
- package/es/catalog/holes/doorway-framed/planner-element.js +20 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +16 -7
- package/es/catalog/holes/export.js +97 -13
- package/es/catalog/holes/window-clear/planner-element.js +19 -10
- package/es/catalog/holes/window-cross/planner-element.js +19 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +19 -10
- package/es/catalog/holes/window-vertical/planner-element.js +19 -10
- package/es/catalog/lines/wall/planner-element.js +9 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +14 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +14 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +14 -5
- package/es/catalog/properties/export.js +80 -20
- package/es/catalog/properties/property-checkbox.js +31 -27
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +31 -29
- package/es/catalog/properties/property-hidden.js +16 -9
- package/es/catalog/properties/property-lenght-measure.js +45 -39
- package/es/catalog/properties/property-length-measure.js +43 -42
- package/es/catalog/properties/property-length-measure_hole.js +45 -39
- package/es/catalog/properties/property-number.js +24 -17
- package/es/catalog/properties/property-read-only.js +23 -16
- package/es/catalog/properties/property-string.js +23 -16
- package/es/catalog/properties/property-toggle.js +23 -16
- package/es/catalog/properties/shared-property-style.js +7 -1
- package/es/catalog/utils/FuseUtils.js +15 -11
- package/es/catalog/utils/exporter.js +15 -11
- package/es/catalog/utils/geom-utils.js +29 -13
- package/es/catalog/utils/item-loader.js +97 -91
- package/es/catalog/utils/load-obj.js +28 -20
- package/es/catalog/utils/mtl-loader.js +8 -3
- package/es/catalog/utils/obj-loader.js +8 -3
- package/es/class/FuseUtils.js +15 -11
- package/es/class/area.js +28 -26
- package/es/class/export.js +95 -23
- package/es/class/group.js +59 -62
- package/es/class/guide.js +21 -19
- package/es/class/hole.js +89 -87
- package/es/class/item.js +147 -150
- package/es/class/layer.js +65 -63
- package/es/class/line.js +143 -144
- package/es/class/project.js +98 -94
- package/es/class/vertex.js +35 -33
- package/es/components/content.js +28 -19
- package/es/components/disclaimer/disclaimer.js +18 -10
- package/es/components/export.js +32 -8
- package/es/components/style/button.js +31 -30
- package/es/components/style/cancel-button.js +14 -8
- package/es/components/style/content-container.js +16 -12
- package/es/components/style/content-title.js +20 -15
- package/es/components/style/delete-button.js +17 -9
- package/es/components/style/export.js +120 -30
- package/es/components/style/form-block.js +15 -12
- package/es/components/style/form-color-input.js +14 -8
- package/es/components/style/form-label.js +15 -12
- package/es/components/style/form-number-input.js +49 -47
- package/es/components/style/form-number-input_2.js +44 -42
- package/es/components/style/form-select.js +24 -26
- package/es/components/style/form-slider.js +17 -11
- package/es/components/style/form-submit-button.js +17 -9
- package/es/components/style/form-text-input.js +34 -33
- package/es/components/viewer2d/area.js +24 -17
- package/es/components/viewer2d/export.js +120 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +17 -10
- package/es/components/viewer2d/grids/grids.js +19 -15
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -66
- package/es/components/viewer2d/layer.js +30 -23
- package/es/components/viewer2d/line.js +111 -101
- package/es/components/viewer2d/ruler.js +29 -22
- package/es/components/viewer2d/rulerDist.js +28 -21
- package/es/components/viewer2d/rulerX.js +47 -45
- package/es/components/viewer2d/rulerY.js +45 -43
- package/es/components/viewer2d/scene.js +41 -45
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -23
- package/es/components/viewer2d/utils.js +37 -29
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +163 -164
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +23 -24
- package/es/components/viewer3d/dcm.js +7 -1
- package/es/components/viewer3d/fbm.js +7 -1
- package/es/components/viewer3d/front3D.js +21 -17
- package/es/components/viewer3d/grid-creator.js +17 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +14 -6
- package/es/components/viewer3d/grids/grid-streak.js +13 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +14 -6
- package/es/components/viewer3d/libs/first-person-controls.js +9 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +7 -1
- package/es/components/viewer3d/libs/mtl-loader.js +7 -1
- package/es/components/viewer3d/libs/obj-loader.js +7 -1
- package/es/components/viewer3d/libs/orbit-controls.js +8 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +8 -2
- package/es/components/viewer3d/lrm.js +7 -1
- package/es/components/viewer3d/model.js +7 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +10 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +25 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +66 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +46 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +17 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +11 -4
- package/es/components/viewer3d/scene-creator.js +227 -198
- package/es/components/viewer3d/three-memory-cleaner.js +12 -3
- package/es/components/viewer3d/viewer3d-first-person.js +46 -46
- package/es/components/viewer3d/viewer3d.js +202 -202
- package/es/constants.js +358 -349
- package/es/index.js +15 -14
- package/es/models.js +184 -183
- package/es/plugins/SVGLoader.js +53 -48
- package/es/plugins/autosave.js +9 -3
- package/es/plugins/console-debugger.js +12 -8
- package/es/plugins/export.js +32 -8
- package/es/plugins/keyboard.js +35 -29
- package/es/reducers/areas-reducer.js +13 -7
- package/es/reducers/export.js +96 -24
- package/es/reducers/groups-reducer.js +37 -31
- package/es/reducers/holes-reducer.js +49 -43
- package/es/reducers/items-reducer.js +112 -106
- package/es/reducers/lines-reducer.js +34 -28
- package/es/reducers/project-reducer.js +111 -105
- package/es/reducers/reducer.js +23 -16
- package/es/reducers/scene-reducer.js +21 -15
- package/es/reducers/user-reducer.js +11 -5
- package/es/reducers/vertices-reducer.js +17 -11
- package/es/reducers/viewer2d-reducer.js +24 -18
- package/es/reducers/viewer3d-reducer.js +22 -16
- package/es/shared-style.js +16 -10
- package/es/styles/export.js +11 -3
- package/es/translator/en.js +7 -1
- package/es/translator/it.js +7 -1
- package/es/translator/ru.js +7 -1
- package/es/translator/translator.js +19 -17
- package/es/utils/browser.js +9 -2
- package/es/utils/convert-units-lite.js +7 -1
- package/es/utils/email-validator.js +7 -1
- package/es/utils/export.js +46 -15
- package/es/utils/geometry.js +278 -190
- package/es/utils/get-edges-of-subgraphs.js +9 -2
- package/es/utils/graph-cycles.js +11 -8
- package/es/utils/graph-inner-cycles.js +18 -10
- package/es/utils/graph.js +17 -13
- package/es/utils/helper.js +63 -41
- package/es/utils/history.js +15 -8
- package/es/utils/id-broker.js +15 -12
- package/es/utils/logger.js +7 -1
- package/es/utils/math.js +12 -5
- package/es/utils/molding.js +144 -125
- package/es/utils/name-generator.js +13 -11
- package/es/utils/objects-utils.js +19 -7
- package/es/utils/phone-validator.js +7 -1
- package/es/utils/process-black-list.js +10 -6
- package/es/utils/react-if.js +12 -6
- package/es/utils/snap-scene.js +34 -32
- package/es/utils/snap.js +59 -51
- package/es/utils/summarizeCart.js +7 -1
- package/es/utils/threeCSG.es6.js +22 -17
- package/es/version.js +7 -1
- package/lib/@history.js +1 -1
- package/lib/AppContext.js +1 -1
- package/lib/KitchenConfigurator.js +37 -49
- package/lib/KitchenConfiguratorApp.js +60 -61
- package/lib/actions/export.js +1 -1
- package/lib/catalog/areas/area/planner-element.js +1 -1
- package/lib/catalog/catalog.js +7 -15
- package/lib/catalog/factories/area-factory-3d.js +1 -1
- package/lib/catalog/factories/area-factory.js +4 -6
- package/lib/catalog/factories/export.js +1 -1
- package/lib/catalog/factories/wall-factory-3d.js +2 -2
- package/lib/catalog/factories/wall-factory.js +2 -2
- package/lib/catalog/holes/door-closet/planner-element.js +2 -2
- package/lib/catalog/holes/door-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-exterior/planner-element.js +2 -2
- package/lib/catalog/holes/door-interior/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic/planner-element.js +2 -2
- package/lib/catalog/holes/door-panic-double/planner-element.js +2 -2
- package/lib/catalog/holes/door-sliding/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-framed/planner-element.js +2 -2
- package/lib/catalog/holes/doorway-frameless/planner-element.js +2 -2
- package/lib/catalog/holes/export.js +2 -2
- package/lib/catalog/holes/window-clear/planner-element.js +2 -2
- package/lib/catalog/holes/window-cross/planner-element.js +2 -2
- package/lib/catalog/holes/window-double-hung/planner-element.js +2 -2
- package/lib/catalog/holes/window-vertical/planner-element.js +2 -2
- package/lib/catalog/lines/wall/planner-element.js +1 -1
- package/lib/catalog/molding/molding-dcm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-fbm/planner-element.js +2 -2
- package/lib/catalog/molding/molding-lrm/planner-element.js +2 -2
- package/lib/catalog/properties/export.js +1 -1
- package/lib/catalog/properties/property-checkbox.js +3 -6
- package/lib/catalog/properties/property-color.js +1 -1
- package/lib/catalog/properties/property-enum.js +4 -9
- package/lib/catalog/properties/property-hidden.js +1 -1
- package/lib/catalog/properties/property-lenght-measure.js +5 -6
- package/lib/catalog/properties/property-length-measure.js +7 -13
- package/lib/catalog/properties/property-length-measure_hole.js +5 -6
- package/lib/catalog/properties/property-number.js +1 -1
- package/lib/catalog/properties/property-read-only.js +1 -1
- package/lib/catalog/properties/property-string.js +1 -1
- package/lib/catalog/properties/property-toggle.js +1 -1
- package/lib/catalog/utils/FuseUtils.js +8 -10
- package/lib/catalog/utils/exporter.js +3 -5
- package/lib/catalog/utils/geom-utils.js +1 -1
- package/lib/catalog/utils/item-loader.js +9 -14
- package/lib/class/FuseUtils.js +8 -10
- package/lib/class/area.js +7 -10
- package/lib/class/export.js +1 -1
- package/lib/class/group.js +11 -19
- package/lib/class/guide.js +9 -12
- package/lib/class/hole.js +5 -8
- package/lib/class/item.js +10 -18
- package/lib/class/layer.js +5 -8
- package/lib/class/line.js +12 -19
- package/lib/class/project.js +8 -10
- package/lib/class/vertex.js +7 -10
- package/lib/components/content.js +2 -2
- package/lib/components/disclaimer/disclaimer.js +1 -1
- package/lib/components/export.js +1 -1
- package/lib/components/style/button.js +15 -21
- package/lib/components/style/cancel-button.js +5 -6
- package/lib/components/style/content-container.js +3 -6
- package/lib/components/style/content-title.js +8 -11
- package/lib/components/style/delete-button.js +6 -7
- package/lib/components/style/export.js +1 -1
- package/lib/components/style/form-block.js +7 -11
- package/lib/components/style/form-color-input.js +5 -6
- package/lib/components/style/form-label.js +7 -11
- package/lib/components/style/form-number-input.js +13 -18
- package/lib/components/style/form-number-input_2.js +13 -18
- package/lib/components/style/form-select.js +10 -19
- package/lib/components/style/form-slider.js +5 -6
- package/lib/components/style/form-submit-button.js +6 -7
- package/lib/components/style/form-text-input.js +17 -22
- package/lib/components/viewer2d/area.js +1 -1
- package/lib/components/viewer2d/export.js +1 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer2d/grids/grid-streak.js +1 -1
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer2d/grids/grids.js +4 -9
- package/lib/components/viewer2d/group.js +2 -2
- package/lib/components/viewer2d/item.js +5 -10
- package/lib/components/viewer2d/layer.js +1 -1
- package/lib/components/viewer2d/line.js +2 -2
- package/lib/components/viewer2d/ruler.js +1 -1
- package/lib/components/viewer2d/rulerDist.js +1 -1
- package/lib/components/viewer2d/rulerX.js +13 -18
- package/lib/components/viewer2d/rulerY.js +13 -18
- package/lib/components/viewer2d/scene.js +21 -32
- package/lib/components/viewer2d/snap.js +2 -2
- package/lib/components/viewer2d/state.js +5 -10
- package/lib/components/viewer2d/utils.js +5 -9
- package/lib/components/viewer2d/vertex.js +2 -2
- package/lib/components/viewer2d/viewer2d.js +13 -23
- package/lib/components/viewer3d/camera-controls-module/camera-controls.module.js +14 -20
- package/lib/components/viewer3d/front3D.js +4 -9
- package/lib/components/viewer3d/grid-creator.js +2 -2
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-streak.js +1 -1
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +1 -1
- package/lib/components/viewer3d/pointer-lock-navigation.js +1 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +1 -1
- package/lib/components/viewer3d/ruler-utils/layer3D.js +1 -1
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +3 -6
- package/lib/components/viewer3d/ruler-utils/scene3D.js +1 -1
- package/lib/components/viewer3d/ruler-utils/state3D.js +1 -1
- package/lib/components/viewer3d/scene-creator.js +16 -21
- package/lib/components/viewer3d/three-memory-cleaner.js +1 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +11 -16
- package/lib/components/viewer3d/viewer3d.js +15 -20
- package/lib/index.js +8 -14
- package/lib/models.js +51 -56
- package/lib/plugins/console-debugger.js +3 -6
- package/lib/plugins/export.js +1 -1
- package/lib/reducers/export.js +1 -1
- package/lib/styles/export.js +1 -1
- package/lib/translator/translator.js +5 -9
- package/lib/utils/export.js +2 -2
- package/lib/utils/geometry.js +11 -18
- package/lib/utils/graph-inner-cycles.js +1 -1
- package/lib/utils/graph.js +7 -10
- package/lib/utils/helper.js +7 -7
- package/lib/utils/history.js +1 -1
- package/lib/utils/id-broker.js +5 -8
- package/lib/utils/molding.js +14 -19
- package/lib/utils/name-generator.js +5 -8
- package/lib/utils/objects-utils.js +5 -3
- package/lib/utils/process-black-list.js +3 -5
- package/lib/utils/react-if.js +1 -1
- package/lib/utils/snap-scene.js +3 -7
- package/lib/utils/snap.js +22 -26
- package/lib/utils/threeCSG.es6.js +14 -14
- package/package.json +24 -18
|
@@ -1,10 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
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); }
|
|
8
18
|
var STYLE = {
|
|
9
19
|
stroke: 'rgb(77, 77, 77)',
|
|
10
20
|
strokeWidth: '1px'
|
|
@@ -23,10 +33,10 @@ var STYLE_TEXT = {
|
|
|
23
33
|
fontWeight: 'middle',
|
|
24
34
|
fontFamily: "'Microsoft YaHei UI', Courier, monospace"
|
|
25
35
|
};
|
|
26
|
-
|
|
36
|
+
function compareVertices(v0, v1) {
|
|
27
37
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
28
38
|
}
|
|
29
|
-
|
|
39
|
+
function Line(_ref) {
|
|
30
40
|
var _state$getIn;
|
|
31
41
|
var line = _ref.line,
|
|
32
42
|
allLine = _ref.allLine,
|
|
@@ -42,7 +52,7 @@ export default function Line(_ref) {
|
|
|
42
52
|
showWindowDoorMeasure = scene.showWindowDoorMeasure;
|
|
43
53
|
var vertex0 = layer.vertices.get(line.vertices.get(0));
|
|
44
54
|
var vertex1 = layer.vertices.get(line.vertices.get(1));
|
|
45
|
-
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
|
|
46
56
|
var x1 = vertex0.x,
|
|
47
57
|
y1 = vertex0.y;
|
|
48
58
|
var x2 = vertex1.x,
|
|
@@ -60,24 +70,24 @@ export default function Line(_ref) {
|
|
|
60
70
|
relatedvertice1y = relatedVertice.point.y;
|
|
61
71
|
}
|
|
62
72
|
});
|
|
63
|
-
var thickness = LINE_THICKNESS;
|
|
73
|
+
var thickness = _constants.LINE_THICKNESS;
|
|
64
74
|
var half_thickness = thickness / 2;
|
|
65
75
|
// if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
66
76
|
// ({ x: x1, y: y1 } = vertex1);
|
|
67
77
|
// ({ x: x2, y: y2 } = vertex0);
|
|
68
78
|
// }
|
|
69
79
|
|
|
70
|
-
var length = GeometryUtils.pointsDistance(x1, y1, x2, y2);
|
|
80
|
+
var length = _export.GeometryUtils.pointsDistance(x1, y1, x2, y2);
|
|
71
81
|
// let length = GeometryUtils.pointsDistance(relatedvertice0x,relatedvertice0y,relatedvertice1x,relatedvertice1y);
|
|
72
82
|
var rightHoleLength, leftHoleLength, holeLength;
|
|
73
|
-
var angle = GeometryUtils.angleBetweenTwoPointsAndOrigin(x1, y1, x2, y2);
|
|
83
|
+
var angle = _export.GeometryUtils.angleBetweenTwoPointsAndOrigin(x1, y1, x2, y2);
|
|
74
84
|
var baseSpace = 20;
|
|
75
|
-
var base_item = GeometryUtils.getAllItemSpecified(scene, catalog, BASE_CABINET_LAYOUTPOS);
|
|
85
|
+
var base_item = _export.GeometryUtils.getAllItemSpecified(scene, catalog, _constants.BASE_CABINET_LAYOUTPOS);
|
|
76
86
|
// let relatedLines = [];
|
|
77
87
|
var angleVertices = [];
|
|
78
88
|
var layerID = state.getIn(['scene', 'selectedLayer']);
|
|
79
89
|
var drawingLineID = (_state$getIn = state.getIn(['scene', 'layers', layerID, 'selected', 'lines'])) === null || _state$getIn === void 0 ? void 0 : _state$getIn.toJS();
|
|
80
|
-
if (!isEmpty(drawingLineID)) {
|
|
90
|
+
if (!(0, _utils.isEmpty)(drawingLineID)) {
|
|
81
91
|
var drawingLine = state.getIn(['scene', 'layers', layerID, 'lines', drawingLineID[0]]).toJS();
|
|
82
92
|
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
83
93
|
var allLinesArray = state.getIn(['scene', 'layers', layerID, 'lines']).toArray();
|
|
@@ -92,14 +102,14 @@ export default function Line(_ref) {
|
|
|
92
102
|
});
|
|
93
103
|
if (reget) {
|
|
94
104
|
relatedLines = [];
|
|
95
|
-
GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
105
|
+
_export.GeometryUtils.getRelatedLines(relatedLines, drawingLine, vertices, allLines);
|
|
96
106
|
}
|
|
97
107
|
// get the angle of two lines and check the angle.
|
|
98
108
|
if (drawingLine.vertices[0] !== drawingLine.vertices[1]) {
|
|
99
109
|
relatedLines.forEach(function (line) {
|
|
100
110
|
// get the points of two lines(drawing line and related line)
|
|
101
111
|
// the first value is overlapped point of two lines as a center of angle.
|
|
102
|
-
if (!isEmpty(line)) {
|
|
112
|
+
if (!(0, _utils.isEmpty)(line)) {
|
|
103
113
|
var points = [];
|
|
104
114
|
var anglePoints = [];
|
|
105
115
|
line.vertices.forEach(function (vt) {
|
|
@@ -147,7 +157,7 @@ export default function Line(_ref) {
|
|
|
147
157
|
var r1 = itemRect.rect[1];
|
|
148
158
|
var r2 = itemRect.rect[2];
|
|
149
159
|
var r3 = itemRect.rect[3];
|
|
150
|
-
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);
|
|
151
161
|
if (delta23 < 0.1) {
|
|
152
162
|
return true;
|
|
153
163
|
} else {
|
|
@@ -171,7 +181,7 @@ export default function Line(_ref) {
|
|
|
171
181
|
base_posArray.push(l2);
|
|
172
182
|
base_posArray.push(l3);
|
|
173
183
|
var base_posAndwidth = [];
|
|
174
|
-
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)) {
|
|
175
185
|
base_posArray.sort(function (a, b) {
|
|
176
186
|
return a.x - b.x;
|
|
177
187
|
});
|
|
@@ -203,22 +213,22 @@ export default function Line(_ref) {
|
|
|
203
213
|
}
|
|
204
214
|
baseRuler = base_posAndwidth.map(function (pAw) {
|
|
205
215
|
if (pAw.length > 1) {
|
|
206
|
-
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)) {
|
|
207
217
|
if (x1 - x2 > 0) {
|
|
208
|
-
return /*#__PURE__*/
|
|
218
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
209
219
|
x1: pAw.pos.x + pAw.length,
|
|
210
220
|
y1: pAw.pos.y,
|
|
211
221
|
x2: pAw.pos.x + pAw.length,
|
|
212
222
|
y2: pAw.pos.y - thickness / 2 - baseSpace,
|
|
213
223
|
style: STYLE
|
|
214
|
-
}), /*#__PURE__*/
|
|
224
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
215
225
|
key: 4,
|
|
216
226
|
layer: layer,
|
|
217
227
|
unit: scene.unit,
|
|
218
228
|
rulerUnit: scene.rulerUnit,
|
|
219
229
|
length: pAw.length,
|
|
220
230
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y - thickness / 2 - baseSpace, " ) rotate(").concat(angle + 180, ", 0, 0)")
|
|
221
|
-
}), /*#__PURE__*/
|
|
231
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
222
232
|
x1: pAw.pos.x,
|
|
223
233
|
y1: pAw.pos.y,
|
|
224
234
|
x2: pAw.pos.x,
|
|
@@ -226,20 +236,20 @@ export default function Line(_ref) {
|
|
|
226
236
|
style: STYLE
|
|
227
237
|
}));
|
|
228
238
|
} else {
|
|
229
|
-
return /*#__PURE__*/
|
|
239
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
230
240
|
x1: pAw.pos.x + pAw.length,
|
|
231
241
|
y1: pAw.pos.y,
|
|
232
242
|
x2: pAw.pos.x + pAw.length,
|
|
233
243
|
y2: pAw.pos.y + thickness / 2 + baseSpace,
|
|
234
244
|
style: STYLE
|
|
235
|
-
}), /*#__PURE__*/
|
|
245
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
236
246
|
key: 4,
|
|
237
247
|
layer: layer,
|
|
238
248
|
unit: scene.unit,
|
|
239
249
|
rulerUnit: scene.rulerUnit,
|
|
240
250
|
length: pAw.length,
|
|
241
251
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y + thickness / 2 + baseSpace, " ) rotate(").concat(angle, ", 0, 0)")
|
|
242
|
-
}), /*#__PURE__*/
|
|
252
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
243
253
|
x1: pAw.pos.x,
|
|
244
254
|
y1: pAw.pos.y,
|
|
245
255
|
x2: pAw.pos.x,
|
|
@@ -249,21 +259,21 @@ export default function Line(_ref) {
|
|
|
249
259
|
}
|
|
250
260
|
} else {
|
|
251
261
|
if (y1 - y2 > 0) {
|
|
252
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
253
|
-
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", {
|
|
254
264
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
255
265
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
256
266
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
257
267
|
y2: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
258
268
|
style: STYLE
|
|
259
|
-
}), /*#__PURE__*/
|
|
269
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
260
270
|
key: 5,
|
|
261
271
|
layer: layer,
|
|
262
272
|
unit: scene.unit,
|
|
263
273
|
rulerUnit: scene.rulerUnit,
|
|
264
274
|
length: pAw.length,
|
|
265
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)")
|
|
266
|
-
}), /*#__PURE__*/
|
|
276
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
267
277
|
x1: pAw.pos.x,
|
|
268
278
|
y1: pAw.pos.y,
|
|
269
279
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -271,20 +281,20 @@ export default function Line(_ref) {
|
|
|
271
281
|
style: STYLE
|
|
272
282
|
}));
|
|
273
283
|
} else {
|
|
274
|
-
return /*#__PURE__*/
|
|
284
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
275
285
|
x1: pAw.pos.x,
|
|
276
286
|
y1: pAw.pos.y,
|
|
277
287
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
278
288
|
y2: pAw.pos.y + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
279
289
|
style: STYLE
|
|
280
|
-
}), /*#__PURE__*/
|
|
290
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
281
291
|
key: 5,
|
|
282
292
|
layer: layer,
|
|
283
293
|
unit: scene.unit,
|
|
284
294
|
rulerUnit: scene.rulerUnit,
|
|
285
295
|
length: pAw.length,
|
|
286
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)")
|
|
287
|
-
}), /*#__PURE__*/
|
|
297
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
288
298
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
289
299
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
290
300
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -293,21 +303,21 @@ export default function Line(_ref) {
|
|
|
293
303
|
}));
|
|
294
304
|
}
|
|
295
305
|
} else {
|
|
296
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
297
|
-
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", {
|
|
298
308
|
x1: pAw.pos.x,
|
|
299
309
|
y1: pAw.pos.y,
|
|
300
310
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
301
311
|
y2: pAw.pos.y + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
302
312
|
style: STYLE
|
|
303
|
-
}), /*#__PURE__*/
|
|
313
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
304
314
|
key: 5,
|
|
305
315
|
layer: layer,
|
|
306
316
|
unit: scene.unit,
|
|
307
317
|
rulerUnit: scene.rulerUnit,
|
|
308
318
|
length: pAw.length,
|
|
309
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)")
|
|
310
|
-
}), /*#__PURE__*/
|
|
320
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
311
321
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
312
322
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
313
323
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -315,20 +325,20 @@ export default function Line(_ref) {
|
|
|
315
325
|
style: STYLE
|
|
316
326
|
}));
|
|
317
327
|
} else {
|
|
318
|
-
return /*#__PURE__*/
|
|
328
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
319
329
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
320
330
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
321
331
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
322
332
|
y2: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + baseSpace) * Math.cos(angle / 180 * Math.PI),
|
|
323
333
|
style: STYLE
|
|
324
|
-
}), /*#__PURE__*/
|
|
334
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
325
335
|
key: 5,
|
|
326
336
|
layer: layer,
|
|
327
337
|
unit: scene.unit,
|
|
328
338
|
rulerUnit: scene.rulerUnit,
|
|
329
339
|
length: pAw.length,
|
|
330
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)")
|
|
331
|
-
}), /*#__PURE__*/
|
|
341
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
332
342
|
x1: pAw.pos.x,
|
|
333
343
|
y1: pAw.pos.y,
|
|
334
344
|
x2: pAw.pos.x - (thickness / 2 + baseSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -348,7 +358,7 @@ export default function Line(_ref) {
|
|
|
348
358
|
}
|
|
349
359
|
var startAt = length * hole.offset;
|
|
350
360
|
var renderedHole = catalog.getElement(hole.type).render2D(hole, layer, scene);
|
|
351
|
-
return /*#__PURE__*/
|
|
361
|
+
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
352
362
|
key: holeID,
|
|
353
363
|
transform: "translate(".concat(startAt, ", 3.5)"),
|
|
354
364
|
"data-element-root": true,
|
|
@@ -385,7 +395,7 @@ export default function Line(_ref) {
|
|
|
385
395
|
|
|
386
396
|
// wall cabinet
|
|
387
397
|
var wallSpace = doorSpace + 20;
|
|
388
|
-
var wall_item = GeometryUtils.getAllItemSpecified(scene, catalog, WALL_CABINET_LAYOUTPOS);
|
|
398
|
+
var wall_item = _export.GeometryUtils.getAllItemSpecified(scene, catalog, _constants.WALL_CABINET_LAYOUTPOS);
|
|
389
399
|
var wallRuler = [];
|
|
390
400
|
var wall_posArray = [];
|
|
391
401
|
if (wall_item.cur) {
|
|
@@ -402,7 +412,7 @@ export default function Line(_ref) {
|
|
|
402
412
|
wall_posArray.push(l2);
|
|
403
413
|
wall_posArray.push(l3);
|
|
404
414
|
var wall_posAndwidth = [];
|
|
405
|
-
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)) {
|
|
406
416
|
wall_posArray.sort(function (a, b) {
|
|
407
417
|
return a.x - b.x;
|
|
408
418
|
});
|
|
@@ -434,22 +444,22 @@ export default function Line(_ref) {
|
|
|
434
444
|
}
|
|
435
445
|
wallRuler = wall_posAndwidth.map(function (pAw) {
|
|
436
446
|
if (pAw.length > 1) {
|
|
437
|
-
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)) {
|
|
438
448
|
if (x1 - x2 > 0) {
|
|
439
|
-
return /*#__PURE__*/
|
|
449
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
440
450
|
x1: pAw.pos.x + pAw.length,
|
|
441
451
|
y1: pAw.pos.y,
|
|
442
452
|
x2: pAw.pos.x + pAw.length,
|
|
443
453
|
y2: pAw.pos.y - thickness / 2 - wallSpace,
|
|
444
454
|
style: STYLE
|
|
445
|
-
}), /*#__PURE__*/
|
|
455
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
446
456
|
key: 4,
|
|
447
457
|
layer: layer,
|
|
448
458
|
unit: scene.unit,
|
|
449
459
|
rulerUnit: scene.rulerUnit,
|
|
450
460
|
length: pAw.length,
|
|
451
461
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y - thickness / 2 - wallSpace, " ) rotate(").concat(angle + 180, ", 0, 0)")
|
|
452
|
-
}), /*#__PURE__*/
|
|
462
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
453
463
|
x1: pAw.pos.x,
|
|
454
464
|
y1: pAw.pos.y,
|
|
455
465
|
x2: pAw.pos.x,
|
|
@@ -457,20 +467,20 @@ export default function Line(_ref) {
|
|
|
457
467
|
style: STYLE
|
|
458
468
|
}));
|
|
459
469
|
} else {
|
|
460
|
-
return /*#__PURE__*/
|
|
470
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
461
471
|
x1: pAw.pos.x + pAw.length,
|
|
462
472
|
y1: pAw.pos.y,
|
|
463
473
|
x2: pAw.pos.x + pAw.length,
|
|
464
474
|
y2: pAw.pos.y + thickness / 2 + wallSpace,
|
|
465
475
|
style: STYLE
|
|
466
|
-
}), /*#__PURE__*/
|
|
476
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
467
477
|
key: 4,
|
|
468
478
|
layer: layer,
|
|
469
479
|
unit: scene.unit,
|
|
470
480
|
rulerUnit: scene.rulerUnit,
|
|
471
481
|
length: pAw.length,
|
|
472
482
|
transform: "translate(".concat(pAw.pos.x, ", ").concat(pAw.pos.y + thickness / 2 + wallSpace, " ) rotate(").concat(angle, ", 0, 0)")
|
|
473
|
-
}), /*#__PURE__*/
|
|
483
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
474
484
|
x1: pAw.pos.x,
|
|
475
485
|
y1: pAw.pos.y,
|
|
476
486
|
x2: pAw.pos.x,
|
|
@@ -480,21 +490,21 @@ export default function Line(_ref) {
|
|
|
480
490
|
}
|
|
481
491
|
} else {
|
|
482
492
|
if (y1 - y2 > 0) {
|
|
483
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
484
|
-
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", {
|
|
485
495
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
486
496
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
487
497
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
488
498
|
y2: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
489
499
|
style: STYLE
|
|
490
|
-
}), /*#__PURE__*/
|
|
500
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
491
501
|
key: 5,
|
|
492
502
|
layer: layer,
|
|
493
503
|
unit: scene.unit,
|
|
494
504
|
rulerUnit: scene.rulerUnit,
|
|
495
505
|
length: pAw.length,
|
|
496
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)")
|
|
497
|
-
}), /*#__PURE__*/
|
|
507
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
498
508
|
x1: pAw.pos.x,
|
|
499
509
|
y1: pAw.pos.y,
|
|
500
510
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -502,20 +512,20 @@ export default function Line(_ref) {
|
|
|
502
512
|
style: STYLE
|
|
503
513
|
}));
|
|
504
514
|
} else {
|
|
505
|
-
return /*#__PURE__*/
|
|
515
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
506
516
|
x1: pAw.pos.x,
|
|
507
517
|
y1: pAw.pos.y,
|
|
508
518
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
509
519
|
y2: pAw.pos.y + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
510
520
|
style: STYLE
|
|
511
|
-
}), /*#__PURE__*/
|
|
521
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
512
522
|
key: 5,
|
|
513
523
|
layer: layer,
|
|
514
524
|
unit: scene.unit,
|
|
515
525
|
rulerUnit: scene.rulerUnit,
|
|
516
526
|
length: pAw.length,
|
|
517
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)")
|
|
518
|
-
}), /*#__PURE__*/
|
|
528
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
519
529
|
x1: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
520
530
|
y1: pAw.pos.y - pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
521
531
|
x2: pAw.pos.x - pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -524,21 +534,21 @@ export default function Line(_ref) {
|
|
|
524
534
|
}));
|
|
525
535
|
}
|
|
526
536
|
} else {
|
|
527
|
-
if (x1 - x2 < 0 || GeometryUtils.almostEqual(x1, x2)) {
|
|
528
|
-
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", {
|
|
529
539
|
x1: pAw.pos.x,
|
|
530
540
|
y1: pAw.pos.y,
|
|
531
541
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
532
542
|
y2: pAw.pos.y + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
533
543
|
style: STYLE
|
|
534
|
-
}), /*#__PURE__*/
|
|
544
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
535
545
|
key: 5,
|
|
536
546
|
layer: layer,
|
|
537
547
|
unit: scene.unit,
|
|
538
548
|
rulerUnit: scene.rulerUnit,
|
|
539
549
|
length: pAw.length,
|
|
540
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)")
|
|
541
|
-
}), /*#__PURE__*/
|
|
551
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
542
552
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
543
553
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
544
554
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -546,20 +556,20 @@ export default function Line(_ref) {
|
|
|
546
556
|
style: STYLE
|
|
547
557
|
}));
|
|
548
558
|
} else {
|
|
549
|
-
return /*#__PURE__*/
|
|
559
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
550
560
|
x1: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI),
|
|
551
561
|
y1: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI),
|
|
552
562
|
x2: pAw.pos.x + pAw.length * Math.cos(angle / 180 * Math.PI) - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
553
563
|
y2: pAw.pos.y + pAw.length * Math.sin(angle / 180 * Math.PI) + (thickness / 2 + wallSpace) * Math.cos(angle / 180 * Math.PI),
|
|
554
564
|
style: STYLE
|
|
555
|
-
}), /*#__PURE__*/
|
|
565
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
556
566
|
key: 5,
|
|
557
567
|
layer: layer,
|
|
558
568
|
unit: scene.unit,
|
|
559
569
|
rulerUnit: scene.rulerUnit,
|
|
560
570
|
length: pAw.length,
|
|
561
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)")
|
|
562
|
-
}), /*#__PURE__*/
|
|
572
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
563
573
|
x1: pAw.pos.x,
|
|
564
574
|
y1: pAw.pos.y,
|
|
565
575
|
x2: pAw.pos.x - (thickness / 2 + wallSpace) * Math.sin(angle / 180 * Math.PI),
|
|
@@ -577,20 +587,20 @@ export default function Line(_ref) {
|
|
|
577
587
|
//the space from the dimensioning line to the bottom
|
|
578
588
|
var lineSpacedimension2 = 15;
|
|
579
589
|
if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
580
|
-
renderedRuler.push(/*#__PURE__*/
|
|
590
|
+
renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
581
591
|
x1: length,
|
|
582
592
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
583
593
|
x2: length,
|
|
584
594
|
y2: half_thickness + lineSpacedimension2,
|
|
585
595
|
style: STYLE
|
|
586
|
-
}), /*#__PURE__*/
|
|
596
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
587
597
|
key: 0,
|
|
588
598
|
layer: layer,
|
|
589
599
|
unit: scene.unit,
|
|
590
600
|
rulerUnit: scene.rulerUnit,
|
|
591
601
|
length: length,
|
|
592
602
|
transform: "translate(".concat(length, ", ").concat(half_thickness + lineSpace, ") scale(-1, -1)")
|
|
593
|
-
}), /*#__PURE__*/
|
|
603
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
594
604
|
x1: 0,
|
|
595
605
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
596
606
|
x2: 0,
|
|
@@ -598,20 +608,20 @@ export default function Line(_ref) {
|
|
|
598
608
|
style: STYLE
|
|
599
609
|
})));
|
|
600
610
|
} else {
|
|
601
|
-
renderedRuler.push(/*#__PURE__*/
|
|
611
|
+
renderedRuler.push(/*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("line", {
|
|
602
612
|
x1: 0,
|
|
603
613
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
604
614
|
x2: 0,
|
|
605
615
|
y2: half_thickness + lineSpacedimension2,
|
|
606
616
|
style: STYLE
|
|
607
|
-
}), /*#__PURE__*/
|
|
617
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
608
618
|
key: 0,
|
|
609
619
|
layer: layer,
|
|
610
620
|
unit: scene.unit,
|
|
611
621
|
rulerUnit: scene.rulerUnit,
|
|
612
622
|
length: length,
|
|
613
623
|
transform: "translate(0, ".concat(half_thickness + lineSpace, ")")
|
|
614
|
-
}), /*#__PURE__*/
|
|
624
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
615
625
|
x1: length,
|
|
616
626
|
y1: half_thickness + lineSpace + lineSpacedimension1,
|
|
617
627
|
x2: length,
|
|
@@ -645,22 +655,22 @@ export default function Line(_ref) {
|
|
|
645
655
|
dataProtoType = 'rulerHole';
|
|
646
656
|
}
|
|
647
657
|
if (compareVertices(vertex0, vertex1) >= 0 && vertex0.x !== vertex1.x) {
|
|
648
|
-
renderedAllRuler.push(/*#__PURE__*/
|
|
658
|
+
renderedAllRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
|
|
649
659
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
|
|
650
|
-
}, /*#__PURE__*/
|
|
660
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
651
661
|
x1: allRuler[index],
|
|
652
662
|
y1: half_thickness,
|
|
653
663
|
x2: allRuler[index],
|
|
654
664
|
y2: half_thickness + doorSpace,
|
|
655
665
|
style: STYLE
|
|
656
|
-
}), /*#__PURE__*/
|
|
666
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
657
667
|
key: "allRuler_".concat(index),
|
|
658
668
|
layer: layer,
|
|
659
669
|
unit: scene.unit,
|
|
660
670
|
rulerUnit: scene.rulerUnit,
|
|
661
671
|
length: element,
|
|
662
672
|
transform: "translate(".concat(allRuler[index] + element, ", ").concat(half_thickness + doorSpace, " ) scale(-1, -1)")
|
|
663
|
-
}), /*#__PURE__*/
|
|
673
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
664
674
|
x1: allRuler[index] + element,
|
|
665
675
|
y1: half_thickness,
|
|
666
676
|
x2: allRuler[index] + element,
|
|
@@ -668,22 +678,22 @@ export default function Line(_ref) {
|
|
|
668
678
|
style: STYLE
|
|
669
679
|
})));
|
|
670
680
|
} else {
|
|
671
|
-
renderedAllRuler.push(/*#__PURE__*/
|
|
681
|
+
renderedAllRuler.push(/*#__PURE__*/_react["default"].createElement("g", {
|
|
672
682
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
|
|
673
|
-
}, /*#__PURE__*/
|
|
683
|
+
}, /*#__PURE__*/_react["default"].createElement("line", {
|
|
674
684
|
x1: allRuler[index],
|
|
675
685
|
y1: half_thickness,
|
|
676
686
|
x2: allRuler[index],
|
|
677
687
|
y2: half_thickness + doorSpace,
|
|
678
688
|
style: STYLE
|
|
679
|
-
}), /*#__PURE__*/
|
|
689
|
+
}), /*#__PURE__*/_react["default"].createElement(_ruler["default"], {
|
|
680
690
|
key: "allRuler_".concat(index),
|
|
681
691
|
layer: layer,
|
|
682
692
|
unit: scene.unit,
|
|
683
693
|
rulerUnit: scene.rulerUnit,
|
|
684
694
|
length: element,
|
|
685
695
|
transform: "translate(".concat(allRuler[index], ", ").concat(half_thickness + doorSpace, " )")
|
|
686
|
-
}), /*#__PURE__*/
|
|
696
|
+
}), /*#__PURE__*/_react["default"].createElement("line", {
|
|
687
697
|
x1: allRuler[index] + element,
|
|
688
698
|
y1: half_thickness,
|
|
689
699
|
x2: allRuler[index] + element,
|
|
@@ -694,7 +704,7 @@ export default function Line(_ref) {
|
|
|
694
704
|
}
|
|
695
705
|
});
|
|
696
706
|
}
|
|
697
|
-
return /*#__PURE__*/
|
|
707
|
+
return /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("g", {
|
|
698
708
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)"),
|
|
699
709
|
"data-element-root": true,
|
|
700
710
|
"data-prototype": 'ruler',
|
|
@@ -757,13 +767,13 @@ export default function Line(_ref) {
|
|
|
757
767
|
pos2 = pos1.clone().rotateAround(cen2, t * angle * Math.PI / 180);
|
|
758
768
|
|
|
759
769
|
// Angle SVG Path
|
|
760
|
-
lines.push(/*#__PURE__*/
|
|
770
|
+
lines.push(/*#__PURE__*/_react["default"].createElement("path", {
|
|
761
771
|
style: STYLE_ANGLE,
|
|
762
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 ")
|
|
763
773
|
}));
|
|
764
774
|
var length = angle;
|
|
765
775
|
// draw angle and angle text
|
|
766
|
-
return /*#__PURE__*/
|
|
776
|
+
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
767
777
|
key: index,
|
|
768
778
|
transform: "translate(".concat(tx, ", ").concat(ty, ")"),
|
|
769
779
|
"data-element-root": true,
|
|
@@ -772,17 +782,17 @@ export default function Line(_ref) {
|
|
|
772
782
|
"data-selected": "true",
|
|
773
783
|
"data-id": [vertex[0].id, vertex[1].id, rotDir],
|
|
774
784
|
"data-length": length
|
|
775
|
-
}, lines, /*#__PURE__*/
|
|
785
|
+
}, lines, /*#__PURE__*/_react["default"].createElement("text", {
|
|
776
786
|
transform: "translate(".concat(angleTextO.x, ", ").concat(angleTextO.y, ") scale(1.5, -1.5)"),
|
|
777
787
|
style: STYLE_TEXT
|
|
778
|
-
}, angle), /*#__PURE__*/
|
|
788
|
+
}, angle), /*#__PURE__*/_react["default"].createElement("circle", {
|
|
779
789
|
transform: "translate(".concat(angleTextO.x, ", ").concat(angleTextO.y, ") translate(10, 9)"),
|
|
780
790
|
fill: "transparent",
|
|
781
791
|
stroke: "rgb(77, 77, 77)",
|
|
782
792
|
strokeWidth: 1,
|
|
783
793
|
r: 2
|
|
784
794
|
}));
|
|
785
|
-
}), 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", {
|
|
786
796
|
"data-element-root": true,
|
|
787
797
|
"data-prototype": line.prototype,
|
|
788
798
|
"data-id": line.id,
|
|
@@ -792,22 +802,22 @@ export default function Line(_ref) {
|
|
|
792
802
|
style: line.selected ? {
|
|
793
803
|
cursor: 'move'
|
|
794
804
|
} : {}
|
|
795
|
-
}, renderedLine, /*#__PURE__*/
|
|
805
|
+
}, renderedLine, /*#__PURE__*/_react["default"].createElement("g", {
|
|
796
806
|
transform: "translate(".concat(x1, ", ").concat(y1, ") rotate(").concat(angle, ", 0, 0)")
|
|
797
|
-
}, renderedHoles)), line.selected && /*#__PURE__*/
|
|
807
|
+
}, renderedHoles)), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
|
|
798
808
|
id: 'elevation-button',
|
|
799
809
|
key: 1,
|
|
800
810
|
transform: "translate(".concat(x1 + 35, ", ").concat(y1 - 15, ")"),
|
|
801
811
|
style: {
|
|
802
812
|
cursor: 'pointer'
|
|
803
813
|
}
|
|
804
|
-
}, /*#__PURE__*/
|
|
814
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("filter", {
|
|
805
815
|
id: "shadow"
|
|
806
|
-
}, /*#__PURE__*/
|
|
816
|
+
}, /*#__PURE__*/_react["default"].createElement("feDropShadow", {
|
|
807
817
|
dx: "0",
|
|
808
818
|
dy: "0",
|
|
809
819
|
stdDeviation: "0.6"
|
|
810
|
-
}))), /*#__PURE__*/
|
|
820
|
+
}))), /*#__PURE__*/_react["default"].createElement("rect", {
|
|
811
821
|
rx: "4",
|
|
812
822
|
ry: "4",
|
|
813
823
|
y: "20",
|
|
@@ -815,7 +825,7 @@ export default function Line(_ref) {
|
|
|
815
825
|
width: "22",
|
|
816
826
|
fill: "white",
|
|
817
827
|
filter: "url(#shadow)"
|
|
818
|
-
}), /*#__PURE__*/
|
|
828
|
+
}), /*#__PURE__*/_react["default"].createElement("image", {
|
|
819
829
|
href: "/assets/img/svg/bottombar/elevation.svg",
|
|
820
830
|
x: "5",
|
|
821
831
|
y: "-36",
|
|
@@ -824,20 +834,20 @@ export default function Line(_ref) {
|
|
|
824
834
|
style: {
|
|
825
835
|
transform: 'rotateX(180deg)'
|
|
826
836
|
}
|
|
827
|
-
})), line.selected && /*#__PURE__*/
|
|
837
|
+
})), line.selected && /*#__PURE__*/_react["default"].createElement("g", {
|
|
828
838
|
id: 'remove-button',
|
|
829
839
|
key: 2,
|
|
830
840
|
transform: "translate(".concat(x1 + 10, ", ").concat(y1, ")"),
|
|
831
841
|
style: {
|
|
832
842
|
cursor: 'pointer'
|
|
833
843
|
}
|
|
834
|
-
}, /*#__PURE__*/
|
|
844
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("filter", {
|
|
835
845
|
id: "shadow"
|
|
836
|
-
}, /*#__PURE__*/
|
|
846
|
+
}, /*#__PURE__*/_react["default"].createElement("feDropShadow", {
|
|
837
847
|
dx: "0",
|
|
838
848
|
dy: "0",
|
|
839
849
|
stdDeviation: "0.6"
|
|
840
|
-
}))), /*#__PURE__*/
|
|
850
|
+
}))), /*#__PURE__*/_react["default"].createElement("rect", {
|
|
841
851
|
rx: "4",
|
|
842
852
|
ry: "4",
|
|
843
853
|
y: "5",
|
|
@@ -845,7 +855,7 @@ export default function Line(_ref) {
|
|
|
845
855
|
width: "22",
|
|
846
856
|
fill: "white",
|
|
847
857
|
filter: "url(#shadow)"
|
|
848
|
-
}), /*#__PURE__*/
|
|
858
|
+
}), /*#__PURE__*/_react["default"].createElement("image", {
|
|
849
859
|
href: "/assets/img/svg/delete.svg",
|
|
850
860
|
x: "3",
|
|
851
861
|
y: "-24",
|
|
@@ -854,7 +864,7 @@ export default function Line(_ref) {
|
|
|
854
864
|
style: {
|
|
855
865
|
transform: 'rotateX(180deg)'
|
|
856
866
|
}
|
|
857
|
-
})), /*#__PURE__*/
|
|
867
|
+
})), /*#__PURE__*/_react["default"].createElement("use", {
|
|
858
868
|
id: 'use elevation button',
|
|
859
869
|
xlinkHref: '#elevation-button',
|
|
860
870
|
"data-element-root": true,
|
|
@@ -863,7 +873,7 @@ export default function Line(_ref) {
|
|
|
863
873
|
"data-selected": line.selected,
|
|
864
874
|
"data-layer": layer.id,
|
|
865
875
|
"data-part": "elevation"
|
|
866
|
-
}), /*#__PURE__*/
|
|
876
|
+
}), /*#__PURE__*/_react["default"].createElement("use", {
|
|
867
877
|
id: 'use remove button',
|
|
868
878
|
xlinkHref: '#remove-button',
|
|
869
879
|
"data-element-root": true,
|
|
@@ -875,8 +885,8 @@ export default function Line(_ref) {
|
|
|
875
885
|
}));
|
|
876
886
|
}
|
|
877
887
|
Line.propTypes = {
|
|
878
|
-
line:
|
|
879
|
-
layer:
|
|
880
|
-
scene:
|
|
881
|
-
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
|
|
882
892
|
};
|