kitchen-simulator 1.1.1-test.71 → 1.1.1-test.72
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 +5 -2
- package/es/AppContext.js +6 -3
- package/es/KitchenConfigurator.js +86 -87
- package/es/KitchenConfiguratorApp.js +128 -135
- package/es/actions/area-actions.js +8 -5
- package/es/actions/export.js +24 -12
- package/es/actions/groups-actions.js +41 -27
- package/es/actions/holes-actions.js +51 -34
- package/es/actions/items-actions.js +141 -94
- package/es/actions/lines-actions.js +32 -21
- package/es/actions/project-actions.js +141 -94
- package/es/actions/scene-actions.js +17 -11
- package/es/actions/vertices-actions.js +11 -7
- package/es/actions/viewer2d-actions.js +32 -21
- package/es/actions/viewer3d-actions.js +14 -9
- package/es/catalog/areas/area/planner-element.js +5 -2
- package/es/catalog/catalog.js +17 -15
- package/es/catalog/factories/area-factory-3d.js +26 -22
- package/es/catalog/factories/area-factory.js +15 -13
- package/es/catalog/factories/export.js +10 -6
- package/es/catalog/factories/wall-factory-3d.js +36 -31
- package/es/catalog/factories/wall-factory.js +26 -21
- package/es/catalog/holes/door-closet/planner-element.js +19 -15
- package/es/catalog/holes/door-double/planner-element.js +19 -15
- package/es/catalog/holes/door-exterior/planner-element.js +20 -16
- package/es/catalog/holes/door-interior/planner-element.js +20 -16
- package/es/catalog/holes/door-panic/planner-element.js +11 -7
- package/es/catalog/holes/door-panic-double/planner-element.js +19 -15
- package/es/catalog/holes/door-sliding/planner-element.js +21 -17
- package/es/catalog/holes/doorway-framed/planner-element.js +15 -11
- package/es/catalog/holes/doorway-frameless/planner-element.js +11 -7
- package/es/catalog/holes/export.js +29 -13
- package/es/catalog/holes/window-clear/planner-element.js +14 -10
- package/es/catalog/holes/window-cross/planner-element.js +14 -10
- package/es/catalog/holes/window-double-hung/planner-element.js +14 -10
- package/es/catalog/holes/window-vertical/planner-element.js +14 -10
- package/es/catalog/lines/wall/planner-element.js +5 -2
- package/es/catalog/molding/molding-dcm/planner-element.js +9 -5
- package/es/catalog/molding/molding-fbm/planner-element.js +9 -5
- package/es/catalog/molding/molding-lrm/planner-element.js +9 -5
- package/es/catalog/properties/export.js +31 -20
- package/es/catalog/properties/property-checkbox.js +29 -28
- package/es/catalog/properties/property-color.js +19 -16
- package/es/catalog/properties/property-enum.js +27 -24
- package/es/catalog/properties/property-hidden.js +12 -9
- package/es/catalog/properties/property-lenght-measure.js +41 -38
- package/es/catalog/properties/property-length-measure.js +39 -36
- package/es/catalog/properties/property-length-measure_hole.js +41 -38
- package/es/catalog/properties/property-number.js +20 -17
- package/es/catalog/properties/property-read-only.js +19 -16
- package/es/catalog/properties/property-string.js +19 -16
- package/es/catalog/properties/property-toggle.js +19 -16
- package/es/catalog/properties/shared-property-style.js +3 -1
- package/es/catalog/utils/FuseUtils.js +13 -12
- package/es/catalog/utils/exporter.js +11 -10
- package/es/catalog/utils/geom-utils.js +24 -13
- package/es/catalog/utils/item-loader.js +92 -86
- package/es/catalog/utils/load-obj.js +24 -20
- package/es/catalog/utils/mtl-loader.js +4 -3
- package/es/catalog/utils/obj-loader.js +4 -3
- package/es/class/FuseUtils.js +13 -12
- package/es/class/area.js +24 -24
- package/es/class/export.js +36 -23
- package/es/class/group.js +55 -53
- package/es/class/guide.js +17 -15
- package/es/class/hole.js +85 -83
- package/es/class/item.js +155 -155
- package/es/class/layer.js +61 -59
- package/es/class/line.js +138 -135
- package/es/class/project.js +94 -93
- package/es/class/vertex.js +31 -29
- package/es/components/content.js +23 -19
- package/es/components/disclaimer/disclaimer.js +13 -10
- package/es/components/export.js +13 -8
- package/es/components/style/button.js +25 -25
- package/es/components/style/cancel-button.js +10 -7
- package/es/components/style/content-container.js +12 -11
- package/es/components/style/content-title.js +15 -13
- package/es/components/style/delete-button.js +12 -8
- package/es/components/style/export.js +46 -30
- package/es/components/style/form-block.js +11 -10
- package/es/components/style/form-color-input.js +10 -7
- package/es/components/style/form-label.js +11 -10
- package/es/components/style/form-number-input.js +43 -45
- package/es/components/style/form-number-input_2.js +39 -41
- package/es/components/style/form-select.js +20 -19
- package/es/components/style/form-slider.js +13 -10
- package/es/components/style/form-submit-button.js +12 -8
- package/es/components/style/form-text-input.js +28 -30
- package/es/components/viewer2d/area.js +20 -17
- package/es/components/viewer2d/export.js +46 -30
- package/es/components/viewer2d/grids/grid-horizontal-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-streak.js +13 -10
- package/es/components/viewer2d/grids/grid-vertical-streak.js +13 -10
- package/es/components/viewer2d/grids/grids.js +14 -10
- package/es/components/viewer2d/group.js +19 -15
- package/es/components/viewer2d/item.js +65 -61
- package/es/components/viewer2d/layer.js +26 -23
- package/es/components/viewer2d/line.js +106 -101
- package/es/components/viewer2d/ruler.js +25 -22
- package/es/components/viewer2d/rulerDist.js +24 -21
- package/es/components/viewer2d/rulerX.js +44 -46
- package/es/components/viewer2d/rulerY.js +42 -44
- package/es/components/viewer2d/scene.js +34 -35
- package/es/components/viewer2d/snap.js +17 -13
- package/es/components/viewer2d/state.js +22 -18
- package/es/components/viewer2d/utils.js +33 -24
- package/es/components/viewer2d/vertex.js +12 -8
- package/es/components/viewer2d/viewer2d.js +159 -156
- package/es/components/viewer3d/camera-controls-module/camera-controls.module.js +19 -21
- package/es/components/viewer3d/dcm.js +3 -1
- package/es/components/viewer3d/fbm.js +3 -1
- package/es/components/viewer3d/front3D.js +16 -12
- package/es/components/viewer3d/grid-creator.js +12 -8
- package/es/components/viewer3d/grids/grid-horizontal-streak.js +9 -6
- package/es/components/viewer3d/grids/grid-streak.js +8 -5
- package/es/components/viewer3d/grids/grid-vertical-streak.js +9 -6
- package/es/components/viewer3d/libs/first-person-controls.js +5 -2
- package/es/components/viewer3d/libs/helvetiker_regular.typeface.js +3 -1
- package/es/components/viewer3d/libs/mtl-loader.js +3 -1
- package/es/components/viewer3d/libs/obj-loader.js +3 -1
- package/es/components/viewer3d/libs/orbit-controls.js +4 -2
- package/es/components/viewer3d/libs/pointer-lock-controls.js +4 -2
- package/es/components/viewer3d/lrm.js +3 -1
- package/es/components/viewer3d/model.js +3 -1
- package/es/components/viewer3d/pointer-lock-navigation.js +6 -3
- package/es/components/viewer3d/ruler-utils/itemRect.js +21 -18
- package/es/components/viewer3d/ruler-utils/layer3D.js +62 -59
- package/es/components/viewer3d/ruler-utils/ruler3D.js +43 -42
- package/es/components/viewer3d/ruler-utils/scene3D.js +13 -9
- package/es/components/viewer3d/ruler-utils/state3D.js +7 -4
- package/es/components/viewer3d/scene-creator.js +223 -197
- package/es/components/viewer3d/three-memory-cleaner.js +7 -3
- package/es/components/viewer3d/viewer3d-first-person.js +42 -42
- package/es/components/viewer3d/viewer3d.js +198 -200
- package/es/constants.js +354 -349
- package/es/index.js +11 -7
- package/es/models.js +191 -193
- package/es/plugins/SVGLoader.js +49 -48
- package/es/plugins/autosave.js +5 -3
- package/es/plugins/console-debugger.js +7 -6
- package/es/plugins/export.js +13 -8
- package/es/plugins/keyboard.js +31 -29
- package/es/reducers/areas-reducer.js +9 -7
- package/es/reducers/export.js +37 -24
- package/es/reducers/groups-reducer.js +33 -31
- package/es/reducers/holes-reducer.js +45 -43
- package/es/reducers/items-reducer.js +108 -106
- package/es/reducers/lines-reducer.js +30 -28
- package/es/reducers/project-reducer.js +107 -105
- package/es/reducers/reducer.js +19 -16
- package/es/reducers/scene-reducer.js +17 -15
- package/es/reducers/user-reducer.js +7 -5
- package/es/reducers/vertices-reducer.js +13 -11
- package/es/reducers/viewer2d-reducer.js +20 -18
- package/es/reducers/viewer3d-reducer.js +18 -16
- package/es/shared-style.js +12 -10
- package/es/styles/export.js +6 -3
- package/es/translator/en.js +3 -1
- package/es/translator/it.js +3 -1
- package/es/translator/ru.js +3 -1
- package/es/translator/translator.js +15 -13
- package/es/utils/browser.js +5 -2
- package/es/utils/convert-units-lite.js +3 -1
- package/es/utils/email-validator.js +3 -1
- package/es/utils/export.js +29 -15
- package/es/utils/geometry.js +280 -190
- package/es/utils/get-edges-of-subgraphs.js +5 -2
- package/es/utils/graph-cycles.js +7 -8
- package/es/utils/graph-inner-cycles.js +14 -10
- package/es/utils/graph.js +13 -9
- package/es/utils/helper.js +58 -41
- package/es/utils/history.js +11 -8
- package/es/utils/id-broker.js +11 -8
- package/es/utils/logger.js +3 -1
- package/es/utils/math.js +8 -5
- package/es/utils/molding.js +146 -130
- package/es/utils/name-generator.js +9 -7
- package/es/utils/objects-utils.js +14 -7
- package/es/utils/phone-validator.js +3 -1
- package/es/utils/process-black-list.js +6 -5
- package/es/utils/react-if.js +9 -7
- package/es/utils/snap-scene.js +30 -27
- package/es/utils/snap.js +57 -53
- package/es/utils/summarizeCart.js +3 -1
- package/es/utils/threeCSG.es6.js +17 -13
- package/es/version.js +3 -1
- package/package.json +1 -1
|
@@ -1,22 +1,25 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
1
|
+
var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard")["default"];
|
|
2
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
|
|
3
|
+
exports.__esModule = true;
|
|
4
|
+
exports["default"] = Viewer2D;
|
|
5
|
+
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
|
|
6
|
+
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
7
|
+
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
|
|
8
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
10
|
+
var _reactSvgPanZoom = require("react-svg-pan-zoom");
|
|
11
|
+
var _constants = _interopRequireWildcard(require("../../constants"));
|
|
12
|
+
var constants = _constants;
|
|
13
|
+
var _state = _interopRequireDefault(require("./state"));
|
|
14
|
+
var SharedStyle = _interopRequireWildcard(require("../../shared-style"));
|
|
15
|
+
var _export = require("./export");
|
|
16
|
+
var _export2 = require("../../utils/export");
|
|
17
|
+
var _formNumberInput = _interopRequireDefault(require("../style/form-number-input"));
|
|
18
|
+
var _convertUnitsLite = require("../../utils/convert-units-lite");
|
|
19
|
+
var _immutable = require("immutable");
|
|
20
|
+
var _math = require("../../utils/math");
|
|
21
|
+
var _helper = require("../../utils/helper");
|
|
22
|
+
// variables
|
|
20
23
|
|
|
21
24
|
// variables
|
|
22
25
|
var pinFlag = false;
|
|
@@ -36,19 +39,19 @@ var allArea;
|
|
|
36
39
|
// /////////
|
|
37
40
|
function mode2Tool(mode) {
|
|
38
41
|
if (pinFlag) {
|
|
39
|
-
return TOOL_NONE;
|
|
42
|
+
return _reactSvgPanZoom.TOOL_NONE;
|
|
40
43
|
}
|
|
41
44
|
switch (mode) {
|
|
42
45
|
case constants.MODE_2D_PAN:
|
|
43
|
-
return TOOL_PAN;
|
|
46
|
+
return _reactSvgPanZoom.TOOL_PAN;
|
|
44
47
|
case constants.MODE_2D_ZOOM_IN:
|
|
45
|
-
return TOOL_ZOOM_IN;
|
|
48
|
+
return _reactSvgPanZoom.TOOL_ZOOM_IN;
|
|
46
49
|
case constants.MODE_2D_ZOOM_OUT:
|
|
47
|
-
return TOOL_ZOOM_OUT;
|
|
50
|
+
return _reactSvgPanZoom.TOOL_ZOOM_OUT;
|
|
48
51
|
case constants.MODE_IDLE:
|
|
49
|
-
return TOOL_AUTO;
|
|
52
|
+
return _reactSvgPanZoom.TOOL_AUTO;
|
|
50
53
|
default:
|
|
51
|
-
return TOOL_NONE;
|
|
54
|
+
return _reactSvgPanZoom.TOOL_NONE;
|
|
52
55
|
}
|
|
53
56
|
}
|
|
54
57
|
function mode2PointerEvents(mode) {
|
|
@@ -120,7 +123,7 @@ function extractElementData(node) {
|
|
|
120
123
|
direct: node.attributes.getNamedItem('data-direct') ? node.attributes.getNamedItem('data-direct').value : 0
|
|
121
124
|
};
|
|
122
125
|
}
|
|
123
|
-
|
|
126
|
+
function Viewer2D(_ref, _ref2) {
|
|
124
127
|
var state = _ref.state,
|
|
125
128
|
width = _ref.width,
|
|
126
129
|
height = _ref.height,
|
|
@@ -134,29 +137,29 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
134
137
|
areaActions = _ref2.areaActions,
|
|
135
138
|
projectActions = _ref2.projectActions,
|
|
136
139
|
catalog = _ref2.catalog;
|
|
137
|
-
var _useState = useState(null),
|
|
138
|
-
_useState2 =
|
|
140
|
+
var _useState = (0, _react.useState)(null),
|
|
141
|
+
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
139
142
|
rulerEdit = _useState2[0],
|
|
140
143
|
setRulerEdit = _useState2[1];
|
|
141
|
-
var _useState3 = useState(null),
|
|
142
|
-
_useState4 =
|
|
144
|
+
var _useState3 = (0, _react.useState)(null),
|
|
145
|
+
_useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
|
|
143
146
|
rulerEditID = _useState4[0],
|
|
144
147
|
setRulerEditID = _useState4[1];
|
|
145
|
-
var Viewer = useRef(null);
|
|
148
|
+
var Viewer = (0, _react.useRef)(null);
|
|
146
149
|
var viewer2D = state.viewer2D,
|
|
147
150
|
mode = state.mode,
|
|
148
151
|
scene = state.scene;
|
|
149
152
|
|
|
150
153
|
// let relatedLines = [];
|
|
151
|
-
var _useState5 = useState([]),
|
|
152
|
-
_useState6 =
|
|
154
|
+
var _useState5 = (0, _react.useState)([]),
|
|
155
|
+
_useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
|
|
153
156
|
relatedLines = _useState6[0],
|
|
154
157
|
setRelatedLines = _useState6[1];
|
|
155
|
-
var _useState7 = useState(false),
|
|
156
|
-
_useState8 =
|
|
158
|
+
var _useState7 = (0, _react.useState)(false),
|
|
159
|
+
_useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
|
|
157
160
|
drawStart = _useState8[0],
|
|
158
161
|
setdrawStart = _useState8[1];
|
|
159
|
-
useEffect(function () {
|
|
162
|
+
(0, _react.useEffect)(function () {
|
|
160
163
|
// move viewer point to center
|
|
161
164
|
var selectedLayer = state.scene.layers.get(state.scene.selectedLayer);
|
|
162
165
|
var vertices = selectedLayer.vertices;
|
|
@@ -178,7 +181,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
178
181
|
Viewer.current.setPointOnViewerCenter(moveX, moveY, viewer2D.get('a'));
|
|
179
182
|
}, []);
|
|
180
183
|
var layerID = scene.selectedLayer;
|
|
181
|
-
var wall_thickness = LINE_THICKNESS / 2;
|
|
184
|
+
var wall_thickness = _constants.LINE_THICKNESS / 2;
|
|
182
185
|
var layer = scene.getIn(['layers', layerID]);
|
|
183
186
|
var mapCursorPosition = function mapCursorPosition(_ref3) {
|
|
184
187
|
var x = _ref3.x,
|
|
@@ -195,15 +198,15 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
195
198
|
var prepareSnap = function prepareSnap() {
|
|
196
199
|
var layerID = scene.selectedLayer;
|
|
197
200
|
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);
|
|
201
|
+
allLines = _export2.GeometryUtils.getAllLines(layer);
|
|
202
|
+
allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, allLines);
|
|
203
|
+
allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, allLineRects);
|
|
204
|
+
allItemSnap = _export2.GeometryUtils.getAllItemSnap(allItemRect);
|
|
205
|
+
allLineSnap = _export2.GeometryUtils.getAllLineSnap(allLineRects, allItemRect.cur);
|
|
203
206
|
allRect = allItemRect.others.concat(allLineRects);
|
|
204
|
-
allItemSnap = GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
205
|
-
allLineSnap = GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
206
|
-
allArea = GeometryUtils.getAllArea(layer);
|
|
207
|
+
allItemSnap = _export2.GeometryUtils.validateSnaps(allItemSnap, allRect);
|
|
208
|
+
allLineSnap = _export2.GeometryUtils.validateSnaps(allLineSnap, allRect);
|
|
209
|
+
allArea = _export2.GeometryUtils.getAllArea(layer);
|
|
207
210
|
};
|
|
208
211
|
var updateRulerDistAttribute = function updateRulerDistAttribute(elementData, value) {
|
|
209
212
|
var newVal = value.get('length');
|
|
@@ -246,11 +249,11 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
246
249
|
var selectedLine = scene.getIn(['layers', elementData.layer, 'lines', elementData.id]).toJS();
|
|
247
250
|
var v_0 = scene.getIn(['layers', elementData.layer, 'vertices', selectedLine.vertices[0]]);
|
|
248
251
|
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 =
|
|
252
|
+
var _GeometryUtils$orderV = _export2.GeometryUtils.orderVertices([v_0, v_1]),
|
|
253
|
+
_GeometryUtils$orderV2 = (0, _slicedToArray2["default"])(_GeometryUtils$orderV, 2),
|
|
251
254
|
v_a = _GeometryUtils$orderV2[0],
|
|
252
255
|
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);
|
|
256
|
+
var v_b_new = _export2.GeometryUtils.extendLine(v_a.x, v_a.y, v_b.x, v_b.y, value.get('length'), 2);
|
|
254
257
|
|
|
255
258
|
// Blocked function that as wall changed, opposite wall should changed together.
|
|
256
259
|
// let layer = scene.getIn(['layers', elementData.layer]);
|
|
@@ -272,17 +275,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
272
275
|
lineLength: value
|
|
273
276
|
};
|
|
274
277
|
if (v_0 === v_a) {
|
|
275
|
-
attributesData =
|
|
278
|
+
attributesData = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, attributesData), {}, {
|
|
276
279
|
vertexTwo: v_b.merge(v_b_new),
|
|
277
280
|
vertexOne: v_a
|
|
278
281
|
});
|
|
279
282
|
} else {
|
|
280
|
-
attributesData =
|
|
283
|
+
attributesData = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, attributesData), {}, {
|
|
281
284
|
vertexOne: v_b.merge(v_b_new),
|
|
282
285
|
vertexTwo: v_a
|
|
283
286
|
});
|
|
284
287
|
}
|
|
285
|
-
var attributesFormData = new Map(
|
|
288
|
+
var attributesFormData = new _immutable.Map((0, _objectSpread2["default"])({}, attributesData));
|
|
286
289
|
setRulerEdit(null);
|
|
287
290
|
projectActions.setLinesAttributes(attributesFormData, true, {
|
|
288
291
|
layerID: elementData.layer,
|
|
@@ -366,7 +369,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
366
369
|
};
|
|
367
370
|
var getEndPoint = function getEndPoint(vertices, x, y, mode) {
|
|
368
371
|
var selLineID = state.getIn(['scene', 'layers', layerID, 'selected', 'lines']).first();
|
|
369
|
-
if (isEmpty(selLineID)) {
|
|
372
|
+
if ((0, _helper.isEmpty)(selLineID)) {
|
|
370
373
|
return {
|
|
371
374
|
isEndDrag: true,
|
|
372
375
|
x: x,
|
|
@@ -376,7 +379,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
376
379
|
var draggingLine = state.getIn(['scene', 'layers', layerID, 'lines', selLineID]).toJS();
|
|
377
380
|
var allLines = state.getIn(['scene', 'layers', layerID, 'lines']).toJS();
|
|
378
381
|
var dragVertexId = state.getIn(['draggingSupport', 'vertexID']);
|
|
379
|
-
dragVertexId = !isEmpty(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
382
|
+
dragVertexId = !(0, _helper.isEmpty)(dragVertexId) ? dragVertexId : draggingLine.vertices[1];
|
|
380
383
|
var vtx, vty;
|
|
381
384
|
var stepUnit = false;
|
|
382
385
|
vtx = vertices[dragVertexId].x;
|
|
@@ -387,7 +390,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
387
390
|
stepUnit = true;
|
|
388
391
|
}
|
|
389
392
|
var endDrag = [];
|
|
390
|
-
if (!isEmpty(relatedLines) && mode !== 'DRAGGING_LINE') {
|
|
393
|
+
if (!(0, _helper.isEmpty)(relatedLines) && mode !== 'DRAGGING_LINE') {
|
|
391
394
|
vertices[dragVertexId].x = x;
|
|
392
395
|
vertices[dragVertexId].y = y;
|
|
393
396
|
}
|
|
@@ -395,17 +398,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
395
398
|
if (draggingLine.vertices[0] !== draggingLine.vertices[1]) {
|
|
396
399
|
for (var i = 0; i < relatedLines.length; i++) {
|
|
397
400
|
var line = relatedLines[i];
|
|
398
|
-
lineAngle = GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
|
|
401
|
+
lineAngle = _export2.GeometryUtils.angleBetweenTwoLines(line, draggingLine, vertices);
|
|
399
402
|
absAngle = Math.abs(lineAngle);
|
|
400
403
|
var tmpRelated = [];
|
|
401
|
-
GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
|
|
404
|
+
_export2.GeometryUtils.getRelatedLines(tmpRelated, line, vertices, allLines, draggingLine.id);
|
|
402
405
|
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) {
|
|
406
|
+
var tmpAngle = Math.abs(_export2.GeometryUtils.angleBetweenTwoLines(tmpRelated[j], line, vertices));
|
|
407
|
+
if (tmpAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || tmpAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
405
408
|
endDrag.push(false);
|
|
406
409
|
} else endDrag.push(true);
|
|
407
410
|
}
|
|
408
|
-
if (absAngle < MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
411
|
+
if (absAngle < _constants.MIN_ANGLE_DISALLOW_DRAW_WALL || absAngle > 360 - _constants.MIN_ANGLE_DISALLOW_DRAW_WALL) {
|
|
409
412
|
endDrag.push(false);
|
|
410
413
|
} else endDrag.push(true);
|
|
411
414
|
}
|
|
@@ -416,7 +419,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
416
419
|
vtx = x;
|
|
417
420
|
vty = y;
|
|
418
421
|
} else {
|
|
419
|
-
var rest = MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
|
|
422
|
+
var rest = _constants.MIN_ANGLE_DISALLOW_DRAW_WALL - absAngle;
|
|
420
423
|
// the origin point of rotation(snapping)
|
|
421
424
|
var originVerId = draggingLine.vertices.findIndex(function (vertice) {
|
|
422
425
|
return vertice !== dragVertexId;
|
|
@@ -428,7 +431,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
428
431
|
// determine the direction of rotation.
|
|
429
432
|
rest = lineAngle > 0 ? -rest : rest;
|
|
430
433
|
// rotate the current point to last point around the first point of drawing line.
|
|
431
|
-
var res = GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
|
|
434
|
+
var res = _export2.GeometryUtils.rotatePointAroundPoint(x, y, ox, oy, rest);
|
|
432
435
|
vtx = res.x;
|
|
433
436
|
vty = res.y;
|
|
434
437
|
}
|
|
@@ -437,8 +440,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
437
440
|
// angle snapping as a value of UNIT_ANGLE
|
|
438
441
|
if (!endDrag.some(function (flag) {
|
|
439
442
|
return flag === false;
|
|
440
|
-
}) && !isEmpty(absAngle) && absAngle % UNIT_ANGLE !== 0 && stepUnit) {
|
|
441
|
-
var _result = GeometryUtils.snapAngleByUnit(lineAngle, vertices, draggingLine, vtx, vty, dragVertexId);
|
|
443
|
+
}) && !(0, _helper.isEmpty)(absAngle) && absAngle % _constants.UNIT_ANGLE !== 0 && stepUnit) {
|
|
444
|
+
var _result = _export2.GeometryUtils.snapAngleByUnit(lineAngle, vertices, draggingLine, vtx, vty, dragVertexId);
|
|
442
445
|
vtx = _result.x;
|
|
443
446
|
vty = _result.y;
|
|
444
447
|
}
|
|
@@ -454,7 +457,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
454
457
|
if (!(item !== null && item !== void 0 && (_item$properties = item.properties) !== null && _item$properties !== void 0 && _item$properties.getIn)) return 0;
|
|
455
458
|
var length = item.properties.getIn([property, '_length']);
|
|
456
459
|
var unit = item.properties.getIn([property, '_unit']);
|
|
457
|
-
return length && unit ? convert(length).from(unit).to('cm') : 0;
|
|
460
|
+
return length && unit ? (0, _convertUnitsLite.convert)(length).from(unit).to('cm') : 0;
|
|
458
461
|
};
|
|
459
462
|
var point = function point(x, y) {
|
|
460
463
|
return {
|
|
@@ -469,32 +472,32 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
469
472
|
var pointArray = [];
|
|
470
473
|
curItemInfo.rectCenterPoint.forEach(function (centerpoint) {
|
|
471
474
|
if (!Array.isArray(centerpoint) || centerpoint.length < 2) return;
|
|
472
|
-
var _centerpoint =
|
|
475
|
+
var _centerpoint = (0, _slicedToArray2["default"])(centerpoint, 2),
|
|
473
476
|
pt = _centerpoint[0],
|
|
474
477
|
angle = _centerpoint[1];
|
|
475
478
|
if (!pt) return;
|
|
476
479
|
|
|
477
480
|
// 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);
|
|
481
|
+
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
482
|
if (!rectLine) return;
|
|
480
483
|
var minDist;
|
|
481
484
|
allRect.forEach(function (linerect) {
|
|
482
485
|
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]);
|
|
486
|
+
var p0 = _export2.GeometryUtils.clone_point(linerect.rect[2]);
|
|
487
|
+
var p1 = _export2.GeometryUtils.clone_point(linerect.rect[3]);
|
|
485
488
|
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);
|
|
489
|
+
var lineFn = _export2.GeometryUtils.linePassingThroughTwoPoints(p0.x, p0.y, p1.x, p1.y);
|
|
487
490
|
if (!lineFn) return;
|
|
488
|
-
var ip = GeometryUtils.twoLinesIntersection(lineFn.a, lineFn.b, lineFn.c, rectLine.a, rectLine.b, rectLine.c);
|
|
491
|
+
var ip = _export2.GeometryUtils.twoLinesIntersection(lineFn.a, lineFn.b, lineFn.c, rectLine.a, rectLine.b, rectLine.c);
|
|
489
492
|
if (!ip) return;
|
|
490
493
|
|
|
491
494
|
// 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;
|
|
495
|
+
var segLen = _export2.GeometryUtils.pointsDistance(p0.x, p0.y, p1.x, p1.y);
|
|
496
|
+
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
497
|
|
|
495
498
|
// 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);
|
|
499
|
+
var distToCenter = _export2.GeometryUtils.pointsDistance(ip.x, ip.y, x, y);
|
|
500
|
+
var baseDist = _export2.GeometryUtils.pointsDistance(pt.x, pt.y, ip.x, ip.y);
|
|
498
501
|
if (distToCenter <= baseDist) return;
|
|
499
502
|
var candidate = baseDist;
|
|
500
503
|
minDist = minDist !== undefined ? Math.min(minDist, candidate) : candidate;
|
|
@@ -551,12 +554,12 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
551
554
|
};
|
|
552
555
|
|
|
553
556
|
// collect geometry
|
|
554
|
-
var _allLines = GeometryUtils.getAllLines(layer) || [];
|
|
555
|
-
var _allLineRects = GeometryUtils.buildRectFromLines(layer, _allLines) || [];
|
|
556
|
-
var _allItemRect = GeometryUtils.getAllItems(scene, catalog, _allLineRects) || {
|
|
557
|
+
var _allLines = _export2.GeometryUtils.getAllLines(layer) || [];
|
|
558
|
+
var _allLineRects = _export2.GeometryUtils.buildRectFromLines(layer, _allLines) || [];
|
|
559
|
+
var _allItemRect = _export2.GeometryUtils.getAllItems(scene, catalog, _allLineRects) || {
|
|
557
560
|
others: []
|
|
558
561
|
};
|
|
559
|
-
var _allRect = [].concat(
|
|
562
|
+
var _allRect = [].concat((0, _toConsumableArray2["default"])(_allItemRect.others || []), (0, _toConsumableArray2["default"])(_allLineRects));
|
|
560
563
|
|
|
561
564
|
// current item
|
|
562
565
|
var curItemInfo = getCalcRectFromItem(val);
|
|
@@ -633,7 +636,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
633
636
|
endPoint.y = y;
|
|
634
637
|
} else {
|
|
635
638
|
prepareSnap();
|
|
636
|
-
var _GeometryUtils$calcSn = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
639
|
+
var _GeometryUtils$calcSn = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
637
640
|
nx = _GeometryUtils$calcSn.nx,
|
|
638
641
|
ny = _GeometryUtils$calcSn.ny,
|
|
639
642
|
rot = _GeometryUtils$calcSn.rot,
|
|
@@ -648,10 +651,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
648
651
|
layoutpos: allItemRect.cur && allItemRect.cur.layoutpos,
|
|
649
652
|
is_corner: allItemRect.cur && allItemRect.cur.is_corner
|
|
650
653
|
};
|
|
651
|
-
var _GeometryUtils$getAll = GeometryUtils.getAllHoleRect(scene, _val),
|
|
654
|
+
var _GeometryUtils$getAll = _export2.GeometryUtils.getAllHoleRect(scene, _val),
|
|
652
655
|
_isSect = _GeometryUtils$getAll.isSect,
|
|
653
656
|
_snap = _GeometryUtils$getAll.snap;
|
|
654
|
-
if (!isEmpty(_snap) && _isSect) {
|
|
657
|
+
if (!(0, _helper.isEmpty)(_snap) && _isSect) {
|
|
655
658
|
if (_snap.length == 1) _val.pos = {
|
|
656
659
|
x: _snap[0].x,
|
|
657
660
|
y: _snap[0].y
|
|
@@ -664,7 +667,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
664
667
|
y: _snap[1].y
|
|
665
668
|
};
|
|
666
669
|
}
|
|
667
|
-
var interSect = GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
670
|
+
var interSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
668
671
|
if (interSect) {
|
|
669
672
|
nx = _val.pos.x;
|
|
670
673
|
ny = _val.pos.y;
|
|
@@ -674,7 +677,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
674
677
|
x: nx,
|
|
675
678
|
y: ny
|
|
676
679
|
};
|
|
677
|
-
var _isrectSect = GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
680
|
+
var _isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, _val);
|
|
678
681
|
if (_isrectSect && _isSect) {
|
|
679
682
|
itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
|
|
680
683
|
itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
|
|
@@ -709,7 +712,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
709
712
|
case constants.MODE_DRAGGING_ITEM:
|
|
710
713
|
calcDistanceArray();
|
|
711
714
|
prepareSnap();
|
|
712
|
-
var _GeometryUtils$calcSn2 = GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
715
|
+
var _GeometryUtils$calcSn2 = _export2.GeometryUtils.calcSnap(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect, x, y, allArea),
|
|
713
716
|
nx = _GeometryUtils$calcSn2.nx,
|
|
714
717
|
ny = _GeometryUtils$calcSn2.ny,
|
|
715
718
|
rot = _GeometryUtils$calcSn2.rot,
|
|
@@ -724,10 +727,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
724
727
|
layoutpos: allItemRect.cur && allItemRect.cur.layoutpos,
|
|
725
728
|
is_corner: allItemRect.cur && allItemRect.cur.is_corner
|
|
726
729
|
};
|
|
727
|
-
var _GeometryUtils$getAll2 = GeometryUtils.getAllHoleRect(scene, val),
|
|
730
|
+
var _GeometryUtils$getAll2 = _export2.GeometryUtils.getAllHoleRect(scene, val),
|
|
728
731
|
isSect = _GeometryUtils$getAll2.isSect,
|
|
729
732
|
snap = _GeometryUtils$getAll2.snap;
|
|
730
|
-
if (!isEmpty(snap) && isSect) {
|
|
733
|
+
if (!(0, _helper.isEmpty)(snap) && isSect) {
|
|
731
734
|
if (snap.length == 1) val.pos = {
|
|
732
735
|
x: snap[0].x,
|
|
733
736
|
y: snap[0].y
|
|
@@ -740,7 +743,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
740
743
|
y: snap[1].y
|
|
741
744
|
};
|
|
742
745
|
}
|
|
743
|
-
var _interSect = GeometryUtils.validInterSect(allItemRect.others, val);
|
|
746
|
+
var _interSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
|
|
744
747
|
if (_interSect) {
|
|
745
748
|
nx = val.pos.x;
|
|
746
749
|
ny = val.pos.y;
|
|
@@ -750,7 +753,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
750
753
|
x: nx,
|
|
751
754
|
y: ny
|
|
752
755
|
};
|
|
753
|
-
var isrectSect = GeometryUtils.validInterSect(allItemRect.others, val);
|
|
756
|
+
var isrectSect = _export2.GeometryUtils.validInterSect(allItemRect.others, val);
|
|
754
757
|
if (isrectSect && isSect) {
|
|
755
758
|
itemsActions.updateDraggingItemChanged(nx, ny, layerID, current_sel_obj_id);
|
|
756
759
|
itemsActions.updateRotatingItemChanged(rot, layerID, current_sel_obj_id);
|
|
@@ -870,7 +873,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
870
873
|
break;
|
|
871
874
|
} else if (elementData.part === 'elevation') {
|
|
872
875
|
// handle action when click elevation about selected line
|
|
873
|
-
var _mode = MODE_ELEVATION_VIEW;
|
|
876
|
+
var _mode = _constants.MODE_ELEVATION_VIEW;
|
|
874
877
|
projectActions.setMode(_mode);
|
|
875
878
|
break;
|
|
876
879
|
} else {
|
|
@@ -905,9 +908,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
905
908
|
break;
|
|
906
909
|
}
|
|
907
910
|
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__*/
|
|
911
|
+
var _length1 = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
912
|
+
var distanceText1 = "".concat((0, _math.formatNumber)(_length1, _constants.DECIMAL_PLACES_2));
|
|
913
|
+
var numberInput1 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
911
914
|
id: "ruler_numberInput",
|
|
912
915
|
style: {
|
|
913
916
|
position: 'absolute',
|
|
@@ -915,7 +918,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
915
918
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
916
919
|
zIndex: 1000
|
|
917
920
|
}
|
|
918
|
-
}, /*#__PURE__*/
|
|
921
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
919
922
|
style: {
|
|
920
923
|
width: 150,
|
|
921
924
|
height: 50,
|
|
@@ -927,8 +930,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
927
930
|
},
|
|
928
931
|
value: distanceText1,
|
|
929
932
|
onChange: function onChange(event) {
|
|
930
|
-
var value = new Map({
|
|
931
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
933
|
+
var value = new _immutable.Map({
|
|
934
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
932
935
|
_length: event.target.value,
|
|
933
936
|
_unit: scene.rulerUnit
|
|
934
937
|
});
|
|
@@ -940,8 +943,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
940
943
|
projectActions.unselectAll();
|
|
941
944
|
break;
|
|
942
945
|
case 'ruler':
|
|
943
|
-
var _length = convert(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
944
|
-
var numberInput = /*#__PURE__*/
|
|
946
|
+
var _length = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(selectedLayer.unit);
|
|
947
|
+
var numberInput = /*#__PURE__*/_react["default"].createElement("div", {
|
|
945
948
|
id: "ruler_numberInput",
|
|
946
949
|
style: {
|
|
947
950
|
position: 'absolute',
|
|
@@ -949,7 +952,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
949
952
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
950
953
|
zIndex: 1000
|
|
951
954
|
}
|
|
952
|
-
}, /*#__PURE__*/
|
|
955
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
953
956
|
style: {
|
|
954
957
|
width: 150,
|
|
955
958
|
height: 50,
|
|
@@ -959,10 +962,10 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
959
962
|
lineHeight: '22px',
|
|
960
963
|
fontWeight: 600
|
|
961
964
|
},
|
|
962
|
-
value: formatNumber(_length, DECIMAL_PLACES_2),
|
|
965
|
+
value: (0, _math.formatNumber)(_length, _constants.DECIMAL_PLACES_2),
|
|
963
966
|
onChange: function onChange(event) {
|
|
964
|
-
var value = new Map({
|
|
965
|
-
length: convert(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
967
|
+
var value = new _immutable.Map({
|
|
968
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(selectedLayer.unit).to(scene.unit),
|
|
966
969
|
_length: event.target.value,
|
|
967
970
|
_unit: selectedLayer.unit
|
|
968
971
|
});
|
|
@@ -974,9 +977,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
974
977
|
projectActions.unselectAll();
|
|
975
978
|
break;
|
|
976
979
|
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__*/
|
|
980
|
+
var _lengthTwoHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
981
|
+
var distanceTextTwoHoleRuler = "".concat((0, _math.formatNumber)(_lengthTwoHoleRuler, _constants.DECIMAL_PLACES_2));
|
|
982
|
+
var numberInputTwoHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
980
983
|
id: "ruler_numberInput",
|
|
981
984
|
style: {
|
|
982
985
|
position: 'absolute',
|
|
@@ -984,7 +987,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
984
987
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
985
988
|
zIndex: 1000
|
|
986
989
|
}
|
|
987
|
-
}, /*#__PURE__*/
|
|
990
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
988
991
|
style: {
|
|
989
992
|
width: 150,
|
|
990
993
|
height: 50,
|
|
@@ -996,8 +999,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
996
999
|
},
|
|
997
1000
|
value: distanceTextTwoHoleRuler,
|
|
998
1001
|
onChange: function onChange(event) {
|
|
999
|
-
var value = new Map({
|
|
1000
|
-
length: convert(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1002
|
+
var value = new _immutable.Map({
|
|
1003
|
+
length: (0, _convertUnitsLite.convert)(event.target.value / 2).from(scene.rulerUnit).to(scene.unit),
|
|
1001
1004
|
_length: event.target.value / 2,
|
|
1002
1005
|
_unit: scene.rulerUnit
|
|
1003
1006
|
});
|
|
@@ -1009,9 +1012,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1009
1012
|
projectActions.unselectAll();
|
|
1010
1013
|
break;
|
|
1011
1014
|
case 'leftHoleRuler':
|
|
1012
|
-
var _lengthLeftHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1015
|
+
var _lengthLeftHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1013
1016
|
var distanceTextLeftHoleRuler = "".concat(_lengthLeftHoleRuler.toFixed(2));
|
|
1014
|
-
var numberInputLeftHoleRuler = /*#__PURE__*/
|
|
1017
|
+
var numberInputLeftHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1015
1018
|
id: "ruler_numberInput",
|
|
1016
1019
|
style: {
|
|
1017
1020
|
position: 'absolute',
|
|
@@ -1019,7 +1022,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1019
1022
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1020
1023
|
zIndex: 1000
|
|
1021
1024
|
}
|
|
1022
|
-
}, /*#__PURE__*/
|
|
1025
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1023
1026
|
style: {
|
|
1024
1027
|
width: 150,
|
|
1025
1028
|
height: 50,
|
|
@@ -1031,8 +1034,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1031
1034
|
},
|
|
1032
1035
|
value: distanceTextLeftHoleRuler,
|
|
1033
1036
|
onChange: function onChange(event) {
|
|
1034
|
-
var value = new Map({
|
|
1035
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1037
|
+
var value = new _immutable.Map({
|
|
1038
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1036
1039
|
_length: event.target.value,
|
|
1037
1040
|
_unit: scene.rulerUnit
|
|
1038
1041
|
});
|
|
@@ -1044,9 +1047,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1044
1047
|
projectActions.unselectAll();
|
|
1045
1048
|
break;
|
|
1046
1049
|
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__*/
|
|
1050
|
+
var _lengthRulerHole = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1051
|
+
var distanceTextRulerHole = "".concat((0, _math.formatNumber)(_lengthRulerHole, _constants.DECIMAL_PLACES_2));
|
|
1052
|
+
var numberInputRulerHole = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1050
1053
|
id: "ruler_numberInput",
|
|
1051
1054
|
style: {
|
|
1052
1055
|
position: 'absolute',
|
|
@@ -1054,7 +1057,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1054
1057
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1055
1058
|
zIndex: 1000
|
|
1056
1059
|
}
|
|
1057
|
-
}, /*#__PURE__*/
|
|
1060
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1058
1061
|
style: {
|
|
1059
1062
|
width: 150,
|
|
1060
1063
|
height: 50,
|
|
@@ -1066,8 +1069,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1066
1069
|
},
|
|
1067
1070
|
value: distanceTextRulerHole,
|
|
1068
1071
|
onChange: function onChange(event) {
|
|
1069
|
-
var value = new Map({
|
|
1070
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1072
|
+
var value = new _immutable.Map({
|
|
1073
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1071
1074
|
_length: event.target.value,
|
|
1072
1075
|
_unit: scene.rulerUnit
|
|
1073
1076
|
});
|
|
@@ -1079,9 +1082,9 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1079
1082
|
projectActions.unselectAll();
|
|
1080
1083
|
break;
|
|
1081
1084
|
case 'rightHoleRuler':
|
|
1082
|
-
var _lengthRightHoleRuler = convert(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1085
|
+
var _lengthRightHoleRuler = (0, _convertUnitsLite.convert)(elementData.length).from(scene.unit).to(scene.rulerUnit);
|
|
1083
1086
|
var distanceTextRightHoleRuler = "".concat(_lengthRightHoleRuler.toFixed(2));
|
|
1084
|
-
var numberInputRightHoleRuler = /*#__PURE__*/
|
|
1087
|
+
var numberInputRightHoleRuler = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1085
1088
|
id: "ruler_numberInput",
|
|
1086
1089
|
style: {
|
|
1087
1090
|
position: 'absolute',
|
|
@@ -1089,7 +1092,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1089
1092
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1090
1093
|
zIndex: 1000
|
|
1091
1094
|
}
|
|
1092
|
-
}, /*#__PURE__*/
|
|
1095
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1093
1096
|
style: {
|
|
1094
1097
|
width: 150,
|
|
1095
1098
|
height: 50,
|
|
@@ -1101,8 +1104,8 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1101
1104
|
},
|
|
1102
1105
|
value: distanceTextRightHoleRuler,
|
|
1103
1106
|
onChange: function onChange(event) {
|
|
1104
|
-
var value = new Map({
|
|
1105
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1107
|
+
var value = new _immutable.Map({
|
|
1108
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1106
1109
|
_length: event.target.value,
|
|
1107
1110
|
_unit: scene.rulerUnit
|
|
1108
1111
|
});
|
|
@@ -1115,7 +1118,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1115
1118
|
break;
|
|
1116
1119
|
case 'angleChange':
|
|
1117
1120
|
var _length2 = elementData.length;
|
|
1118
|
-
var numberInput2 = /*#__PURE__*/
|
|
1121
|
+
var numberInput2 = /*#__PURE__*/_react["default"].createElement("div", {
|
|
1119
1122
|
id: "ruler_numberInput",
|
|
1120
1123
|
style: {
|
|
1121
1124
|
position: 'absolute',
|
|
@@ -1123,15 +1126,15 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1123
1126
|
top: bbox.top - (50 - bbox.height) / 2,
|
|
1124
1127
|
zIndex: 1000
|
|
1125
1128
|
}
|
|
1126
|
-
}, /*#__PURE__*/
|
|
1129
|
+
}, /*#__PURE__*/_react["default"].createElement(_formNumberInput["default"], {
|
|
1127
1130
|
style: {
|
|
1128
1131
|
width: 50,
|
|
1129
1132
|
height: 50
|
|
1130
1133
|
},
|
|
1131
1134
|
value: _length2,
|
|
1132
1135
|
onChange: function onChange(event) {
|
|
1133
|
-
var value = new Map({
|
|
1134
|
-
length: convert(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1136
|
+
var value = new _immutable.Map({
|
|
1137
|
+
length: (0, _convertUnitsLite.convert)(event.target.value).from(scene.rulerUnit).to(scene.unit),
|
|
1135
1138
|
_length: event.target.value,
|
|
1136
1139
|
_unit: scene.rulerUnit
|
|
1137
1140
|
});
|
|
@@ -1185,7 +1188,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1185
1188
|
break;
|
|
1186
1189
|
case constants.MODE_DRAGGING_ITEM:
|
|
1187
1190
|
itemsActions.updateMolding();
|
|
1188
|
-
projectActions.setMode(MODE_IDLE);
|
|
1191
|
+
projectActions.setMode(_constants.MODE_IDLE);
|
|
1189
1192
|
break;
|
|
1190
1193
|
case constants.MODE_DRAGGING_HOLE:
|
|
1191
1194
|
holesActions.endDraggingHole(x, y);
|
|
@@ -1230,16 +1233,16 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1230
1233
|
};
|
|
1231
1234
|
var onChangeTool = function onChangeTool(tool) {
|
|
1232
1235
|
switch (tool) {
|
|
1233
|
-
case TOOL_NONE:
|
|
1236
|
+
case _reactSvgPanZoom.TOOL_NONE:
|
|
1234
1237
|
projectActions.selectToolEdit();
|
|
1235
1238
|
break;
|
|
1236
|
-
case TOOL_PAN:
|
|
1239
|
+
case _reactSvgPanZoom.TOOL_PAN:
|
|
1237
1240
|
viewer2DActions.selectToolPan();
|
|
1238
1241
|
break;
|
|
1239
|
-
case TOOL_ZOOM_IN:
|
|
1242
|
+
case _reactSvgPanZoom.TOOL_ZOOM_IN:
|
|
1240
1243
|
viewer2DActions.selectToolZoomIn();
|
|
1241
1244
|
break;
|
|
1242
|
-
case TOOL_ZOOM_OUT:
|
|
1245
|
+
case _reactSvgPanZoom.TOOL_ZOOM_OUT:
|
|
1243
1246
|
viewer2DActions.selectToolZoomOut();
|
|
1244
1247
|
break;
|
|
1245
1248
|
}
|
|
@@ -1267,7 +1270,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1267
1270
|
var rulerYElements = Math.ceil(sceneHeight / rulerUnitPixelSize) + 1;
|
|
1268
1271
|
console.log('---render viewer2d');
|
|
1269
1272
|
console.log(viewer2D.isEmpty());
|
|
1270
|
-
return /*#__PURE__*/
|
|
1273
|
+
return /*#__PURE__*/_react["default"].createElement("div", null, rulerEdit, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1271
1274
|
style: {
|
|
1272
1275
|
margin: 0,
|
|
1273
1276
|
padding: 0,
|
|
@@ -1278,13 +1281,13 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1278
1281
|
gridTemplateRows: "".concat(rulerSize, "px ").concat(height - rulerSize, "px"),
|
|
1279
1282
|
position: 'relative'
|
|
1280
1283
|
}
|
|
1281
|
-
}, /*#__PURE__*/
|
|
1284
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
1282
1285
|
style: {
|
|
1283
1286
|
gridColumn: 1,
|
|
1284
1287
|
gridRow: 1,
|
|
1285
1288
|
backgroundColor: rulerBgColor
|
|
1286
1289
|
}
|
|
1287
|
-
}), /*#__PURE__*/
|
|
1290
|
+
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
1288
1291
|
style: {
|
|
1289
1292
|
gridRow: 1,
|
|
1290
1293
|
gridColumn: 2,
|
|
@@ -1292,7 +1295,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1292
1295
|
overflow: 'hidden'
|
|
1293
1296
|
},
|
|
1294
1297
|
id: "rulerX"
|
|
1295
|
-
}, sceneWidth ? /*#__PURE__*/
|
|
1298
|
+
}, sceneWidth ? /*#__PURE__*/_react["default"].createElement(_export.RulerX, {
|
|
1296
1299
|
unitPixelSize: rulerUnitPixelSize,
|
|
1297
1300
|
zoom: sceneZoom,
|
|
1298
1301
|
mouseX: state.mouse.get('x'),
|
|
@@ -1303,7 +1306,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1303
1306
|
markerColor: rulerMkColor,
|
|
1304
1307
|
positiveUnitsNumber: rulerXElements,
|
|
1305
1308
|
negativeUnitsNumber: 0
|
|
1306
|
-
}) : null), /*#__PURE__*/
|
|
1309
|
+
}) : null), /*#__PURE__*/_react["default"].createElement("div", {
|
|
1307
1310
|
style: {
|
|
1308
1311
|
gridColumn: 1,
|
|
1309
1312
|
gridRow: 2,
|
|
@@ -1311,7 +1314,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1311
1314
|
overflow: 'hidden'
|
|
1312
1315
|
},
|
|
1313
1316
|
id: "rulerY"
|
|
1314
|
-
}, sceneHeight ? /*#__PURE__*/
|
|
1317
|
+
}, sceneHeight ? /*#__PURE__*/_react["default"].createElement(_export.RulerY, {
|
|
1315
1318
|
unitPixelSize: rulerUnitPixelSize,
|
|
1316
1319
|
zoom: sceneZoom,
|
|
1317
1320
|
mouseY: state.mouse.get('y'),
|
|
@@ -1322,7 +1325,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1322
1325
|
markerColor: rulerMkColor,
|
|
1323
1326
|
positiveUnitsNumber: rulerYElements,
|
|
1324
1327
|
negativeUnitsNumber: 0
|
|
1325
|
-
}) : null), /*#__PURE__*/
|
|
1328
|
+
}) : null), /*#__PURE__*/_react["default"].createElement(_reactSvgPanZoom.ReactSVGPanZoom, {
|
|
1326
1329
|
style: {
|
|
1327
1330
|
gridColumn: 2,
|
|
1328
1331
|
gridRow: 2
|
|
@@ -1346,30 +1349,30 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1346
1349
|
detectPinchGesture: false,
|
|
1347
1350
|
disableDoubleClickZoomWithToolAuto: true,
|
|
1348
1351
|
ref: Viewer
|
|
1349
|
-
}, /*#__PURE__*/
|
|
1352
|
+
}, /*#__PURE__*/_react["default"].createElement("svg", {
|
|
1350
1353
|
width: scene.width,
|
|
1351
1354
|
height: scene.height
|
|
1352
|
-
}, /*#__PURE__*/
|
|
1355
|
+
}, /*#__PURE__*/_react["default"].createElement("defs", null, /*#__PURE__*/_react["default"].createElement("pattern", {
|
|
1353
1356
|
id: "diagonalFill",
|
|
1354
1357
|
patternUnits: "userSpaceOnUse",
|
|
1355
1358
|
width: "4",
|
|
1356
1359
|
height: "4",
|
|
1357
1360
|
fill: "#FFF"
|
|
1358
|
-
}, /*#__PURE__*/
|
|
1361
|
+
}, /*#__PURE__*/_react["default"].createElement("rect", {
|
|
1359
1362
|
x: "0",
|
|
1360
1363
|
y: "0",
|
|
1361
1364
|
width: "4",
|
|
1362
1365
|
height: "4",
|
|
1363
1366
|
fill: "#FFF"
|
|
1364
|
-
}), /*#__PURE__*/
|
|
1367
|
+
}), /*#__PURE__*/_react["default"].createElement("path", {
|
|
1365
1368
|
d: "M-1,1 l2,-2 M0,4 l4,-4 M3,5 l2,-2",
|
|
1366
1369
|
style: {
|
|
1367
1370
|
stroke: '#8E9BA2',
|
|
1368
1371
|
strokeWidth: 1
|
|
1369
1372
|
}
|
|
1370
|
-
}))), /*#__PURE__*/
|
|
1373
|
+
}))), /*#__PURE__*/_react["default"].createElement("g", {
|
|
1371
1374
|
style: Object.assign(mode2Cursor(mode), mode2PointerEvents(mode))
|
|
1372
|
-
}, /*#__PURE__*/
|
|
1375
|
+
}, /*#__PURE__*/_react["default"].createElement(_state["default"], {
|
|
1373
1376
|
state: state,
|
|
1374
1377
|
catalog: catalog,
|
|
1375
1378
|
viewer2DActions: viewer2DActions,
|
|
@@ -1377,17 +1380,17 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
1377
1380
|
}))))));
|
|
1378
1381
|
}
|
|
1379
1382
|
Viewer2D.propTypes = {
|
|
1380
|
-
state:
|
|
1381
|
-
width:
|
|
1382
|
-
height:
|
|
1383
|
+
state: _propTypes["default"].object.isRequired,
|
|
1384
|
+
width: _propTypes["default"].number.isRequired,
|
|
1385
|
+
height: _propTypes["default"].number.isRequired
|
|
1383
1386
|
};
|
|
1384
1387
|
Viewer2D.contextTypes = {
|
|
1385
|
-
viewer2DActions:
|
|
1386
|
-
linesActions:
|
|
1387
|
-
holesActions:
|
|
1388
|
-
verticesActions:
|
|
1389
|
-
itemsActions:
|
|
1390
|
-
areaActions:
|
|
1391
|
-
projectActions:
|
|
1392
|
-
catalog:
|
|
1388
|
+
viewer2DActions: _propTypes["default"].object.isRequired,
|
|
1389
|
+
linesActions: _propTypes["default"].object.isRequired,
|
|
1390
|
+
holesActions: _propTypes["default"].object.isRequired,
|
|
1391
|
+
verticesActions: _propTypes["default"].object.isRequired,
|
|
1392
|
+
itemsActions: _propTypes["default"].object.isRequired,
|
|
1393
|
+
areaActions: _propTypes["default"].object.isRequired,
|
|
1394
|
+
projectActions: _propTypes["default"].object.isRequired,
|
|
1395
|
+
catalog: _propTypes["default"].object.isRequired
|
|
1393
1396
|
};
|