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