kitchen-simulator 1.1.1-test.62 → 1.1.1-test.64
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 +7 -15
- 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/@history.js +2 -1
- package/lib/AppContext.js +2 -1
- package/lib/KitchenConfigurator.js +2 -1
- package/lib/KitchenConfiguratorApp.js +2 -1
- package/lib/catalog/areas/area/planner-element.js +2 -1
- package/lib/catalog/catalog.js +2 -1
- package/lib/catalog/factories/area-factory.js +2 -1
- package/lib/catalog/factories/wall-factory.js +2 -1
- package/lib/catalog/holes/door-closet/planner-element.js +2 -1
- package/lib/catalog/holes/door-double/planner-element.js +2 -1
- package/lib/catalog/holes/door-exterior/planner-element.js +2 -1
- package/lib/catalog/holes/door-interior/planner-element.js +2 -1
- package/lib/catalog/holes/door-panic/planner-element.js +2 -1
- package/lib/catalog/holes/door-panic-double/planner-element.js +2 -1
- package/lib/catalog/holes/door-sliding/planner-element.js +2 -1
- package/lib/catalog/holes/doorway-framed/planner-element.js +2 -1
- package/lib/catalog/holes/doorway-frameless/planner-element.js +2 -1
- package/lib/catalog/holes/window-clear/planner-element.js +2 -1
- package/lib/catalog/holes/window-cross/planner-element.js +2 -1
- package/lib/catalog/holes/window-double-hung/planner-element.js +2 -1
- package/lib/catalog/holes/window-vertical/planner-element.js +2 -1
- package/lib/catalog/lines/wall/planner-element.js +2 -1
- package/lib/catalog/molding/molding-dcm/planner-element.js +2 -1
- package/lib/catalog/molding/molding-fbm/planner-element.js +2 -1
- package/lib/catalog/molding/molding-lrm/planner-element.js +2 -1
- package/lib/catalog/properties/property-checkbox.js +2 -1
- package/lib/catalog/properties/property-color.js +2 -1
- package/lib/catalog/properties/property-enum.js +2 -1
- package/lib/catalog/properties/property-hidden.js +2 -1
- package/lib/catalog/properties/property-lenght-measure.js +2 -1
- package/lib/catalog/properties/property-length-measure.js +2 -1
- package/lib/catalog/properties/property-length-measure_hole.js +2 -1
- package/lib/catalog/properties/property-number.js +2 -1
- package/lib/catalog/properties/property-read-only.js +2 -1
- package/lib/catalog/properties/property-string.js +2 -1
- package/lib/catalog/properties/property-toggle.js +2 -1
- package/lib/catalog/properties/shared-property-style.js +2 -1
- package/lib/catalog/utils/FuseUtils.js +2 -1
- package/lib/catalog/utils/exporter.js +2 -1
- package/lib/class/FuseUtils.js +2 -1
- package/lib/class/area.js +2 -1
- package/lib/class/group.js +2 -1
- package/lib/class/hole.js +2 -1
- package/lib/class/item.js +2 -1
- package/lib/class/layer.js +2 -1
- package/lib/class/line.js +2 -1
- package/lib/class/project.js +2 -1
- package/lib/class/vertex.js +2 -1
- package/lib/components/content.js +2 -1
- package/lib/components/disclaimer/disclaimer.js +2 -1
- package/lib/components/style/button.js +2 -1
- package/lib/components/style/cancel-button.js +2 -1
- package/lib/components/style/content-container.js +2 -1
- package/lib/components/style/content-title.js +2 -1
- package/lib/components/style/delete-button.js +2 -1
- package/lib/components/style/form-block.js +2 -1
- package/lib/components/style/form-color-input.js +2 -1
- package/lib/components/style/form-label.js +2 -1
- package/lib/components/style/form-number-input.js +2 -1
- package/lib/components/style/form-number-input_2.js +2 -1
- package/lib/components/style/form-select.js +2 -1
- package/lib/components/style/form-slider.js +2 -1
- package/lib/components/style/form-submit-button.js +2 -1
- package/lib/components/style/form-text-input.js +2 -1
- package/lib/components/viewer2d/area.js +2 -1
- package/lib/components/viewer2d/grids/grid-horizontal-streak.js +2 -1
- package/lib/components/viewer2d/grids/grid-streak.js +2 -1
- package/lib/components/viewer2d/grids/grid-vertical-streak.js +2 -1
- package/lib/components/viewer2d/grids/grids.js +2 -1
- package/lib/components/viewer2d/group.js +2 -1
- package/lib/components/viewer2d/item.js +2 -1
- package/lib/components/viewer2d/layer.js +2 -1
- package/lib/components/viewer2d/ruler.js +2 -1
- package/lib/components/viewer2d/rulerDist.js +2 -1
- package/lib/components/viewer2d/rulerX.js +2 -1
- package/lib/components/viewer2d/rulerY.js +2 -1
- package/lib/components/viewer2d/scene.js +2 -1
- package/lib/components/viewer2d/snap.js +2 -1
- package/lib/components/viewer2d/state.js +2 -1
- package/lib/components/viewer2d/vertex.js +2 -1
- package/lib/components/viewer2d/viewer2d.js +2 -1
- package/lib/components/viewer3d/dcm.js +2 -1
- package/lib/components/viewer3d/fbm.js +2 -1
- package/lib/components/viewer3d/front3D.js +2 -1
- package/lib/components/viewer3d/grid-creator.js +2 -1
- package/lib/components/viewer3d/grids/grid-horizontal-streak.js +2 -1
- package/lib/components/viewer3d/grids/grid-streak.js +2 -1
- package/lib/components/viewer3d/grids/grid-vertical-streak.js +2 -1
- package/lib/components/viewer3d/libs/mtl-loader.js +2 -1
- package/lib/components/viewer3d/libs/obj-loader.js +2 -1
- package/lib/components/viewer3d/lrm.js +2 -1
- package/lib/components/viewer3d/ruler-utils/itemRect.js +2 -1
- package/lib/components/viewer3d/ruler-utils/layer3D.js +2 -1
- package/lib/components/viewer3d/ruler-utils/ruler3D.js +2 -1
- package/lib/components/viewer3d/ruler-utils/state3D.js +2 -1
- package/lib/components/viewer3d/viewer3d-first-person.js +2 -1
- package/lib/components/viewer3d/viewer3d.js +2 -1
- package/lib/plugins/autosave.js +2 -1
- package/lib/plugins/console-debugger.js +2 -1
- package/lib/plugins/keyboard.js +2 -1
- package/lib/reducers/areas-reducer.js +2 -1
- package/lib/reducers/groups-reducer.js +2 -1
- package/lib/reducers/holes-reducer.js +2 -1
- package/lib/reducers/items-reducer.js +2 -1
- package/lib/reducers/lines-reducer.js +2 -1
- package/lib/reducers/project-reducer.js +2 -1
- package/lib/reducers/scene-reducer.js +2 -1
- package/lib/reducers/user-reducer.js +2 -1
- package/lib/reducers/vertices-reducer.js +2 -1
- package/lib/reducers/viewer2d-reducer.js +2 -1
- package/lib/reducers/viewer3d-reducer.js +2 -1
- package/lib/translator/en.js +2 -1
- package/lib/translator/it.js +2 -1
- package/lib/translator/ru.js +2 -1
- package/lib/translator/translator.js +2 -1
- package/lib/utils/name-generator.js +2 -1
- package/lib/utils/react-if.js +2 -1
- package/lib/utils/threeCSG.es6.js +2 -1
- package/package.json +2 -1
|
@@ -1,18 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
var _ruler3D = _interopRequireDefault(require("./ruler3D"));
|
|
10
|
-
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
11
|
-
var _export = require("../../../utils/export");
|
|
12
|
-
var _utils = require("../../../components/viewer2d/utils");
|
|
13
|
-
var _constants = require("../../../constants");
|
|
14
|
-
var _math = require("../../../utils/math");
|
|
15
|
-
function Layer3D(_ref) {
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import Ruler3D from "./ruler3D";
|
|
3
|
+
import { convert } from "../../../utils/convert-units-lite";
|
|
4
|
+
import { GeometryUtils } from "../../../utils/export";
|
|
5
|
+
import { returnReplaceableDeepSearchType } from "../../../components/viewer2d/utils";
|
|
6
|
+
import { DECIMAL_PLACES_2, DELTA, DISTANCE_EPSILON } from "../../../constants";
|
|
7
|
+
import { formatNumber, isNonZeroText } from "../../../utils/math";
|
|
8
|
+
export default function Layer3D(_ref) {
|
|
16
9
|
var layer = _ref.layer,
|
|
17
10
|
frontRect = _ref.frontRect,
|
|
18
11
|
lineLength = _ref.lineLength,
|
|
@@ -72,8 +65,8 @@ function Layer3D(_ref) {
|
|
|
72
65
|
// determin if this line(vertex0, vertex1) is snapped into wall
|
|
73
66
|
var isSnapped = function isSnapped(vertex0, vertex1) {
|
|
74
67
|
var itemSnapped = false;
|
|
75
|
-
var delta =
|
|
76
|
-
if (delta <
|
|
68
|
+
var delta = GeometryUtils.distancePointFromLineSegment(l0, l1, (vertex0.x + vertex1.x) / 2, (vertex0.y + vertex1.y) / 2);
|
|
69
|
+
if (delta < DISTANCE_EPSILON) {
|
|
77
70
|
itemSnapped = true;
|
|
78
71
|
}
|
|
79
72
|
return itemSnapped;
|
|
@@ -90,11 +83,11 @@ function Layer3D(_ref) {
|
|
|
90
83
|
};
|
|
91
84
|
var catid = item.type;
|
|
92
85
|
var cat = catalog.elements[catid];
|
|
93
|
-
if (!cat) cat = catalog.elements[
|
|
94
|
-
var width =
|
|
95
|
-
var height =
|
|
96
|
-
var depth =
|
|
97
|
-
var altitude =
|
|
86
|
+
if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
|
|
87
|
+
var width = convert(item.properties.getIn(['width', '_length'])).from(item.properties.getIn(['width', '_unit'])).to(scene.unit);
|
|
88
|
+
var height = convert(item.properties.getIn(['height', '_length'])).from(item.properties.getIn(['height', '_unit'])).to(scene.unit);
|
|
89
|
+
var depth = convert(item.properties.getIn(['depth', '_length'])).from(item.properties.getIn(['depth', '_unit'])).to(scene.unit);
|
|
90
|
+
var altitude = convert(item.properties.getIn(['altitude', '_length'])).from(item.properties.getIn(['altitude', '_unit'])).to(scene.unit);
|
|
98
91
|
val.size = {
|
|
99
92
|
width: width,
|
|
100
93
|
height: height,
|
|
@@ -104,7 +97,7 @@ function Layer3D(_ref) {
|
|
|
104
97
|
val.layoutpos = cat && cat.info.layoutpos;
|
|
105
98
|
val.is_corner = cat && cat.info.is_corner;
|
|
106
99
|
val.item = item.toJS();
|
|
107
|
-
var calcrect =
|
|
100
|
+
var calcrect = GeometryUtils.getCalcRectFromItem3D(val);
|
|
108
101
|
if (isSnapped(calcrect.rect[3], calcrect.rect[2]) || isSnapped(calcrect.rect[2], calcrect.rect[1]) || isSnapped(calcrect.rect[0], calcrect.rect[3])) {
|
|
109
102
|
if (calcrect.itemInfo.properties.altitude.length) {
|
|
110
103
|
wallItems.push(calcrect);
|
|
@@ -128,29 +121,29 @@ function Layer3D(_ref) {
|
|
|
128
121
|
var vertex0, vertex1;
|
|
129
122
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
130
123
|
vertex0 = {
|
|
131
|
-
x: -frontRect.width / 2 +
|
|
124
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
132
125
|
y: height / 2
|
|
133
126
|
};
|
|
134
127
|
vertex1 = {
|
|
135
|
-
x: -frontRect.width / 2 +
|
|
128
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
136
129
|
y: height / 2
|
|
137
130
|
};
|
|
138
131
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
139
132
|
vertex0 = {
|
|
140
|
-
x: -frontRect.width / 2 +
|
|
133
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
141
134
|
y: height / 2
|
|
142
135
|
};
|
|
143
136
|
vertex1 = {
|
|
144
|
-
x: -frontRect.width / 2 +
|
|
137
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
145
138
|
y: height / 2
|
|
146
139
|
};
|
|
147
140
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
148
141
|
vertex0 = {
|
|
149
|
-
x: -frontRect.width / 2 +
|
|
142
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
150
143
|
y: height / 2
|
|
151
144
|
};
|
|
152
145
|
vertex1 = {
|
|
153
|
-
x: -frontRect.width / 2 +
|
|
146
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
154
147
|
y: height / 2
|
|
155
148
|
};
|
|
156
149
|
}
|
|
@@ -177,29 +170,29 @@ function Layer3D(_ref) {
|
|
|
177
170
|
var vertex0, vertex1;
|
|
178
171
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
179
172
|
vertex0 = {
|
|
180
|
-
x: -frontRect.width / 2 +
|
|
173
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
181
174
|
y: -height / 2
|
|
182
175
|
};
|
|
183
176
|
vertex1 = {
|
|
184
|
-
x: -frontRect.width / 2 +
|
|
177
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
185
178
|
y: -height / 2
|
|
186
179
|
};
|
|
187
180
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
188
181
|
vertex0 = {
|
|
189
|
-
x: -frontRect.width / 2 +
|
|
182
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[2], v0)).from('cm').to(layer.unit) * scale,
|
|
190
183
|
y: -height / 2
|
|
191
184
|
};
|
|
192
185
|
vertex1 = {
|
|
193
|
-
x: -frontRect.width / 2 +
|
|
186
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[1], v0)).from('cm').to(layer.unit) * scale,
|
|
194
187
|
y: -height / 2
|
|
195
188
|
};
|
|
196
189
|
} else if (isSnapped(item.rect[0], item.rect[3])) {
|
|
197
190
|
vertex0 = {
|
|
198
|
-
x: -frontRect.width / 2 +
|
|
191
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[0], v0)).from('cm').to(layer.unit) * scale,
|
|
199
192
|
y: -height / 2
|
|
200
193
|
};
|
|
201
194
|
vertex1 = {
|
|
202
|
-
x: -frontRect.width / 2 +
|
|
195
|
+
x: -frontRect.width / 2 + convert(getLength(item.rect[3], v0)).from('cm').to(layer.unit) * scale,
|
|
203
196
|
y: -height / 2
|
|
204
197
|
};
|
|
205
198
|
}
|
|
@@ -232,7 +225,7 @@ function Layer3D(_ref) {
|
|
|
232
225
|
leftItems.forEach(function (item, idx) {
|
|
233
226
|
var forwardItems = [];
|
|
234
227
|
var distLine = 0;
|
|
235
|
-
var itemHeight =
|
|
228
|
+
var itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
236
229
|
for (var i = 0; i < idx; i++) {
|
|
237
230
|
forwardItems.push(leftItems[i]);
|
|
238
231
|
}
|
|
@@ -241,12 +234,12 @@ function Layer3D(_ref) {
|
|
|
241
234
|
}).length) {
|
|
242
235
|
if (item.itemInfo.properties.altitude._length) {
|
|
243
236
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
244
|
-
distLine =
|
|
237
|
+
distLine = convert(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
245
238
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
246
|
-
distLine =
|
|
239
|
+
distLine = convert(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
247
240
|
}
|
|
248
|
-
var itemAltitude =
|
|
249
|
-
if (ceilHeight - (itemAltitude + itemHeight) >
|
|
241
|
+
var itemAltitude = convert(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
242
|
+
if (ceilHeight - (itemAltitude + itemHeight) > convert(DELTA).from(toler_unit).to(layer.unit)) {
|
|
250
243
|
rulerLines.push({
|
|
251
244
|
v0: {
|
|
252
245
|
x: width / 2,
|
|
@@ -256,7 +249,7 @@ function Layer3D(_ref) {
|
|
|
256
249
|
x: width / 2,
|
|
257
250
|
y: height / 2 - (itemHeight + itemAltitude) * scale
|
|
258
251
|
},
|
|
259
|
-
text:
|
|
252
|
+
text: formatNumber(ceilHeight - (itemAltitude + itemHeight), DECIMAL_PLACES_2),
|
|
260
253
|
space: rulerSpace + right_count * lineSpace
|
|
261
254
|
});
|
|
262
255
|
}
|
|
@@ -269,7 +262,7 @@ function Layer3D(_ref) {
|
|
|
269
262
|
x: width / 2 - distLine * scale,
|
|
270
263
|
y: height / 2 - itemAltitude * scale
|
|
271
264
|
},
|
|
272
|
-
text:
|
|
265
|
+
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
273
266
|
space: rulerSpace + distLine * scale + right_count * lineSpace
|
|
274
267
|
});
|
|
275
268
|
rulerLines.push({
|
|
@@ -281,15 +274,15 @@ function Layer3D(_ref) {
|
|
|
281
274
|
x: width / 2,
|
|
282
275
|
y: height / 2
|
|
283
276
|
},
|
|
284
|
-
text:
|
|
277
|
+
text: formatNumber(itemAltitude, DECIMAL_PLACES_2),
|
|
285
278
|
space: rulerSpace + right_count * lineSpace
|
|
286
279
|
});
|
|
287
280
|
right_count++;
|
|
288
281
|
} else {
|
|
289
282
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
290
|
-
distLine =
|
|
283
|
+
distLine = convert(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
291
284
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
292
|
-
distLine =
|
|
285
|
+
distLine = convert(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
293
286
|
}
|
|
294
287
|
rulerLines.push({
|
|
295
288
|
v0: {
|
|
@@ -300,7 +293,7 @@ function Layer3D(_ref) {
|
|
|
300
293
|
x: -width / 2 + distLine * scale,
|
|
301
294
|
y: height / 2 - itemHeight * scale
|
|
302
295
|
},
|
|
303
|
-
text:
|
|
296
|
+
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
304
297
|
space: rulerSpace + distLine * scale + left_count * lineSpace
|
|
305
298
|
});
|
|
306
299
|
rulerLines.push({
|
|
@@ -312,7 +305,7 @@ function Layer3D(_ref) {
|
|
|
312
305
|
x: -width / 2,
|
|
313
306
|
y: -height / 2
|
|
314
307
|
},
|
|
315
|
-
text:
|
|
308
|
+
text: formatNumber(ceilHeight - itemHeight, DECIMAL_PLACES_2),
|
|
316
309
|
space: rulerSpace + left_count * lineSpace
|
|
317
310
|
});
|
|
318
311
|
left_count++;
|
|
@@ -324,7 +317,7 @@ function Layer3D(_ref) {
|
|
|
324
317
|
rightItems.forEach(function (item, idx) {
|
|
325
318
|
var forwardItems = [];
|
|
326
319
|
var distLine = 0;
|
|
327
|
-
var itemHeight =
|
|
320
|
+
var itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
328
321
|
for (var i = 0; i < idx; i++) {
|
|
329
322
|
forwardItems.push(rightItems[i]);
|
|
330
323
|
}
|
|
@@ -333,12 +326,12 @@ function Layer3D(_ref) {
|
|
|
333
326
|
}).length) {
|
|
334
327
|
if (item.itemInfo.properties.altitude._length) {
|
|
335
328
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
336
|
-
distLine =
|
|
329
|
+
distLine = convert(getLength(item.rect[3], v0)).from(scene.unit).to(layer.unit);
|
|
337
330
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
338
|
-
distLine =
|
|
331
|
+
distLine = convert(getLength(item.rect[2], v0)).from(scene.unit).to(layer.unit);
|
|
339
332
|
}
|
|
340
|
-
var _itemHeight =
|
|
341
|
-
var itemAltitude =
|
|
333
|
+
var _itemHeight = convert(item.size.height).from(scene.unit).to(layer.unit);
|
|
334
|
+
var itemAltitude = convert(item.size.altitude).from(scene.unit).to(layer.unit);
|
|
342
335
|
rulerLines.push({
|
|
343
336
|
v0: {
|
|
344
337
|
x: -width / 2,
|
|
@@ -348,7 +341,7 @@ function Layer3D(_ref) {
|
|
|
348
341
|
x: -width / 2,
|
|
349
342
|
y: height / 2 - itemAltitude * scale
|
|
350
343
|
},
|
|
351
|
-
text:
|
|
344
|
+
text: formatNumber(itemAltitude, DECIMAL_PLACES_2),
|
|
352
345
|
space: rulerSpace + left_count * lineSpace
|
|
353
346
|
});
|
|
354
347
|
rulerLines.push({
|
|
@@ -360,10 +353,10 @@ function Layer3D(_ref) {
|
|
|
360
353
|
x: -width / 2 + distLine * scale,
|
|
361
354
|
y: height / 2 - (itemAltitude + _itemHeight) * scale
|
|
362
355
|
},
|
|
363
|
-
text:
|
|
356
|
+
text: formatNumber(_itemHeight, DECIMAL_PLACES_2),
|
|
364
357
|
space: rulerSpace + +distLine * scale + left_count * lineSpace
|
|
365
358
|
});
|
|
366
|
-
if (ceilHeight - (itemAltitude + _itemHeight) >
|
|
359
|
+
if (ceilHeight - (itemAltitude + _itemHeight) > convert(DELTA).from(toler_unit).to(layer.unit)) {
|
|
367
360
|
rulerLines.push({
|
|
368
361
|
v0: {
|
|
369
362
|
x: -width / 2,
|
|
@@ -373,16 +366,16 @@ function Layer3D(_ref) {
|
|
|
373
366
|
x: -width / 2,
|
|
374
367
|
y: -height / 2
|
|
375
368
|
},
|
|
376
|
-
text:
|
|
369
|
+
text: formatNumber(ceilHeight - (itemAltitude + _itemHeight), DECIMAL_PLACES_2),
|
|
377
370
|
space: rulerSpace + left_count * lineSpace
|
|
378
371
|
});
|
|
379
372
|
}
|
|
380
373
|
left_count++;
|
|
381
374
|
} else {
|
|
382
375
|
if (isSnapped(item.rect[3], item.rect[2])) {
|
|
383
|
-
distLine =
|
|
376
|
+
distLine = convert(getLength(item.rect[2], v1)).from(scene.unit).to(layer.unit);
|
|
384
377
|
} else if (isSnapped(item.rect[2], item.rect[1])) {
|
|
385
|
-
distLine =
|
|
378
|
+
distLine = convert(getLength(item.rect[1], v1)).from(scene.unit).to(layer.unit);
|
|
386
379
|
}
|
|
387
380
|
rulerLines.push({
|
|
388
381
|
v0: {
|
|
@@ -393,7 +386,7 @@ function Layer3D(_ref) {
|
|
|
393
386
|
x: width / 2,
|
|
394
387
|
y: height / 2 - itemHeight * scale
|
|
395
388
|
},
|
|
396
|
-
text:
|
|
389
|
+
text: formatNumber(ceilHeight - itemHeight, DECIMAL_PLACES_2),
|
|
397
390
|
space: rulerSpace + right_count * lineSpace
|
|
398
391
|
});
|
|
399
392
|
rulerLines.push({
|
|
@@ -405,7 +398,7 @@ function Layer3D(_ref) {
|
|
|
405
398
|
x: width / 2 - distLine * scale,
|
|
406
399
|
y: height / 2
|
|
407
400
|
},
|
|
408
|
-
text:
|
|
401
|
+
text: formatNumber(itemHeight, DECIMAL_PLACES_2),
|
|
409
402
|
space: rulerSpace + distLine * scale + right_count * lineSpace
|
|
410
403
|
});
|
|
411
404
|
right_count++;
|
|
@@ -447,7 +440,7 @@ function Layer3D(_ref) {
|
|
|
447
440
|
x: -width / 2,
|
|
448
441
|
y: height / 2
|
|
449
442
|
},
|
|
450
|
-
text:
|
|
443
|
+
text: formatNumber(lineLength, DECIMAL_PLACES_2),
|
|
451
444
|
space: rulerSpace + (baseItems.length ? lineSpace : 0)
|
|
452
445
|
});
|
|
453
446
|
rulerLines.push({
|
|
@@ -459,7 +452,7 @@ function Layer3D(_ref) {
|
|
|
459
452
|
x: width / 2,
|
|
460
453
|
y: -height / 2
|
|
461
454
|
},
|
|
462
|
-
text:
|
|
455
|
+
text: formatNumber(lineLength, DECIMAL_PLACES_2),
|
|
463
456
|
space: rulerSpace + (wallItems.length ? lineSpace : 0)
|
|
464
457
|
});
|
|
465
458
|
|
|
@@ -471,7 +464,7 @@ function Layer3D(_ref) {
|
|
|
471
464
|
v0: wallPosArray[i],
|
|
472
465
|
v1: wallPosArray[i + 1],
|
|
473
466
|
space: rulerSpace,
|
|
474
|
-
text:
|
|
467
|
+
text: formatNumber(dist, DECIMAL_PLACES_2)
|
|
475
468
|
});
|
|
476
469
|
}
|
|
477
470
|
}
|
|
@@ -484,19 +477,19 @@ function Layer3D(_ref) {
|
|
|
484
477
|
v0: basePosArray[j],
|
|
485
478
|
v1: basePosArray[j + 1],
|
|
486
479
|
space: rulerSpace,
|
|
487
|
-
text:
|
|
480
|
+
text: formatNumber(_dist, DECIMAL_PLACES_2)
|
|
488
481
|
});
|
|
489
482
|
}
|
|
490
483
|
}
|
|
491
484
|
rulerLines.forEach(function (line) {
|
|
492
|
-
if (
|
|
485
|
+
if (isNonZeroText(line.text)) rulerData.push(/*#__PURE__*/React.createElement(Ruler3D, {
|
|
493
486
|
line: line,
|
|
494
487
|
layer: layer,
|
|
495
488
|
viewScale: viewScale,
|
|
496
489
|
downloadFlag: downloadFlag
|
|
497
490
|
}));
|
|
498
491
|
});
|
|
499
|
-
return /*#__PURE__*/
|
|
492
|
+
return /*#__PURE__*/React.createElement("g", {
|
|
500
493
|
opacity: layer.opacity
|
|
501
494
|
}, rulerData);
|
|
502
495
|
}
|
|
@@ -1,23 +1,16 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
Object.defineProperty(exports, "__esModule", {
|
|
5
|
-
value: true
|
|
6
|
-
});
|
|
7
|
-
exports["default"] = Ruler3D;
|
|
8
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
9
|
-
var _react = _interopRequireDefault(require("react"));
|
|
10
|
-
var _constants = require("../../../constants");
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
11
2
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
12
|
-
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (
|
|
13
|
-
|
|
3
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
4
|
+
import React from 'react';
|
|
5
|
+
import { TEXT_COLOR_NEUTRAL_0, TEXT_COLOR_NEUTRAL_6 } from "../../../constants";
|
|
6
|
+
export default function Ruler3D(_ref) {
|
|
14
7
|
var layer = _ref.layer,
|
|
15
8
|
line = _ref.line,
|
|
16
9
|
viewScale = _ref.viewScale,
|
|
17
10
|
downloadFlag = _ref.downloadFlag;
|
|
18
11
|
var diagonalPointValue = 5 * viewScale;
|
|
19
12
|
var STYLE = {
|
|
20
|
-
stroke:
|
|
13
|
+
stroke: TEXT_COLOR_NEUTRAL_6,
|
|
21
14
|
strokeWidth: viewScale,
|
|
22
15
|
opacity: '0.6'
|
|
23
16
|
};
|
|
@@ -26,7 +19,7 @@ function Ruler3D(_ref) {
|
|
|
26
19
|
fontSize: downloadFlag ? 32 * viewScale : 16 * viewScale,
|
|
27
20
|
// fontWeight: "bold",
|
|
28
21
|
pointerEvents: 'none',
|
|
29
|
-
fill:
|
|
22
|
+
fill: TEXT_COLOR_NEUTRAL_6,
|
|
30
23
|
//http://stackoverflow.com/questions/826782/how-to-disable-text-selection-highlighting-using-css
|
|
31
24
|
WebkitTouchCallout: 'none' /* iOS Safari */,
|
|
32
25
|
WebkitUserSelect: 'none' /* Chrome/Safari/Opera */,
|
|
@@ -45,43 +38,43 @@ function Ruler3D(_ref) {
|
|
|
45
38
|
var textLength = (text.length + layer.unit.length) * 18 * viewScale;
|
|
46
39
|
if (v0.y === v1.y) {
|
|
47
40
|
if (v0.x < v1.x) {
|
|
48
|
-
return /*#__PURE__*/
|
|
41
|
+
return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
|
|
49
42
|
x1: v0.x,
|
|
50
43
|
y1: v0.y,
|
|
51
44
|
x2: v0.x,
|
|
52
45
|
y2: v0.y - space,
|
|
53
46
|
style: STYLE
|
|
54
|
-
}), /*#__PURE__*/
|
|
47
|
+
}), /*#__PURE__*/React.createElement("g", {
|
|
55
48
|
transform: "translate(".concat(v0.x, ", ").concat(v0.y - space, ")")
|
|
56
|
-
}, /*#__PURE__*/
|
|
49
|
+
}, /*#__PURE__*/React.createElement("line", {
|
|
57
50
|
x1: -diagonalPointValue,
|
|
58
51
|
y1: -diagonalPointValue,
|
|
59
52
|
x2: diagonalPointValue,
|
|
60
53
|
y2: diagonalPointValue,
|
|
61
54
|
style: STYLE
|
|
62
|
-
}), /*#__PURE__*/
|
|
55
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
63
56
|
x1: 0,
|
|
64
57
|
y1: 0,
|
|
65
58
|
x2: textLength > length ? 0 : (length - textLength) / 2,
|
|
66
59
|
y2: 0,
|
|
67
60
|
style: STYLE
|
|
68
|
-
}), /*#__PURE__*/
|
|
61
|
+
}), /*#__PURE__*/React.createElement("text", {
|
|
69
62
|
x: length / 2,
|
|
70
63
|
y: "3",
|
|
71
64
|
style: STYLE_TEXT
|
|
72
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
65
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/React.createElement("line", {
|
|
73
66
|
x1: length,
|
|
74
67
|
y1: 0,
|
|
75
68
|
x2: textLength > length ? length : (length + textLength) / 2,
|
|
76
69
|
y2: 0,
|
|
77
70
|
style: STYLE
|
|
78
|
-
}), /*#__PURE__*/
|
|
71
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
79
72
|
x1: length - diagonalPointValue,
|
|
80
73
|
y1: -diagonalPointValue,
|
|
81
74
|
x2: length + diagonalPointValue,
|
|
82
75
|
y2: diagonalPointValue,
|
|
83
76
|
style: STYLE
|
|
84
|
-
})), /*#__PURE__*/
|
|
77
|
+
})), /*#__PURE__*/React.createElement("line", {
|
|
85
78
|
x1: v1.x,
|
|
86
79
|
y1: v1.y,
|
|
87
80
|
x2: v1.x,
|
|
@@ -89,43 +82,43 @@ function Ruler3D(_ref) {
|
|
|
89
82
|
style: STYLE
|
|
90
83
|
}));
|
|
91
84
|
} else {
|
|
92
|
-
return /*#__PURE__*/
|
|
85
|
+
return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
|
|
93
86
|
x1: v0.x,
|
|
94
87
|
y1: v0.y,
|
|
95
88
|
x2: v0.x,
|
|
96
89
|
y2: v0.y + space,
|
|
97
90
|
style: STYLE
|
|
98
|
-
}), /*#__PURE__*/
|
|
91
|
+
}), /*#__PURE__*/React.createElement("g", {
|
|
99
92
|
transform: "translate(".concat(v0.x, ", ").concat(v0.y + space, ")")
|
|
100
|
-
}, /*#__PURE__*/
|
|
93
|
+
}, /*#__PURE__*/React.createElement("line", {
|
|
101
94
|
x1: -diagonalPointValue,
|
|
102
95
|
y1: -diagonalPointValue,
|
|
103
96
|
x2: diagonalPointValue,
|
|
104
97
|
y2: diagonalPointValue,
|
|
105
98
|
style: STYLE
|
|
106
|
-
}), /*#__PURE__*/
|
|
99
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
107
100
|
x1: 0,
|
|
108
101
|
y1: 0,
|
|
109
102
|
x2: textLength > length ? 0 : -(length - textLength) / 2,
|
|
110
103
|
y2: 0,
|
|
111
104
|
style: STYLE
|
|
112
|
-
}), /*#__PURE__*/
|
|
105
|
+
}), /*#__PURE__*/React.createElement("text", {
|
|
113
106
|
x: -length / 2,
|
|
114
107
|
y: "3",
|
|
115
108
|
style: STYLE_TEXT
|
|
116
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
109
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/React.createElement("line", {
|
|
117
110
|
x1: -length,
|
|
118
111
|
y1: 0,
|
|
119
112
|
x2: textLength > length ? -length : -(length + textLength) / 2,
|
|
120
113
|
y2: 0,
|
|
121
114
|
style: STYLE
|
|
122
|
-
}), /*#__PURE__*/
|
|
115
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
123
116
|
x1: -length - diagonalPointValue,
|
|
124
117
|
y1: -diagonalPointValue,
|
|
125
118
|
x2: -length + diagonalPointValue,
|
|
126
119
|
y2: diagonalPointValue,
|
|
127
120
|
style: STYLE
|
|
128
|
-
})), /*#__PURE__*/
|
|
121
|
+
})), /*#__PURE__*/React.createElement("line", {
|
|
129
122
|
x1: v1.x,
|
|
130
123
|
y1: v1.y,
|
|
131
124
|
x2: v1.x,
|
|
@@ -135,45 +128,45 @@ function Ruler3D(_ref) {
|
|
|
135
128
|
}
|
|
136
129
|
} else if (v0.x = v1.x) {
|
|
137
130
|
if (v0.y < v1.y) {
|
|
138
|
-
return /*#__PURE__*/
|
|
131
|
+
return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
|
|
139
132
|
x1: v0.x,
|
|
140
133
|
y1: v0.y,
|
|
141
134
|
x2: v0.x + space,
|
|
142
135
|
y2: v0.y,
|
|
143
136
|
style: STYLE
|
|
144
|
-
}), /*#__PURE__*/
|
|
137
|
+
}), /*#__PURE__*/React.createElement("g", {
|
|
145
138
|
transform: "translate(".concat(v0.x + space, ", ").concat(v0.y, ")")
|
|
146
|
-
}, /*#__PURE__*/
|
|
139
|
+
}, /*#__PURE__*/React.createElement("line", {
|
|
147
140
|
x1: -diagonalPointValue,
|
|
148
141
|
y1: -diagonalPointValue,
|
|
149
142
|
x2: diagonalPointValue,
|
|
150
143
|
y2: diagonalPointValue,
|
|
151
144
|
style: STYLE
|
|
152
|
-
}), /*#__PURE__*/
|
|
145
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
153
146
|
x1: 0,
|
|
154
147
|
y1: 0,
|
|
155
148
|
x2: 0,
|
|
156
149
|
y2: textLength > length ? 0 : (length - textLength) / 2,
|
|
157
150
|
style: STYLE
|
|
158
|
-
}), /*#__PURE__*/
|
|
151
|
+
}), /*#__PURE__*/React.createElement("text", {
|
|
159
152
|
x: length / 2,
|
|
160
153
|
y: 0,
|
|
161
154
|
style: _objectSpread(_objectSpread({}, STYLE_TEXT), {}, {
|
|
162
155
|
transform: 'rotate(90deg)'
|
|
163
156
|
})
|
|
164
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
157
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/React.createElement("line", {
|
|
165
158
|
x1: 0,
|
|
166
159
|
y1: length,
|
|
167
160
|
x2: 0,
|
|
168
161
|
y2: textLength > length ? length : (length + textLength) / 2,
|
|
169
162
|
style: STYLE
|
|
170
|
-
}), /*#__PURE__*/
|
|
163
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
171
164
|
x1: -diagonalPointValue,
|
|
172
165
|
y1: length - diagonalPointValue,
|
|
173
166
|
x2: diagonalPointValue,
|
|
174
167
|
y2: length + diagonalPointValue,
|
|
175
168
|
style: STYLE
|
|
176
|
-
})), /*#__PURE__*/
|
|
169
|
+
})), /*#__PURE__*/React.createElement("line", {
|
|
177
170
|
x1: v1.x,
|
|
178
171
|
y1: v1.y,
|
|
179
172
|
x2: v1.x + space,
|
|
@@ -181,45 +174,45 @@ function Ruler3D(_ref) {
|
|
|
181
174
|
style: STYLE
|
|
182
175
|
}));
|
|
183
176
|
} else {
|
|
184
|
-
return /*#__PURE__*/
|
|
177
|
+
return /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("line", {
|
|
185
178
|
x1: v0.x,
|
|
186
179
|
y1: v0.y,
|
|
187
180
|
x2: v0.x - space,
|
|
188
181
|
y2: v0.y,
|
|
189
182
|
style: STYLE
|
|
190
|
-
}), /*#__PURE__*/
|
|
183
|
+
}), /*#__PURE__*/React.createElement("g", {
|
|
191
184
|
transform: "translate(".concat(v0.x - space, ", ").concat(v0.y, ")")
|
|
192
|
-
}, /*#__PURE__*/
|
|
185
|
+
}, /*#__PURE__*/React.createElement("line", {
|
|
193
186
|
x1: -diagonalPointValue,
|
|
194
187
|
y1: -diagonalPointValue,
|
|
195
188
|
x2: diagonalPointValue,
|
|
196
189
|
y2: diagonalPointValue,
|
|
197
190
|
style: STYLE
|
|
198
|
-
}), /*#__PURE__*/
|
|
191
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
199
192
|
x1: 0,
|
|
200
193
|
y1: 0,
|
|
201
194
|
x2: 0,
|
|
202
195
|
y2: textLength > length ? 0 : -(length - textLength) / 2,
|
|
203
196
|
style: STYLE
|
|
204
|
-
}), /*#__PURE__*/
|
|
197
|
+
}), /*#__PURE__*/React.createElement("text", {
|
|
205
198
|
x: -length / 2,
|
|
206
199
|
y: 0,
|
|
207
200
|
style: _objectSpread(_objectSpread({}, STYLE_TEXT), {}, {
|
|
208
201
|
transform: 'rotate(90deg)'
|
|
209
202
|
})
|
|
210
|
-
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/
|
|
203
|
+
}, text, layer.unit === 'in' ? '"' : layer.unit), /*#__PURE__*/React.createElement("line", {
|
|
211
204
|
x1: 0,
|
|
212
205
|
y1: -length,
|
|
213
206
|
x2: 0,
|
|
214
207
|
y2: textLength > length ? -length : -(length + textLength) / 2,
|
|
215
208
|
style: STYLE
|
|
216
|
-
}), /*#__PURE__*/
|
|
209
|
+
}), /*#__PURE__*/React.createElement("line", {
|
|
217
210
|
x1: -diagonalPointValue,
|
|
218
211
|
y1: -length - diagonalPointValue,
|
|
219
212
|
x2: diagonalPointValue,
|
|
220
213
|
y2: -length + diagonalPointValue,
|
|
221
214
|
style: STYLE
|
|
222
|
-
})), /*#__PURE__*/
|
|
215
|
+
})), /*#__PURE__*/React.createElement("line", {
|
|
223
216
|
x1: v1.x,
|
|
224
217
|
y1: v1.y,
|
|
225
218
|
x2: v1.x - space,
|
|
@@ -1,19 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
});
|
|
7
|
-
exports.compareVertices = compareVertices;
|
|
8
|
-
exports["default"] = Scene3D;
|
|
9
|
-
var _react = _interopRequireDefault(require("react"));
|
|
10
|
-
var _geometry = require("../../../utils/geometry");
|
|
11
|
-
var _convertUnitsLite = require("../../../utils/convert-units-lite");
|
|
12
|
-
var _layer3D = _interopRequireDefault(require("./layer3D"));
|
|
13
|
-
function compareVertices(v0, v1) {
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { verticesDistance } from "../../../utils/geometry";
|
|
3
|
+
import { convert } from "../../../utils/convert-units-lite";
|
|
4
|
+
import Layer3D from "./layer3D";
|
|
5
|
+
export function compareVertices(v0, v1) {
|
|
14
6
|
return v0.x === v1.x ? v0.y - v1.y : v0.x - v1.x;
|
|
15
7
|
}
|
|
16
|
-
function Scene3D(_ref) {
|
|
8
|
+
export default function Scene3D(_ref) {
|
|
17
9
|
var scene = _ref.scene,
|
|
18
10
|
catalog = _ref.catalog,
|
|
19
11
|
width = _ref.width,
|
|
@@ -27,7 +19,7 @@ function Scene3D(_ref) {
|
|
|
27
19
|
var selectedLine = selectedLayer.lines.get(selectedLayer.selected.lines.toJS()[0]);
|
|
28
20
|
var vertex0 = selectedLayer.vertices.get(selectedLine.vertices.get(0));
|
|
29
21
|
var vertex1 = selectedLayer.vertices.get(selectedLine.vertices.get(1));
|
|
30
|
-
var lineLength =
|
|
22
|
+
var lineLength = convert(verticesDistance(vertex0, vertex1)).from(scene.unit).to(selectedLayer.unit);
|
|
31
23
|
var multi = downloadFlag ? 0.85 : 0.6;
|
|
32
24
|
var scale = Math.min(width * multi / lineLength, height * multi / ceilHeight);
|
|
33
25
|
var frontRect = {
|
|
@@ -40,7 +32,7 @@ function Scene3D(_ref) {
|
|
|
40
32
|
for (var x = -width / 2; x <= width / 2; x = x + 30 * viewScale) {
|
|
41
33
|
for (var y = -height / 2; y <= height / 2; y = y + 30 * viewScale) {
|
|
42
34
|
if (Math.abs(x) > frontRect.width / 2 || Math.abs(y) > frontRect.height / 2) {
|
|
43
|
-
grids.push(/*#__PURE__*/
|
|
35
|
+
grids.push(/*#__PURE__*/React.createElement("circle", {
|
|
44
36
|
key: "grid_".concat(i),
|
|
45
37
|
cx: x,
|
|
46
38
|
cy: y,
|
|
@@ -51,7 +43,7 @@ function Scene3D(_ref) {
|
|
|
51
43
|
}
|
|
52
44
|
}
|
|
53
45
|
}
|
|
54
|
-
return /*#__PURE__*/
|
|
46
|
+
return /*#__PURE__*/React.createElement("g", null, grids, /*#__PURE__*/React.createElement(Layer3D, {
|
|
55
47
|
key: selectedLayer.id,
|
|
56
48
|
layer: selectedLayer,
|
|
57
49
|
frontRect: frontRect,
|