kitchen-simulator 1.1.1-test.64 → 1.1.1-test.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/@history.js +10 -2
- package/es/AppContext.js +10 -3
- package/es/KitchenConfigurator.js +79 -70
- package/es/KitchenConfiguratorApp.js +107 -98
- package/es/actions/area-actions.js +12 -5
- package/es/actions/export.js +29 -12
- package/es/actions/groups-actions.js +45 -27
- package/es/actions/holes-actions.js +55 -34
- package/es/actions/items-actions.js +145 -94
- package/es/actions/lines-actions.js +36 -21
- package/es/actions/project-actions.js +145 -94
- package/es/actions/scene-actions.js +21 -11
- package/es/actions/vertices-actions.js +15 -7
- package/es/actions/viewer2d-actions.js +36 -21
- package/es/actions/viewer3d-actions.js +18 -9
- package/es/catalog/areas/area/planner-element.js +9 -2
- package/es/catalog/catalog.js +21 -15
- package/es/catalog/factories/area-factory-3d.js +31 -22
- package/es/catalog/factories/area-factory.js +20 -11
- package/es/catalog/factories/export.js +24 -6
- package/es/catalog/factories/wall-factory-3d.js +41 -31
- package/es/catalog/factories/wall-factory.js +31 -21
- package/es/catalog/holes/door-closet/planner-element.js +24 -15
- package/es/catalog/holes/door-double/planner-element.js +24 -15
- package/es/catalog/holes/door-exterior/planner-element.js +25 -16
- package/es/catalog/holes/door-interior/planner-element.js +25 -16
- package/es/catalog/holes/door-panic/planner-element.js +16 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +24 -15
- package/es/catalog/holes/door-sliding/planner-element.js +25 -16
- package/es/catalog/holes/doorway-framed/planner-element.js +20 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +16 -7
- package/es/catalog/holes/export.js +97 -13
- package/es/catalog/holes/window-clear/planner-element.js +19 -10
- package/es/catalog/holes/window-cross/planner-element.js +19 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +19 -10
- package/es/catalog/holes/window-vertical/planner-element.js +19 -10
- package/es/catalog/lines/wall/planner-element.js +9 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +14 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +14 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +14 -5
- package/es/catalog/properties/export.js +80 -20
- package/es/catalog/properties/property-checkbox.js +31 -24
- package/es/catalog/properties/property-color.js +23 -16
- package/es/catalog/properties/property-enum.js +31 -24
- package/es/catalog/properties/property-hidden.js +16 -9
- package/es/catalog/properties/property-lenght-measure.js +45 -38
- package/es/catalog/properties/property-length-measure.js +43 -36
- package/es/catalog/properties/property-length-measure_hole.js +45 -38
- package/es/catalog/properties/property-number.js +24 -17
- package/es/catalog/properties/property-read-only.js +23 -16
- package/es/catalog/properties/property-string.js +23 -16
- package/es/catalog/properties/property-toggle.js +23 -16
- package/es/catalog/properties/shared-property-style.js +7 -1
- package/es/catalog/utils/FuseUtils.js +15 -8
- package/es/catalog/utils/exporter.js +15 -8
- package/es/catalog/utils/geom-utils.js +29 -13
- package/es/catalog/utils/item-loader.js +97 -84
- package/es/catalog/utils/load-obj.js +28 -20
- package/es/catalog/utils/mtl-loader.js +8 -3
- package/es/catalog/utils/obj-loader.js +8 -3
- package/es/class/FuseUtils.js +15 -8
- package/es/class/area.js +28 -22
- package/es/class/export.js +95 -23
- package/es/class/group.js +59 -53
- package/es/class/guide.js +21 -15
- package/es/class/hole.js +89 -83
- package/es/class/item.js +147 -141
- package/es/class/layer.js +65 -59
- package/es/class/line.js +143 -135
- package/es/class/project.js +98 -90
- package/es/class/vertex.js +35 -29
- package/es/components/content.js +28 -19
- package/es/components/disclaimer/disclaimer.js +18 -10
- package/es/components/export.js +32 -8
- package/es/components/style/button.js +31 -23
- package/es/components/style/cancel-button.js +14 -7
- package/es/components/style/content-container.js +16 -9
- package/es/components/style/content-title.js +20 -11
- package/es/components/style/delete-button.js +17 -8
- package/es/components/style/export.js +120 -30
- package/es/components/style/form-block.js +15 -8
- package/es/components/style/form-color-input.js +14 -7
- package/es/components/style/form-label.js +15 -8
- package/es/components/style/form-number-input.js +49 -41
- package/es/components/style/form-number-input_2.js +44 -36
- package/es/components/style/form-select.js +24 -17
- package/es/components/style/form-slider.js +17 -10
- package/es/components/style/form-submit-button.js +17 -8
- package/es/components/style/form-text-input.js +34 -26
- package/es/components/viewer2d/area.js +24 -17
- package/es/components/viewer2d/export.js +120 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-streak.js +17 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +17 -10
- package/es/components/viewer2d/grids/grids.js +19 -10
- package/es/components/viewer2d/group.js +24 -15
- package/es/components/viewer2d/item.js +70 -61
- package/es/components/viewer2d/layer.js +30 -23
- package/es/components/viewer2d/line.js +111 -101
- package/es/components/viewer2d/ruler.js +29 -22
- package/es/components/viewer2d/rulerDist.js +28 -21
- package/es/components/viewer2d/rulerX.js +47 -39
- package/es/components/viewer2d/rulerY.js +45 -37
- package/es/components/viewer2d/scene.js +38 -30
- package/es/components/viewer2d/snap.js +22 -13
- package/es/components/viewer2d/state.js +27 -18
- package/es/components/viewer2d/utils.js +37 -24
- package/es/components/viewer2d/vertex.js +17 -8
- package/es/components/viewer2d/viewer2d.js +163 -153
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +23 -17
- package/es/components/viewer3d/dcm.js +7 -1
- package/es/components/viewer3d/fbm.js +7 -1
- package/es/components/viewer3d/front3D.js +21 -12
- package/es/components/viewer3d/grid-creator.js +17 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +14 -6
- package/es/components/viewer3d/grids/grid-streak.js +13 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +14 -6
- package/es/components/viewer3d/libs/first-person-controls.js +9 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +7 -1
- package/es/components/viewer3d/libs/mtl-loader.js +7 -1
- package/es/components/viewer3d/libs/obj-loader.js +7 -1
- package/es/components/viewer3d/libs/orbit-controls.js +8 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +8 -2
- package/es/components/viewer3d/lrm.js +7 -1
- package/es/components/viewer3d/model.js +7 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +10 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +25 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +66 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +46 -39
- package/es/components/viewer3d/ruler-utils/scene3D.js +17 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +11 -4
- package/es/components/viewer3d/scene-creator.js +226 -191
- package/es/components/viewer3d/three-memory-cleaner.js +12 -3
- package/es/components/viewer3d/viewer3d-first-person.js +46 -40
- package/es/components/viewer3d/viewer3d.js +202 -196
- package/es/constants.js +358 -349
- package/es/index.js +15 -7
- package/es/models.js +184 -177
- package/es/plugins/SVGLoader.js +53 -48
- package/es/plugins/autosave.js +9 -3
- package/es/plugins/console-debugger.js +12 -5
- package/es/plugins/export.js +32 -8
- package/es/plugins/keyboard.js +35 -29
- package/es/reducers/areas-reducer.js +13 -7
- package/es/reducers/export.js +96 -24
- package/es/reducers/groups-reducer.js +37 -31
- package/es/reducers/holes-reducer.js +49 -43
- package/es/reducers/items-reducer.js +112 -106
- package/es/reducers/lines-reducer.js +34 -28
- package/es/reducers/project-reducer.js +111 -105
- package/es/reducers/reducer.js +23 -16
- package/es/reducers/scene-reducer.js +21 -15
- package/es/reducers/user-reducer.js +11 -5
- package/es/reducers/vertices-reducer.js +17 -11
- package/es/reducers/viewer2d-reducer.js +24 -18
- package/es/reducers/viewer3d-reducer.js +22 -16
- package/es/shared-style.js +16 -10
- package/es/styles/export.js +11 -3
- package/es/translator/en.js +7 -1
- package/es/translator/it.js +7 -1
- package/es/translator/ru.js +7 -1
- package/es/translator/translator.js +19 -13
- package/es/utils/browser.js +9 -2
- package/es/utils/convert-units-lite.js +7 -1
- package/es/utils/email-validator.js +7 -1
- package/es/utils/export.js +46 -15
- package/es/utils/geometry.js +278 -181
- package/es/utils/get-edges-of-subgraphs.js +9 -2
- package/es/utils/graph-cycles.js +11 -8
- package/es/utils/graph-inner-cycles.js +18 -10
- package/es/utils/graph.js +17 -9
- package/es/utils/helper.js +63 -39
- package/es/utils/history.js +15 -8
- package/es/utils/id-broker.js +15 -8
- package/es/utils/logger.js +7 -1
- package/es/utils/math.js +12 -5
- package/es/utils/molding.js +144 -119
- package/es/utils/name-generator.js +13 -7
- package/es/utils/objects-utils.js +19 -7
- package/es/utils/phone-validator.js +7 -1
- package/es/utils/process-black-list.js +10 -3
- package/es/utils/react-if.js +12 -6
- package/es/utils/snap-scene.js +34 -27
- package/es/utils/snap.js +59 -45
- package/es/utils/summarizeCart.js +7 -1
- package/es/utils/threeCSG.es6.js +22 -13
- package/es/version.js +7 -1
- package/package.json +1 -1
|
@@ -1,22 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports["default"] = Viewer2D;
|
|
9
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
|
|
10
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
11
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
|
|
12
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
13
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
14
|
+
var _reactSvgPanZoom = require("react-svg-pan-zoom");
|
|
15
|
+
var _constants = _interopRequireWildcard(require("../../constants"));
|
|
16
|
+
var constants = _constants;
|
|
17
|
+
var _state = _interopRequireDefault(require("./state"));
|
|
18
|
+
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
19
|
+
var _export = require("./export");
|
|
20
|
+
var _export2 = require("../../utils/export");
|
|
21
|
+
var _formNumberInput = _interopRequireDefault(require("../style/form-number-input"));
|
|
22
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
23
|
+
var _immutable = require("immutable");
|
|
24
|
+
var _math = require("../../utils/math");
|
|
25
|
+
var _helper = require("../../utils/helper");
|
|
26
|
+
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); }
|
|
4
27
|
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; }
|
|
5
|
-
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) {
|
|
6
|
-
|
|
7
|
-
import PropTypes from 'prop-types';
|
|
8
|
-
import { ReactSVGPanZoom, TOOL_AUTO, TOOL_NONE, TOOL_PAN, TOOL_ZOOM_IN, TOOL_ZOOM_OUT, zoom } from 'react-svg-pan-zoom';
|
|
9
|
-
import * as constants from "../../constants";
|
|
10
|
-
import State from "./state";
|
|
11
|
-
import * as SharedStyle from "../../shared-style";
|
|
12
|
-
import { RulerX, RulerY } from "./export";
|
|
13
|
-
import { DECIMAL_PLACES_2, LINE_THICKNESS, MIN_ANGLE_DISALLOW_DRAW_WALL, MODE_ELEVATION_VIEW, MODE_IDLE, UNIT_ANGLE } from "../../constants";
|
|
14
|
-
import { GeometryUtils } from "../../utils/export";
|
|
15
|
-
import FormNumberInput from "../style/form-number-input";
|
|
16
|
-
import { convert } from "../../utils/convert-units-lite";
|
|
17
|
-
import { Map } from 'immutable';
|
|
18
|
-
import { formatNumber } from "../../utils/math";
|
|
19
|
-
import { isEmpty } from "../../utils/helper"; // variables
|
|
28
|
+
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) { (0, _defineProperty2["default"])(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; }
|
|
29
|
+
// variables
|
|
20
30
|
|
|
21
31
|
// variables
|
|
22
32
|
var pinFlag = false;
|
|
@@ -36,19 +46,19 @@ var allArea;
|
|
|
36
46
|
// /////////
|
|
37
47
|
function mode2Tool(mode) {
|
|
38
48
|
if (pinFlag) {
|
|
39
|
-
return TOOL_NONE;
|
|
49
|
+
return _reactSvgPanZoom.TOOL_NONE;
|
|
40
50
|
}
|
|
41
51
|
switch (mode) {
|
|
42
52
|
case constants.MODE_2D_PAN:
|
|
43
|
-
return TOOL_PAN;
|
|
53
|
+
return _reactSvgPanZoom.TOOL_PAN;
|
|
44
54
|
case constants.MODE_2D_ZOOM_IN:
|
|
45
|
-
return TOOL_ZOOM_IN;
|
|
55
|
+
return _reactSvgPanZoom.TOOL_ZOOM_IN;
|
|
46
56
|
case constants.MODE_2D_ZOOM_OUT:
|
|
47
|
-
return TOOL_ZOOM_OUT;
|
|
57
|
+
return _reactSvgPanZoom.TOOL_ZOOM_OUT;
|
|
48
58
|
case constants.MODE_IDLE:
|
|
49
|
-
return TOOL_AUTO;
|
|
59
|
+
return _reactSvgPanZoom.TOOL_AUTO;
|
|
50
60
|
default:
|
|
51
|
-
return TOOL_NONE;
|
|
61
|
+
return _reactSvgPanZoom.TOOL_NONE;
|
|
52
62
|
}
|
|
53
63
|
}
|
|
54
64
|
function mode2PointerEvents(mode) {
|
|
@@ -120,7 +130,7 @@ function extractElementData(node) {
|
|
|
120
130
|
direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
|
|
121
131
|
};
|
|
122
132
|
}
|
|
123
|
-
|
|
133
|
+
function Viewer2D(_ref, _ref2) {
|
|
124
134
|
var state = _ref.state,
|
|
125
135
|
width = _ref.width,
|
|
126
136
|
height = _ref.height,
|
|
@@ -134,29 +144,29 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
134
144
|
areaActions = _ref2.areaActions,
|
|
135
145
|
projectActions = _ref2.projectActions,
|
|
136
146
|
catalog = _ref2.catalog;
|
|
137
|
-
var _useState = useState(null),
|
|
138
|
-
_useState2 =
|
|
147
|
+
var _useState = (0, _react.useState)(null),
|
|
148
|
+
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
139
149
|
rulerEdit = _useState2[0],
|
|
140
150
|
setRulerEdit = _useState2[1];
|
|
141
|
-
var _useState3 = useState(null),
|
|
142
|
-
_useState4 =
|
|
151
|
+
var _useState3 = (0, _react.useState)(null),
|
|
152
|
+
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
|
|
143
153
|
rulerEditID = _useState4[0],
|
|
144
154
|
setRulerEditID = _useState4[1];
|
|
145
|
-
var Viewer = useRef(null);
|
|
155
|
+
var Viewer = (0, _react.useRef)(null);
|
|
146
156
|
var viewer2D = state.viewer2D,
|
|
147
157
|
mode = state.mode,
|
|
148
158
|
scene = state.scene;
|
|
149
159
|
|
|
150
160
|
// let relatedLines = [];
|
|
151
|
-
var _useState5 = useState([]),
|
|
152
|
-
_useState6 =
|
|
161
|
+
var _useState5 = (0, _react.useState)([]),
|
|
162
|
+
_useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
|
|
153
163
|
relatedLines = _useState6[0],
|
|
154
164
|
setRelatedLines = _useState6[1];
|
|
155
|
-
var _useState7 = useState(false),
|
|
156
|
-
_useState8 =
|
|
165
|
+
var _useState7 = (0, _react.useState)(false),
|
|
166
|
+
_useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
|
|
157
167
|
drawStart = _useState8[0],
|
|
158
168
|
setdrawStart = _useState8[1];
|
|
159
|
-
useEffect(function () {
|
|
169
|
+
(0, _react.useEffect)(function () {
|
|
160
170
|
// move viewer point to center
|
|
161
171
|
var selectedLayer = state.scene.layers.get(state.scene.selectedLayer);
|
|
162
172
|
var vertices = selectedLayer.vertices;
|
|
@@ -178,7 +188,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
178
188
|
Viewer.current.setPointOnViewerCenter(moveX, moveY, viewer2D.get('a'));
|
|
179
189
|
}, []);
|
|
180
190
|
var layerID = scene.selectedLayer;
|
|
181
|
-
var wall_thickness = LINE_THICKNESS / 2;
|
|
191
|
+
var wall_thickness = _constants.LINE_THICKNESS / 2;
|
|
182
192
|
var layer = scene.getIn(['layers', layerID]);
|
|
183
193
|
var mapCursorPosition = function mapCursorPosition(_ref3) {
|
|
184
194
|
var x = _ref3.x,
|
|
@@ -195,15 +205,15 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
195
205
|
var prepareSnap = function prepareSnap() {
|
|
196
206
|
var layerID = scene.selectedLayer;
|
|
197
207
|
var layer = scene.layers.get(layerID);
|
|
198
|
-
allLines = GeometryUtils.getAllLines(layer);
|
|
199
|
-
allLineRects = GeometryUtils.buildRectFromLines(layer, allLines);
|
|
200
|
-
allItemRect = GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
201
|
-
allItemSnap = GeometryUtils.getAllItemSnap(allItemRect);
|
|
202
|
-
allLineSnap = GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
208
|
+
allLines = _export2.GeometryUtils.getAllLines(layer);
|
|
209
|
+
allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
210
|
+
allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
211
|
+
allItemSnap = _export2.GeometryUtils.getAllItemSnap(allItemRect);
|
|
212
|
+
allLineSnap = _export2.GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
203
213
|
allRect = allItemRect.others.concat(allLineRects);
|
|
204
|
-
allItemSnap = GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
205
|
-
allLineSnap = GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
206
|
-
allArea = GeometryUtils.getAllArea(layer);
|
|
214
|
+
allItemSnap = _export2.GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
215
|
+
allLineSnap = _export2.GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
216
|
+
allArea = _export2.GeometryUtils.getAllArea(layer);
|
|
207
217
|
};
|
|
208
218
|
var updateRulerDistAttribute = function updateRulerDistAttribute(elementData, value) {
|
|
209
219
|
var newVal = value.get('length');
|
|
@@ -246,11 +256,11 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
246
256
|
var selectedLine = scene.getIn(['layers', elementData.layer, 'lines', elementData.id]).toJS();
|
|
247
257
|
var v_0 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[0]]);
|
|
248
258
|
var v_1 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[1]]);
|
|
249
|
-
var _GeometryUtils$orderV = GeometryUtils.orderVertices([v_0, v_1]),
|
|
250
|
-
_GeometryUtils$orderV2 =
|
|
259
|
+
var _GeometryUtils$orderV = _export2.GeometryUtils.orderVertices([v_0, v_1]),
|
|
260
|
+
_GeometryUtils$orderV2 = (0, _slicedToArray2["default"])(_GeometryUtils$orderV, 2),
|
|
251
261
|
v_a = _GeometryUtils$orderV2[0],
|
|
252
262
|
v_b = _GeometryUtils$orderV2[1];
|
|
253
|
-
var v_b_new = GeometryUtils.extendLine(v_a.x, v_a.y, v_b.x, v_b.y, value.get('length'), 2);
|
|
263
|
+
var v_b_new = _export2.GeometryUtils.extendLine(v_a.x, v_a.y, v_b.x, v_b.y, value.get('length'), 2);
|
|
254
264
|
|
|
255
265
|
// Blocked function that as wall changed, opposite wall should changed together.
|
|
256
266
|
// let layer = scene.getIn(['layers', elementData.layer]);
|
|
@@ -282,7 +292,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
282
292
|
vertexTwo: v_a
|
|
283
293
|
});
|
|
284
294
|
}
|
|
285
|
-
var attributesFormData = new Map(_objectSpread({}, attributesData));
|
|
295
|
+
var attributesFormData = new _immutable.Map(_objectSpread({}, attributesData));
|
|
286
296
|
setRulerEdit(null);
|
|
287
297
|
projectActions.setLinesAttributes(attributesFormData, true, {
|
|
288
298
|
layerID: elementData.layer,
|
|
@@ -366,7 +376,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
366
376
|
};
|
|
367
377
|
var getEndPoint = function getEndPoint(vertices, x, y, mode) {
|
|
368
378
|
var selLineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
369
|
-
if (isEmpty(selLineID)) {
|
|
379
|
+
if ((0, _helper.isEmpty)(selLineID)) {
|
|
370
380
|
return {
|
|
371
381
|
isEndDrag: true,
|
|
372
382
|
x: x,
|
|
@@ -376,7 +386,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
376
386
|
var draggingLine = state.getIn(['scene', 'layers', layerID, 'lines', selLineID]).toJS();
|
|
377
387
|
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
378
388
|
var dragVertexId = state.getIn(['draggingSupport', 'vertexID']);
|
|
379
|
-
dragVertexId = !isEmpty(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
389
|
+
dragVertexId = !(0, _helper.isEmpty)(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
380
390
|
var vtx, vty;
|
|
381
391
|
var stepUnit = false;
|
|
382
392
|
vtx = vertices[dragVertexId].x;
|
|
@@ -387,7 +397,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
387
397
|
stepUnit = true;
|
|
388
398
|
}
|
|
389
399
|
var endDrag = [];
|
|
390
|
-
if (!isEmpty(relatedLines) && mode !== 'DRAGGING_LINE') {
|
|
400
|
+
if (!(0, _helper.isEmpty)(relatedLines) && mode !== 'DRAGGING_LINE') {
|
|
391
401
|
vertices[dragVertexId].x = x;
|
|
392
402
|
vertices[dragVertexId].y = y;
|
|
393
403
|
}
|
|
@@ -395,17 +405,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
395
405
|
if (draggingLine.vertices[0] !== draggingLine.vertices[1]) {
|
|
396
406
|
for (var i = 0; i < relatedLines.length; i++) {
|
|
397
407
|
var line = relatedLines[i];
|
|
398
|
-
lineAngle = GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
|
|
408
|
+
lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
|
|
399
409
|
absAngle = Math.abs(lineAngle);
|
|
400
410
|
var tmpRelated = [];
|
|
401
|
-
GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
|
|
411
|
+
_export2.GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
|
|
402
412
|
for (var j = 0; j < tmpRelated.length; j++) {
|
|
403
|
-
var tmpAngle = Math.abs(GeometryUtils.angleBetweenTwoLines(tmpRelated[j], line, vertices));
|
|
404
|
-
if (tmpAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || tmpAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
413
|
+
var tmpAngle = Math.abs(_export2.GeometryUtils.angleBetweenTwoLines(tmpRelated[j], line, vertices));
|
|
414
|
+
if (tmpAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || tmpAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
405
415
|
endDrag.push(false);
|
|
406
416
|
} else endDrag.push(true);
|
|
407
417
|
}
|
|
408
|
-
if (absAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
418
|
+
if (absAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
409
419
|
endDrag.push(false);
|
|
410
420
|
} else endDrag.push(true);
|
|
411
421
|
}
|
|
@@ -416,7 +426,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
416
426
|
vtx = x;
|
|
417
427
|
vty = y;
|
|
418
428
|
} else {
|
|
419
|
-
var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
|
|
429
|
+
var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
|
|
420
430
|
// the origin point of rotation(snapping)
|
|
421
431
|
var originVerId = draggingLine.vertices.findIndex(function (vertice) {
|
|
422
432
|
return vertice !== dragVertexId;
|
|
@@ -428,7 +438,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
428
438
|
// determine the direction of rotation.
|
|
429
439
|
rest = lineAngle > 0 ? -rest : rest;
|
|
430
440
|
// rotate the current point to last point around the first point of drawing line.
|
|
431
|
-
var res = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
|
|
441
|
+
var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
|
|
432
442
|
vtx = res.x;
|
|
433
443
|
vty = res.y;
|
|
434
444
|
}
|
|
@@ -437,8 +447,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
437
447
|
// angle snapping as a value of UNIT_ANGLE
|
|
438
448
|
if (!endDrag.some(function (flag) {
|
|
439
449
|
return flag === false;
|
|
440
|
-
}) && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0 && stepUnit) {
|
|
441
|
-
var _result = GeometryUtils.snapAngleByUnit(lineAngle, vertices, draggingLine, vtx, vty, dragVertexId);
|
|
450
|
+
}) && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0 && stepUnit) {
|
|
451
|
+
var _result = _export2.GeometryUtils.snapAngleByUnit(lineAngle, vertices, draggingLine, vtx, vty, dragVertexId);
|
|
442
452
|
vtx = _result.x;
|
|
443
453
|
vty = _result.y;
|
|
444
454
|
}
|
|
@@ -454,7 +464,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
454
464
|
if (!(item !== null && item !== void 0 && (_item$properties = item.properties) !== null && _item$properties !== void 0 && _item$properties.getIn)) return 0;
|
|
455
465
|
var length = item.properties.getIn([property, '_length']);
|
|
456
466
|
var unit = item.properties.getIn([property, '_unit']);
|
|
457
|
-
return length && unit ? convert(length).from(unit).to('cm') : 0;
|
|
467
|
+
return length && unit ? (0, _convertUnitsLite.convert)(length).from(unit).to('cm') : 0;
|
|
458
468
|
};
|
|
459
469
|
var point = function point(x, y) {
|
|
460
470
|
return {
|
|
@@ -469,32 +479,32 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
469
479
|
var pointArray = [];
|
|
470
480
|
curItemInfo.rectCenterPoint.forEach(function (centerpoint) {
|
|
471
481
|
if (!Array.isArray(centerpoint) || centerpoint.length < 2) return;
|
|
472
|
-
var _centerpoint =
|
|
482
|
+
var _centerpoint = (0, _slicedToArray2["default"])(centerpoint, 2),
|
|
473
483
|
pt = _centerpoint[0],
|
|
474
484
|
angle = _centerpoint[1];
|
|
475
485
|
if (!pt) return;
|
|
476
486
|
|
|
477
487
|
// line through centerpoint and reference center
|
|
478
|
-
var rectLine = angle === 180 || angle === 0 ? GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, center_x1, center_y1) : GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, x, y);
|
|
488
|
+
var rectLine = angle === 180 || angle === 0 ? _export2.GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, center_x1, center_y1) : _export2.GeometryUtils.linePassingThroughTwoPoints(pt.x, pt.y, x, y);
|
|
479
489
|
if (!rectLine) return;
|
|
480
490
|
var minDist;
|
|
481
491
|
allRect.forEach(function (linerect) {
|
|
482
492
|
if (!(linerect !== null && linerect !== void 0 && linerect.rect) || linerect.rect.length < 4) return;
|
|
483
|
-
var p0 = GeometryUtils.clone_point(linerect.rect[2]);
|
|
484
|
-
var p1 = GeometryUtils.clone_point(linerect.rect[3]);
|
|
493
|
+
var p0 = _export2.GeometryUtils.clone_point(linerect.rect[2]);
|
|
494
|
+
var p1 = _export2.GeometryUtils.clone_point(linerect.rect[3]);
|
|
485
495
|
if (!p0 || !p1 || p0.x === p1.x && p0.y === p1.y) return;
|
|
486
|
-
var lineFn = GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
496
|
+
var lineFn = _export2.GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
487
497
|
if (!lineFn) return;
|
|
488
|
-
var ip = GeometryUtils.twoLinesIntersection(lineFn.a, lineFn.b, lineFn.c, rectLine.a, rectLine.b, rectLine.c);
|
|
498
|
+
var ip = _export2.GeometryUtils.twoLinesIntersection(lineFn.a, lineFn.b, lineFn.c, rectLine.a, rectLine.b, rectLine.c);
|
|
489
499
|
if (!ip) return;
|
|
490
500
|
|
|
491
501
|
// intersection must lie within line segment
|
|
492
|
-
var segLen = GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y);
|
|
493
|
-
if (segLen <= GeometryUtils.pointsDistance(p0.x, p0.y, ip.x, ip.y) || segLen <= GeometryUtils.pointsDistance(p1.x, p1.y, ip.x, ip.y)) return;
|
|
502
|
+
var segLen = _export2.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y);
|
|
503
|
+
if (segLen <= _export2.GeometryUtils.pointsDistance(p0.x, p0.y, ip.x, ip.y) || segLen <= _export2.GeometryUtils.pointsDistance(p1.x, p1.y, ip.x, ip.y)) return;
|
|
494
504
|
|
|
495
505
|
// ensure intersection is farther than pt→center
|
|
496
|
-
var distToCenter = GeometryUtils.pointsDistance(ip.x, ip.y, x, y);
|
|
497
|
-
var baseDist = GeometryUtils.pointsDistance(pt.x, pt.y, ip.x, ip.y);
|
|
506
|
+
var distToCenter = _export2.GeometryUtils.pointsDistance(ip.x, ip.y, x, y);
|
|
507
|
+
var baseDist = _export2.GeometryUtils.pointsDistance(pt.x, pt.y, ip.x, ip.y);
|
|
498
508
|
if (distToCenter <= baseDist) return;
|
|
499
509
|
var candidate = baseDist;
|
|
500
510
|
minDist = minDist !== undefined ? Math.min(minDist, candidate) : candidate;
|
|
@@ -551,12 +561,12 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
551
561
|
};
|
|
552
562
|
|
|
553
563
|
// collect geometry
|
|
554
|
-
var _allLines = GeometryUtils.getAllLines(layer) || [];
|
|
555
|
-
var _allLineRects = GeometryUtils.buildRectFromLines(layer, _allLines) || [];
|
|
556
|
-
var _allItemRect = GeometryUtils.getAllItems(scene, catalog, _allLineRects) || {
|
|
564
|
+
var _allLines = _export2.GeometryUtils.getAllLines(layer) || [];
|
|
565
|
+
var _allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, _allLines) || [];
|
|
566
|
+
var _allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, _allLineRects) || {
|
|
557
567
|
others: []
|
|
558
568
|
};
|
|
559
|
-
var _allRect = [].concat(
|
|
569
|
+
var _allRect = [].concat((0, _toConsumableArray2["default"])(_allItemRect.others || []), (0, _toConsumableArray2["default"])(_allLineRects));
|
|
560
570
|
|
|
561
571
|
// current item
|
|
562
572
|
var curItemInfo = getCalcRectFromItem(val);
|
|
@@ -633,7 +643,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
633
643
|
endPoint.y = y;
|
|
634
644
|
} else {
|
|
635
645
|
prepareSnap();
|
|
636
|
-
var _GeometryUtils$calcSn = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
646
|
+
var _GeometryUtils$calcSn = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
637
647
|
nx = _GeometryUtils$calcSn.nx,
|
|
638
648
|
ny = _GeometryUtils$calcSn.ny,
|
|
639
649
|
rot = _GeometryUtils$calcSn.rot,
|
|
@@ -648,10 +658,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
648
658
|
layoutpos: allItemRect.cur && allItemRect.cur.layoutpos,
|
|
649
659
|
is_corner: allItemRect.cur && allItemRect.cur.is_corner
|
|
650
660
|
};
|
|
651
|
-
var _GeometryUtils$getAll = GeometryUtils.getAllHoleRect(scene, _val),
|
|
661
|
+
var _GeometryUtils$getAll = _export2.GeometryUtils.getAllHoleRect(scene, _val),
|
|
652
662
|
_isSect = _GeometryUtils$getAll.isSect,
|
|
653
663
|
_snap = _GeometryUtils$getAll.snap;
|
|
654
|
-
if (!isEmpty(_snap) && _isSect) {
|
|
664
|
+
if (!(0, _helper.isEmpty)(_snap) && _isSect) {
|
|
655
665
|
if (_snap.length == 1) _val.pos = {
|
|
656
666
|
x: _snap[0].x,
|
|
657
667
|
y: _snap[0].y
|
|
@@ -664,7 +674,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
664
674
|
y: _snap[1].y
|
|
665
675
|
};
|
|
666
676
|
}
|
|
667
|
-
var interSect = GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
677
|
+
var interSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
668
678
|
if (interSect) {
|
|
669
679
|
nx = _val.pos.x;
|
|
670
680
|
ny = _val.pos.y;
|
|
@@ -674,7 +684,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
674
684
|
x: nx,
|
|
675
685
|
y: ny
|
|
676
686
|
};
|
|
677
|
-
var _isrectSect = GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
687
|
+
var _isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
678
688
|
if (_isrectSect && _isSect) {
|
|
679
689
|
itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
|
|
680
690
|
itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
|
|
@@ -709,7 +719,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
709
719
|
case constants.MODE_DRAGGING_ITEM:
|
|
710
720
|
calcDistanceArray();
|
|
711
721
|
prepareSnap();
|
|
712
|
-
var _GeometryUtils$calcSn2 = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
722
|
+
var _GeometryUtils$calcSn2 = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
713
723
|
nx = _GeometryUtils$calcSn2.nx,
|
|
714
724
|
ny = _GeometryUtils$calcSn2.ny,
|
|
715
725
|
rot = _GeometryUtils$calcSn2.rot,
|
|
@@ -724,10 +734,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
724
734
|
layoutpos: allItemRect.cur && allItemRect.cur.layoutpos,
|
|
725
735
|
is_corner: allItemRect.cur && allItemRect.cur.is_corner
|
|
726
736
|
};
|
|
727
|
-
var _GeometryUtils$getAll2 = GeometryUtils.getAllHoleRect(scene, val),
|
|
737
|
+
var _GeometryUtils$getAll2 = _export2.GeometryUtils.getAllHoleRect(scene, val),
|
|
728
738
|
isSect = _GeometryUtils$getAll2.isSect,
|
|
729
739
|
snap = _GeometryUtils$getAll2.snap;
|
|
730
|
-
if (!isEmpty(snap) && isSect) {
|
|
740
|
+
if (!(0, _helper.isEmpty)(snap) && isSect) {
|
|
731
741
|
if (snap.length == 1) val.pos = {
|
|
732
742
|
x: snap[0].x,
|
|
733
743
|
y: snap[0].y
|
|
@@ -740,7 +750,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
740
750
|
y: snap[1].y
|
|
741
751
|
};
|
|
742
752
|
}
|
|
743
|
-
var _interSect = GeometryUtils.validInterSect(allItemRect.others, val);
|
|
753
|
+
var _interSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
|
|
744
754
|
if (_interSect) {
|
|
745
755
|
nx = val.pos.x;
|
|
746
756
|
ny = val.pos.y;
|
|
@@ -750,7 +760,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
750
760
|
x: nx,
|
|
751
761
|
y: ny
|
|
752
762
|
};
|
|
753
|
-
var isrectSect = GeometryUtils.validInterSect(allItemRect.others, val);
|
|
763
|
+
var isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
|
|
754
764
|
if (isrectSect && isSect) {
|
|
755
765
|
itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
|
|
756
766
|
itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
|
|
@@ -870,7 +880,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
870
880
|
break;
|
|
871
881
|
} else if (elementData.part === 'elevation') {
|
|
872
882
|
// handle action when click elevation about selected line
|
|
873
|
-
var _mode = MODE_ELEVATION_VIEW;
|
|
883
|
+
var _mode = _constants.MODE_ELEVATION_VIEW;
|
|
874
884
|
projectActions.setMode(_mode);
|
|
875
885
|
break;
|
|
876
886
|
} else {
|
|
@@ -905,9 +915,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
905
915
|
break;
|
|
906
916
|
}
|
|
907
917
|
case 'rulerDist':
|
|
908
|
-
var _length1 = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
909
|
-
var distanceText1 = "".concat(formatNumber(_length1, DECIMAL_PLACES_2));
|
|
910
|
-
var numberInput1 = /*#__PURE__*/
|
|
918
|
+
var _length1 = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
919
|
+
var distanceText1 = "".concat((0, _math.formatNumber)(_length1, _constants.DECIMAL_PLACES_2));
|
|
920
|
+
var numberInput1 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
911
921
|
id: "ruler_numberInput",
|
|
912
922
|
style: {
|
|
913
923
|
position: 'absolute',
|
|
@@ -915,7 +925,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
915
925
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
916
926
|
zIndex: 1000
|
|
917
927
|
}
|
|
918
|
-
}, /*#__PURE__*/
|
|
928
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
919
929
|
style: {
|
|
920
930
|
width: 150,
|
|
921
931
|
height: 50,
|
|
@@ -927,8 +937,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
927
937
|
},
|
|
928
938
|
value: distanceText1,
|
|
929
939
|
onChange: function onChange(event) {
|
|
930
|
-
var value = new Map({
|
|
931
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
940
|
+
var value = new _immutable.Map({
|
|
941
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
932
942
|
_length: event.target.value,
|
|
933
943
|
_unit: scene.rulerUnit
|
|
934
944
|
});
|
|
@@ -940,8 +950,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
940
950
|
projectActions.unselectAll();
|
|
941
951
|
break;
|
|
942
952
|
case 'ruler':
|
|
943
|
-
var _length = convert(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
944
|
-
var numberInput = /*#__PURE__*/
|
|
953
|
+
var _length = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
954
|
+
var numberInput = /*#__PURE__*/_react["default"].createElement("div", {
|
|
945
955
|
id: "ruler_numberInput",
|
|
946
956
|
style: {
|
|
947
957
|
position: 'absolute',
|
|
@@ -949,7 +959,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
949
959
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
950
960
|
zIndex: 1000
|
|
951
961
|
}
|
|
952
|
-
}, /*#__PURE__*/
|
|
962
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
953
963
|
style: {
|
|
954
964
|
width: 150,
|
|
955
965
|
height: 50,
|
|
@@ -959,10 +969,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
959
969
|
lineHeight: '22px',
|
|
960
970
|
fontWeight: 600
|
|
961
971
|
},
|
|
962
|
-
value: formatNumber(_length, DECIMAL_PLACES_2),
|
|
972
|
+
value: (0, _math.formatNumber)(_length, _constants.DECIMAL_PLACES_2),
|
|
963
973
|
onChange: function onChange(event) {
|
|
964
|
-
var value = new Map({
|
|
965
|
-
length: convert(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
974
|
+
var value = new _immutable.Map({
|
|
975
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
966
976
|
_length: event.target.value,
|
|
967
977
|
_unit: selectedLayer.unit
|
|
968
978
|
});
|
|
@@ -974,9 +984,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
974
984
|
projectActions.unselectAll();
|
|
975
985
|
break;
|
|
976
986
|
case 'twoHoleRuler':
|
|
977
|
-
var _lengthTwoHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
978
|
-
var distanceTextTwoHoleRuler = "".concat(formatNumber(_lengthTwoHoleRuler, DECIMAL_PLACES_2));
|
|
979
|
-
var numberInputTwoHoleRuler = /*#__PURE__*/
|
|
987
|
+
var _lengthTwoHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
988
|
+
var distanceTextTwoHoleRuler = "".concat((0, _math.formatNumber)(_lengthTwoHoleRuler, _constants.DECIMAL_PLACES_2));
|
|
989
|
+
var numberInputTwoHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
980
990
|
id: "ruler_numberInput",
|
|
981
991
|
style: {
|
|
982
992
|
position: 'absolute',
|
|
@@ -984,7 +994,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
984
994
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
985
995
|
zIndex: 1000
|
|
986
996
|
}
|
|
987
|
-
}, /*#__PURE__*/
|
|
997
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
988
998
|
style: {
|
|
989
999
|
width: 150,
|
|
990
1000
|
height: 50,
|
|
@@ -996,8 +1006,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
996
1006
|
},
|
|
997
1007
|
value: distanceTextTwoHoleRuler,
|
|
998
1008
|
onChange: function onChange(event) {
|
|
999
|
-
var value = new Map({
|
|
1000
|
-
length: convert(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1009
|
+
var value = new _immutable.Map({
|
|
1010
|
+
length: (0, _convertUnitsLite.convert)(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1001
1011
|
_length: event.target.value / 2,
|
|
1002
1012
|
_unit: scene.rulerUnit
|
|
1003
1013
|
});
|
|
@@ -1009,9 +1019,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1009
1019
|
projectActions.unselectAll();
|
|
1010
1020
|
break;
|
|
1011
1021
|
case 'leftHoleRuler':
|
|
1012
|
-
var _lengthLeftHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1022
|
+
var _lengthLeftHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1013
1023
|
var distanceTextLeftHoleRuler = "".concat(_lengthLeftHoleRuler.toFixed(2));
|
|
1014
|
-
var numberInputLeftHoleRuler = /*#__PURE__*/
|
|
1024
|
+
var numberInputLeftHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1015
1025
|
id: "ruler_numberInput",
|
|
1016
1026
|
style: {
|
|
1017
1027
|
position: 'absolute',
|
|
@@ -1019,7 +1029,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1019
1029
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1020
1030
|
zIndex: 1000
|
|
1021
1031
|
}
|
|
1022
|
-
}, /*#__PURE__*/
|
|
1032
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1023
1033
|
style: {
|
|
1024
1034
|
width: 150,
|
|
1025
1035
|
height: 50,
|
|
@@ -1031,8 +1041,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1031
1041
|
},
|
|
1032
1042
|
value: distanceTextLeftHoleRuler,
|
|
1033
1043
|
onChange: function onChange(event) {
|
|
1034
|
-
var value = new Map({
|
|
1035
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1044
|
+
var value = new _immutable.Map({
|
|
1045
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1036
1046
|
_length: event.target.value,
|
|
1037
1047
|
_unit: scene.rulerUnit
|
|
1038
1048
|
});
|
|
@@ -1044,9 +1054,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1044
1054
|
projectActions.unselectAll();
|
|
1045
1055
|
break;
|
|
1046
1056
|
case 'rulerHole':
|
|
1047
|
-
var _lengthRulerHole = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1048
|
-
var distanceTextRulerHole = "".concat(formatNumber(_lengthRulerHole, DECIMAL_PLACES_2));
|
|
1049
|
-
var numberInputRulerHole = /*#__PURE__*/
|
|
1057
|
+
var _lengthRulerHole = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1058
|
+
var distanceTextRulerHole = "".concat((0, _math.formatNumber)(_lengthRulerHole, _constants.DECIMAL_PLACES_2));
|
|
1059
|
+
var numberInputRulerHole = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1050
1060
|
id: "ruler_numberInput",
|
|
1051
1061
|
style: {
|
|
1052
1062
|
position: 'absolute',
|
|
@@ -1054,7 +1064,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1054
1064
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1055
1065
|
zIndex: 1000
|
|
1056
1066
|
}
|
|
1057
|
-
}, /*#__PURE__*/
|
|
1067
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1058
1068
|
style: {
|
|
1059
1069
|
width: 150,
|
|
1060
1070
|
height: 50,
|
|
@@ -1066,8 +1076,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1066
1076
|
},
|
|
1067
1077
|
value: distanceTextRulerHole,
|
|
1068
1078
|
onChange: function onChange(event) {
|
|
1069
|
-
var value = new Map({
|
|
1070
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1079
|
+
var value = new _immutable.Map({
|
|
1080
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1071
1081
|
_length: event.target.value,
|
|
1072
1082
|
_unit: scene.rulerUnit
|
|
1073
1083
|
});
|
|
@@ -1079,9 +1089,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1079
1089
|
projectActions.unselectAll();
|
|
1080
1090
|
break;
|
|
1081
1091
|
case 'rightHoleRuler':
|
|
1082
|
-
var _lengthRightHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1092
|
+
var _lengthRightHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1083
1093
|
var distanceTextRightHoleRuler = "".concat(_lengthRightHoleRuler.toFixed(2));
|
|
1084
|
-
var numberInputRightHoleRuler = /*#__PURE__*/
|
|
1094
|
+
var numberInputRightHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1085
1095
|
id: "ruler_numberInput",
|
|
1086
1096
|
style: {
|
|
1087
1097
|
position: 'absolute',
|
|
@@ -1089,7 +1099,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1089
1099
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1090
1100
|
zIndex: 1000
|
|
1091
1101
|
}
|
|
1092
|
-
}, /*#__PURE__*/
|
|
1102
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1093
1103
|
style: {
|
|
1094
1104
|
width: 150,
|
|
1095
1105
|
height: 50,
|
|
@@ -1101,8 +1111,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1101
1111
|
},
|
|
1102
1112
|
value: distanceTextRightHoleRuler,
|
|
1103
1113
|
onChange: function onChange(event) {
|
|
1104
|
-
var value = new Map({
|
|
1105
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1114
|
+
var value = new _immutable.Map({
|
|
1115
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1106
1116
|
_length: event.target.value,
|
|
1107
1117
|
_unit: scene.rulerUnit
|
|
1108
1118
|
});
|
|
@@ -1115,7 +1125,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1115
1125
|
break;
|
|
1116
1126
|
case 'angleChange':
|
|
1117
1127
|
var _length2 = elementData.length;
|
|
1118
|
-
var numberInput2 = /*#__PURE__*/
|
|
1128
|
+
var numberInput2 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1119
1129
|
id: "ruler_numberInput",
|
|
1120
1130
|
style: {
|
|
1121
1131
|
position: 'absolute',
|
|
@@ -1123,15 +1133,15 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1123
1133
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1124
1134
|
zIndex: 1000
|
|
1125
1135
|
}
|
|
1126
|
-
}, /*#__PURE__*/
|
|
1136
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1127
1137
|
style: {
|
|
1128
1138
|
width: 50,
|
|
1129
1139
|
height: 50
|
|
1130
1140
|
},
|
|
1131
1141
|
value: _length2,
|
|
1132
1142
|
onChange: function onChange(event) {
|
|
1133
|
-
var value = new Map({
|
|
1134
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1143
|
+
var value = new _immutable.Map({
|
|
1144
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1135
1145
|
_length: event.target.value,
|
|
1136
1146
|
_unit: scene.rulerUnit
|
|
1137
1147
|
});
|
|
@@ -1185,7 +1195,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1185
1195
|
break;
|
|
1186
1196
|
case constants.MODE_DRAGGING_ITEM:
|
|
1187
1197
|
itemsActions.updateMolding();
|
|
1188
|
-
projectActions.setMode(MODE_IDLE);
|
|
1198
|
+
projectActions.setMode(_constants.MODE_IDLE);
|
|
1189
1199
|
break;
|
|
1190
1200
|
case constants.MODE_DRAGGING_HOLE:
|
|
1191
1201
|
holesActions.endDraggingHole(x, y);
|
|
@@ -1230,16 +1240,16 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1230
1240
|
};
|
|
1231
1241
|
var onChangeTool = function onChangeTool(tool) {
|
|
1232
1242
|
switch (tool) {
|
|
1233
|
-
case TOOL_NONE:
|
|
1243
|
+
case _reactSvgPanZoom.TOOL_NONE:
|
|
1234
1244
|
projectActions.selectToolEdit();
|
|
1235
1245
|
break;
|
|
1236
|
-
case TOOL_PAN:
|
|
1246
|
+
case _reactSvgPanZoom.TOOL_PAN:
|
|
1237
1247
|
viewer2DActions.selectToolPan();
|
|
1238
1248
|
break;
|
|
1239
|
-
case TOOL_ZOOM_IN:
|
|
1249
|
+
case _reactSvgPanZoom.TOOL_ZOOM_IN:
|
|
1240
1250
|
viewer2DActions.selectToolZoomIn();
|
|
1241
1251
|
break;
|
|
1242
|
-
case TOOL_ZOOM_OUT:
|
|
1252
|
+
case _reactSvgPanZoom.TOOL_ZOOM_OUT:
|
|
1243
1253
|
viewer2DActions.selectToolZoomOut();
|
|
1244
1254
|
break;
|
|
1245
1255
|
}
|
|
@@ -1267,7 +1277,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1267
1277
|
var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
|
|
1268
1278
|
console.log('---render viewer2d');
|
|
1269
1279
|
console.log(viewer2D.isEmpty());
|
|
1270
|
-
return /*#__PURE__*/
|
|
1280
|
+
return /*#__PURE__*/_react["default"].createElement("div", null, rulerEdit, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1271
1281
|
style: {
|
|
1272
1282
|
margin: 0,
|
|
1273
1283
|
padding: 0,
|
|
@@ -1278,13 +1288,13 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1278
1288
|
gridTemplateRows: "".concat(rulerSize, "px ").concat(height - rulerSize, "px"),
|
|
1279
1289
|
position: 'relative'
|
|
1280
1290
|
}
|
|
1281
|
-
}, /*#__PURE__*/
|
|
1291
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1282
1292
|
style: {
|
|
1283
1293
|
gridColumn: 1,
|
|
1284
1294
|
gridRow: 1,
|
|
1285
1295
|
backgroundColor: rulerBgColor
|
|
1286
1296
|
}
|
|
1287
|
-
}), /*#__PURE__*/
|
|
1297
|
+
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
1288
1298
|
style: {
|
|
1289
1299
|
gridRow: 1,
|
|
1290
1300
|
gridColumn: 2,
|
|
@@ -1292,7 +1302,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1292
1302
|
overflow: 'hidden'
|
|
1293
1303
|
},
|
|
1294
1304
|
id: "rulerX"
|
|
1295
|
-
}, sceneWidth ? /*#__PURE__*/
|
|
1305
|
+
}, sceneWidth ? /*#__PURE__*/_react["default"].createElement(_export.RulerX, {
|
|
1296
1306
|
unitPixelSize: rulerUnitPixelSize,
|
|
1297
1307
|
zoom: sceneZoom,
|
|
1298
1308
|
mouseX: state.mouse.get('x'),
|
|
@@ -1303,7 +1313,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1303
1313
|
markerColor: rulerMkColor,
|
|
1304
1314
|
positiveUnitsNumber: rulerXElements,
|
|
1305
1315
|
negativeUnitsNumber: 0
|
|
1306
|
-
}) : null), /*#__PURE__*/
|
|
1316
|
+
}) : null), /*#__PURE__*/_react["default"].createElement("div", {
|
|
1307
1317
|
style: {
|
|
1308
1318
|
gridColumn: 1,
|
|
1309
1319
|
gridRow: 2,
|
|
@@ -1311,7 +1321,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1311
1321
|
overflow: 'hidden'
|
|
1312
1322
|
},
|
|
1313
1323
|
id: "rulerY"
|
|
1314
|
-
}, sceneHeight ? /*#__PURE__*/
|
|
1324
|
+
}, sceneHeight ? /*#__PURE__*/_react["default"].createElement(_export.RulerY, {
|
|
1315
1325
|
unitPixelSize: rulerUnitPixelSize,
|
|
1316
1326
|
zoom: sceneZoom,
|
|
1317
1327
|
mouseY: state.mouse.get('y'),
|
|
@@ -1322,7 +1332,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1322
1332
|
markerColor: rulerMkColor,
|
|
1323
1333
|
positiveUnitsNumber: rulerYElements,
|
|
1324
1334
|
negativeUnitsNumber: 0
|
|
1325
|
-
}) : null), /*#__PURE__*/
|
|
1335
|
+
}) : null), /*#__PURE__*/_react["default"].createElement(_reactSvgPanZoom.ReactSVGPanZoom, {
|
|
1326
1336
|
style: {
|
|
1327
1337
|
gridColumn: 2,
|
|
1328
1338
|
gridRow: 2
|
|
@@ -1346,30 +1356,30 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1346
1356
|
detectPinchGesture: false,
|
|
1347
1357
|
disableDoubleClickZoomWithToolAuto: true,
|
|
1348
1358
|
ref: Viewer
|
|
1349
|
-
}, /*#__PURE__*/
|
|
1359
|
+
}, /*#__PURE__*/_react["default"].createElement("svg", {
|
|
1350
1360
|
width: scene.width,
|
|
1351
1361
|
height: scene.height
|
|
1352
|
-
}, /*#__PURE__*/
|
|
1362
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("pattern", {
|
|
1353
1363
|
id: "diagonalFill",
|
|
1354
1364
|
patternUnits: "userSpaceOnUse",
|
|
1355
1365
|
width: "4",
|
|
1356
1366
|
height: "4",
|
|
1357
1367
|
fill: "#FFF"
|
|
1358
|
-
}, /*#__PURE__*/
|
|
1368
|
+
}, /*#__PURE__*/_react["default"].createElement("rect", {
|
|
1359
1369
|
x: "0",
|
|
1360
1370
|
y: "0",
|
|
1361
1371
|
width: "4",
|
|
1362
1372
|
height: "4",
|
|
1363
1373
|
fill: "#FFF"
|
|
1364
|
-
}), /*#__PURE__*/
|
|
1374
|
+
}), /*#__PURE__*/_react["default"].createElement("path", {
|
|
1365
1375
|
d: "M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2",
|
|
1366
1376
|
style: {
|
|
1367
1377
|
stroke: '#8E9BA2',
|
|
1368
1378
|
strokeWidth: 1
|
|
1369
1379
|
}
|
|
1370
|
-
}))), /*#__PURE__*/
|
|
1380
|
+
}))), /*#__PURE__*/_react["default"].createElement("g", {
|
|
1371
1381
|
style: Object.assign(mode2Cursor(mode), mode2PointerEvents(mode))
|
|
1372
|
-
}, /*#__PURE__*/
|
|
1382
|
+
}, /*#__PURE__*/_react["default"].createElement(_state["default"], {
|
|
1373
1383
|
state: state,
|
|
1374
1384
|
catalog: catalog,
|
|
1375
1385
|
viewer2DActions: viewer2DActions,
|
|
@@ -1377,17 +1387,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1377
1387
|
}))))));
|
|
1378
1388
|
}
|
|
1379
1389
|
Viewer2D.propTypes = {
|
|
1380
|
-
state:
|
|
1381
|
-
width:
|
|
1382
|
-
height:
|
|
1390
|
+
state: _propTypes["default"].object.isRequired,
|
|
1391
|
+
width: _propTypes["default"].number.isRequired,
|
|
1392
|
+
height: _propTypes["default"].number.isRequired
|
|
1383
1393
|
};
|
|
1384
1394
|
Viewer2D.contextTypes = {
|
|
1385
|
-
viewer2DActions:
|
|
1386
|
-
linesActions:
|
|
1387
|
-
holesActions:
|
|
1388
|
-
verticesActions:
|
|
1389
|
-
itemsActions:
|
|
1390
|
-
areaActions:
|
|
1391
|
-
projectActions:
|
|
1392
|
-
catalog:
|
|
1395
|
+
viewer2DActions: _propTypes["default"].object.isRequired,
|
|
1396
|
+
linesActions: _propTypes["default"].object.isRequired,
|
|
1397
|
+
holesActions: _propTypes["default"].object.isRequired,
|
|
1398
|
+
verticesActions: _propTypes["default"].object.isRequired,
|
|
1399
|
+
itemsActions: _propTypes["default"].object.isRequired,
|
|
1400
|
+
areaActions: _propTypes["default"].object.isRequired,
|
|
1401
|
+
projectActions: _propTypes["default"].object.isRequired,
|
|
1402
|
+
catalog: _propTypes["default"].object.isRequired
|
|
1393
1403
|
};
|