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