kitchen-simulator 4.0.7 → 4.0.8
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/catalog/utils/exporter.js +23 -11
- package/es/class/project.js +2 -0
- package/es/components/viewer2d/rulerDist.js +1 -1
- package/es/components/viewer2d/viewer2d.js +1 -0
- package/es/components/viewer3d/scene-creator.js +18 -21
- package/es/components/viewer3d/viewer3d.js +4 -2
- package/es/constants.js +1 -0
- package/es/index.js +1 -1
- package/es/models.js +10 -6
- package/es/reducers/viewer2d-reducer.js +3 -1
- package/es/reducers/viewer3d-reducer.js +3 -1
- package/es/utils/geometry.js +6 -6
- package/lib/catalog/utils/exporter.js +23 -11
- package/lib/class/project.js +2 -0
- package/lib/components/viewer2d/rulerDist.js +1 -1
- package/lib/components/viewer2d/viewer2d.js +1 -0
- package/lib/components/viewer3d/scene-creator.js +18 -21
- package/lib/components/viewer3d/viewer3d.js +4 -2
- package/lib/constants.js +5 -4
- package/lib/index.js +1 -1
- package/lib/models.js +10 -6
- package/lib/reducers/viewer2d-reducer.js +3 -1
- package/lib/reducers/viewer3d-reducer.js +3 -1
- package/lib/utils/geometry.js +6 -6
- package/package.json +1 -1
|
@@ -20,9 +20,18 @@ export default function (_ref) {
|
|
|
20
20
|
alti = _ref.alti,
|
|
21
21
|
obj_property = _ref.obj_property,
|
|
22
22
|
outlineSVGData = _ref.outlineSVGData,
|
|
23
|
-
cds = _ref.cds
|
|
23
|
+
cds = _ref.cds,
|
|
24
|
+
_ref$width_unit = _ref.width_unit,
|
|
25
|
+
width_unit = _ref$width_unit === void 0 ? 'in' : _ref$width_unit,
|
|
26
|
+
_ref$height_unit = _ref.height_unit,
|
|
27
|
+
height_unit = _ref$height_unit === void 0 ? 'in' : _ref$height_unit,
|
|
28
|
+
_ref$length_unit = _ref.length_unit,
|
|
29
|
+
length_unit = _ref$length_unit === void 0 ? 'in' : _ref$length_unit;
|
|
30
|
+
var widthUnit = width_unit === 'inch' ? 'in' : width_unit;
|
|
31
|
+
var heightUnit = height_unit === 'inch' ? 'in' : height_unit;
|
|
32
|
+
var lengthUnit = length_unit === 'inch' ? 'in' : length_unit;
|
|
24
33
|
var _length = alti || 0;
|
|
25
|
-
var length = convert(_length).from(
|
|
34
|
+
var length = convert(_length).from(lengthUnit).to('cm');
|
|
26
35
|
// const length = _length;
|
|
27
36
|
|
|
28
37
|
var additional_props = [];
|
|
@@ -33,8 +42,8 @@ export default function (_ref) {
|
|
|
33
42
|
type: 'length-measure',
|
|
34
43
|
defaultValue: {
|
|
35
44
|
_length: sizeinfo.width,
|
|
36
|
-
_unit:
|
|
37
|
-
length: convert(sizeinfo.width).from(
|
|
45
|
+
_unit: widthUnit,
|
|
46
|
+
length: convert(sizeinfo.width).from(widthUnit).to('cm')
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
};
|
|
@@ -46,8 +55,8 @@ export default function (_ref) {
|
|
|
46
55
|
type: 'length-measure',
|
|
47
56
|
defaultValue: {
|
|
48
57
|
_length: sizeinfo.width,
|
|
49
|
-
_unit:
|
|
50
|
-
length: convert(sizeinfo.width).from(
|
|
58
|
+
_unit: widthUnit,
|
|
59
|
+
length: convert(sizeinfo.width).from(widthUnit).to('cm')
|
|
51
60
|
}
|
|
52
61
|
},
|
|
53
62
|
depth: {
|
|
@@ -55,8 +64,8 @@ export default function (_ref) {
|
|
|
55
64
|
type: 'length-measure',
|
|
56
65
|
defaultValue: {
|
|
57
66
|
_length: sizeinfo.depth,
|
|
58
|
-
_unit:
|
|
59
|
-
length: convert(sizeinfo.depth).from(
|
|
67
|
+
_unit: lengthUnit,
|
|
68
|
+
length: convert(sizeinfo.depth).from(lengthUnit).to('cm')
|
|
60
69
|
}
|
|
61
70
|
},
|
|
62
71
|
height: {
|
|
@@ -64,8 +73,8 @@ export default function (_ref) {
|
|
|
64
73
|
type: 'length-measure',
|
|
65
74
|
defaultValue: {
|
|
66
75
|
_length: sizeinfo.height,
|
|
67
|
-
_unit:
|
|
68
|
-
length: convert(sizeinfo.height).from(
|
|
76
|
+
_unit: heightUnit,
|
|
77
|
+
length: convert(sizeinfo.height).from(heightUnit).to('cm')
|
|
69
78
|
}
|
|
70
79
|
}
|
|
71
80
|
};
|
|
@@ -97,7 +106,7 @@ export default function (_ref) {
|
|
|
97
106
|
type: 'length-measure',
|
|
98
107
|
defaultValue: {
|
|
99
108
|
_length: _length,
|
|
100
|
-
_unit:
|
|
109
|
+
_unit: lengthUnit,
|
|
101
110
|
length: length
|
|
102
111
|
}
|
|
103
112
|
},
|
|
@@ -138,6 +147,9 @@ export default function (_ref) {
|
|
|
138
147
|
obj: obj_property,
|
|
139
148
|
cds: cds,
|
|
140
149
|
structure_json: structure_json,
|
|
150
|
+
width_unit: widthUnit,
|
|
151
|
+
length_unit: lengthUnit,
|
|
152
|
+
height_unit: heightUnit,
|
|
141
153
|
render2D: function render2D(element, layer, scene) {
|
|
142
154
|
return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
|
|
143
155
|
},
|
package/es/class/project.js
CHANGED
|
@@ -103,6 +103,8 @@ var Project = /*#__PURE__*/function () {
|
|
|
103
103
|
// sceneJSON && (sceneJSON.layers[layerID] = newlayer);
|
|
104
104
|
// }
|
|
105
105
|
|
|
106
|
+
// check type of ceilHeight and make it to Number
|
|
107
|
+
if (typeof sceneJSON.layers[layerID].ceilHeight !== 'number') sceneJSON.layers[layerID].ceilHeight = Number(sceneJSON.layers[layerID].ceilHeight);
|
|
106
108
|
var newScene = new Scene(sceneJSON);
|
|
107
109
|
state = new State({
|
|
108
110
|
scene: newScene.toJS(),
|
|
@@ -68,7 +68,7 @@ export default function RulerDist(_ref) {
|
|
|
68
68
|
ay = 5;
|
|
69
69
|
}
|
|
70
70
|
if (ruLength > 0) {
|
|
71
|
-
if (ruLength <
|
|
71
|
+
if (convert(ruLength).from(rulerUnit).to('in') < 3) {
|
|
72
72
|
return /*#__PURE__*/React.createElement("g", {
|
|
73
73
|
transform: transform
|
|
74
74
|
}, /*#__PURE__*/React.createElement("g", null, /*#__PURE__*/React.createElement("text", {
|
|
@@ -931,6 +931,7 @@ export default function Viewer2D(_ref, _ref2) {
|
|
|
931
931
|
// handle action when click elevation about selected line
|
|
932
932
|
var _mode = MODE_ELEVATION_VIEW;
|
|
933
933
|
projectActions.setMode(_mode);
|
|
934
|
+
internalType = constants.INTERNAL_EVENT_TOGGLE_TO_ELEVATION;
|
|
934
935
|
break;
|
|
935
936
|
} else {
|
|
936
937
|
var tlines = [];
|
|
@@ -893,7 +893,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
|
|
|
893
893
|
}
|
|
894
894
|
export function getDistances(layer, isCalcWall) {
|
|
895
895
|
fVLine.forEach(function (line, index) {
|
|
896
|
-
getLineDistance(line, layer, isCalcWall
|
|
896
|
+
getLineDistance(line, layer, isEmpty(isCalcWall) ? false : isCalcWall, index);
|
|
897
897
|
});
|
|
898
898
|
}
|
|
899
899
|
function getLineDistance(obj, layer, isCalcWall, index) {
|
|
@@ -985,6 +985,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
|
|
|
985
985
|
sprite1.renderOrder = 2;
|
|
986
986
|
sprite1.scale.set(0.2, 0.1, 0.2);
|
|
987
987
|
sprite1.layers.set(1);
|
|
988
|
+
sprite1.material.depthTest = false;
|
|
988
989
|
obj.add(sprite1);
|
|
989
990
|
if (obj.parent != null) {
|
|
990
991
|
// is not lighting
|
|
@@ -1073,7 +1074,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
|
|
|
1073
1074
|
obj.geometry.attributes.position.array[4] = _newVec.y;
|
|
1074
1075
|
obj.geometry.attributes.position.array[5] = _newVec.z;
|
|
1075
1076
|
obj.geometry.attributes.position.needsUpdate = true;
|
|
1076
|
-
var _dist = formatNumber(distance, DECIMAL_PLACES_2);
|
|
1077
|
+
var _dist = convert(formatNumber(distance, DECIMAL_PLACES_2)).from('cm').to('in');
|
|
1077
1078
|
if (_dist > 3) {
|
|
1078
1079
|
var _canvas2 = getDistanceCanvas(_dist, layer);
|
|
1079
1080
|
var _wid = _canvas2.width / window.innerWidth * 30;
|
|
@@ -1876,6 +1877,7 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
|
|
|
1876
1877
|
if (!catalogElement) catalogElement = catalog.getElement(returnReplaceableDeepSearchType(item.type));
|
|
1877
1878
|
if (!catalogElement) return false;
|
|
1878
1879
|
return catalogElement.render3D(item, layer, sceneData, mode).then(function (item3D) {
|
|
1880
|
+
var _item$properties$getI, _item$properties$getI2, _item$properties$getI3;
|
|
1879
1881
|
if (item3D instanceof Three.LOD) {
|
|
1880
1882
|
planData.sceneGraph.LODs[itemID] = item3D;
|
|
1881
1883
|
}
|
|
@@ -1991,9 +1993,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
|
|
|
1991
1993
|
var catid = item.type;
|
|
1992
1994
|
var cat = catalog.elements[catid];
|
|
1993
1995
|
if (!cat) cat = catalog.elements[returnReplaceableDeepSearchType(catid)];
|
|
1994
|
-
var width = convert(item.properties.getIn(['width', '_length'])).from('in').to(sceneData.unit);
|
|
1995
|
-
var height = convert(item.properties.getIn(['height', '_length'])).from('in').to(sceneData.unit);
|
|
1996
|
-
var depth = convert(item.properties.getIn(['depth', '_length'])).from('in').to(sceneData.unit);
|
|
1996
|
+
var width = convert(item.properties.getIn(['width', '_length'])).from((_item$properties$getI = item.properties.getIn(['width', '_unit'])) !== null && _item$properties$getI !== void 0 ? _item$properties$getI : 'in').to(sceneData.unit);
|
|
1997
|
+
var height = convert(item.properties.getIn(['height', '_length'])).from((_item$properties$getI2 = item.properties.getIn(['height', '_unit'])) !== null && _item$properties$getI2 !== void 0 ? _item$properties$getI2 : 'in').to(sceneData.unit);
|
|
1998
|
+
var depth = convert(item.properties.getIn(['depth', '_length'])).from((_item$properties$getI3 = item.properties.getIn(['depth', '_unit'])) !== null && _item$properties$getI3 !== void 0 ? _item$properties$getI3 : 'in').to(sceneData.unit);
|
|
1997
1999
|
val.size = {
|
|
1998
2000
|
width: width,
|
|
1999
2001
|
height: height,
|
|
@@ -3064,23 +3066,18 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
|
|
|
3064
3066
|
// let layoutType = molding.items[0].layoutpos;
|
|
3065
3067
|
// let visible = molding.items[0];
|
|
3066
3068
|
molding.pointGroups.forEach(function (pointGroup) {
|
|
3069
|
+
var _child$width_unit, _child$height_unit, _child$length_unit;
|
|
3067
3070
|
var geometry = new Three.BufferGeometry();
|
|
3068
3071
|
var length = data.length; //point array
|
|
3069
|
-
var
|
|
3070
|
-
|
|
3071
|
-
|
|
3072
|
-
|
|
3073
|
-
|
|
3074
|
-
|
|
3075
|
-
|
|
3076
|
-
|
|
3077
|
-
|
|
3078
|
-
}
|
|
3079
|
-
temp_unit = child.length_unit;
|
|
3080
|
-
if (temp_unit === 'inch') {
|
|
3081
|
-
child.length = convert(child.length).from('in').to('cm');
|
|
3082
|
-
child.length_unit = 'cm';
|
|
3083
|
-
}
|
|
3072
|
+
var widthUnit = child.width_unit === 'inch' ? 'in' : (_child$width_unit = child.width_unit) !== null && _child$width_unit !== void 0 ? _child$width_unit : 'in';
|
|
3073
|
+
var heightUnit = child.height_unit === 'inch' ? 'in' : (_child$height_unit = child.height_unit) !== null && _child$height_unit !== void 0 ? _child$height_unit : 'in';
|
|
3074
|
+
var lengthUnit = child.length_unit === 'inch' ? 'in' : (_child$length_unit = child.length_unit) !== null && _child$length_unit !== void 0 ? _child$length_unit : 'in';
|
|
3075
|
+
child.height = convert(child.height).from(heightUnit).to('cm');
|
|
3076
|
+
child.height_unit = 'cm';
|
|
3077
|
+
child.width = convert(child.width).from(widthUnit).to('cm');
|
|
3078
|
+
child.width_unit = 'cm';
|
|
3079
|
+
child.length = convert(child.length).from(lengthUnit).to('cm');
|
|
3080
|
+
child.length_unit = 'cm';
|
|
3084
3081
|
geometry.needsUpdate = true;
|
|
3085
3082
|
geometry = moldingVertices(pointGroup, geometry, data, child, svg_width, svg_height, molding.pointGroups.length);
|
|
3086
3083
|
var total = geometry.attributes.position.count;
|
|
@@ -3612,7 +3609,7 @@ export function addWarningBox(itemId, altitude, planData) {
|
|
|
3612
3609
|
deleteSpecifiedMeshObjects('WarningBox' + itemId);
|
|
3613
3610
|
var item3D = planData.sceneGraph.layers[planData.sceneData.selectedLayer].items[itemId];
|
|
3614
3611
|
if (item3D == undefined) return;
|
|
3615
|
-
var altitudeLength =
|
|
3612
|
+
var altitudeLength = altitude;
|
|
3616
3613
|
var sBounding = item3D.children[0].userData;
|
|
3617
3614
|
var width = sBounding.max.x - sBounding.min.x;
|
|
3618
3615
|
var height = sBounding.max.y - sBounding.min.y;
|
|
@@ -822,11 +822,12 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
822
822
|
}
|
|
823
823
|
var source = obj.parent.parent.parent;
|
|
824
824
|
if (target.userData.type == 'item') {
|
|
825
|
+
var _item$properties$getI;
|
|
825
826
|
var sRot = layer.getIn(['items', source.userData.itemId]).rotation;
|
|
826
827
|
var tRot = layer.getIn(['items', target.userData.itemId]) ? layer.getIn(['items', target.userData.itemId]).rotation : 0;
|
|
827
828
|
var item = layer.getIn(['items', source.userData.itemId]);
|
|
828
829
|
var layoutType = item.layoutpos;
|
|
829
|
-
var altitudeLength = convert(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
830
|
+
var altitudeLength = convert(item.properties.getIn(['altitude', '_length'])).from((_item$properties$getI = item.properties.getIn(['altitude', '_unit'])) !== null && _item$properties$getI !== void 0 ? _item$properties$getI : 'in').to('cm');
|
|
830
831
|
var sBounding = source.children[0].userData;
|
|
831
832
|
var tBounding = target.children[0].userData;
|
|
832
833
|
var tPos = target.position.clone();
|
|
@@ -926,8 +927,9 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
|
|
|
926
927
|
snapFlag = false;
|
|
927
928
|
return;
|
|
928
929
|
} else {
|
|
930
|
+
var _item3$properties$get;
|
|
929
931
|
var _layoutType = _item3.layoutpos;
|
|
930
|
-
var _altitudeLength = convert(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
932
|
+
var _altitudeLength = convert(_item3.properties.getIn(['altitude', '_length'])).from((_item3$properties$get = _item3.properties.getIn(['altitude', '_unit'])) !== null && _item3$properties$get !== void 0 ? _item3$properties$get : 'in').to('cm');
|
|
931
933
|
var _sBounding = source.children[0].userData;
|
|
932
934
|
var _width = _sBounding.max.x - _sBounding.min.x;
|
|
933
935
|
var _height = _sBounding.max.y - _sBounding.min.y;
|
package/es/constants.js
CHANGED
|
@@ -751,6 +751,7 @@ export var INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNAL_EVENT_DRAW_ELEMENT';
|
|
|
751
751
|
export var INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
|
|
752
752
|
export var INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
753
753
|
export var INTERNAL_EVENT_START_DRAW_WALL = 'INTERNAL_EVENT_START_DRAW_WALL';
|
|
754
|
+
export var INTERNAL_EVENT_TOGGLE_TO_ELEVATION = 'INTERNAL_EVENT_TOGGLE_TO_ELEVATION';
|
|
754
755
|
|
|
755
756
|
// room shape type
|
|
756
757
|
export var ROOM_SHAPE_TYPE = {
|
package/es/index.js
CHANGED
|
@@ -24,7 +24,7 @@ function nextFrame() {
|
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
// DIY-714 [Temp Fix] Rewrite API URLs
|
|
27
|
-
var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com)/;
|
|
27
|
+
var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com|127\.0\.0\.1:4002)/;
|
|
28
28
|
var API_HOST_REPLACEMENT = 'https://api-old.diydesignspace.com';
|
|
29
29
|
function rewriteApiUrl(url) {
|
|
30
30
|
return typeof url === 'string' ? url.replace(API_HOST_REGEX, API_HOST_REPLACEMENT) : url;
|
package/es/models.js
CHANGED
|
@@ -358,6 +358,7 @@ export var Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
358
358
|
return _createClass(Catalog, [{
|
|
359
359
|
key: "factoryElement",
|
|
360
360
|
value: function factoryElement(type, options, initialProperties, state) {
|
|
361
|
+
var _element$structure_js, _element$structure_js2, _element$structure_js3, _element$structure_js4, _element$structure_js5, _element$structure_js6;
|
|
361
362
|
if (!this.elements.has(type)) {
|
|
362
363
|
var catList = this.elements.map(function (element) {
|
|
363
364
|
return element.name;
|
|
@@ -365,6 +366,9 @@ export var Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
365
366
|
throw new Error("Element ".concat(type, " does not exist in catalog ").concat(catList));
|
|
366
367
|
}
|
|
367
368
|
var element = this.elements.get(type);
|
|
369
|
+
var widthUnit = (_element$structure_js = element === null || element === void 0 || (_element$structure_js2 = element.structure_json) === null || _element$structure_js2 === void 0 ? void 0 : _element$structure_js2.width_unit) !== null && _element$structure_js !== void 0 ? _element$structure_js : 'in';
|
|
370
|
+
var heightUnit = (_element$structure_js3 = element === null || element === void 0 || (_element$structure_js4 = element.structure_json) === null || _element$structure_js4 === void 0 ? void 0 : _element$structure_js4.height_unit) !== null && _element$structure_js3 !== void 0 ? _element$structure_js3 : 'in';
|
|
371
|
+
var lengthUnit = (_element$structure_js5 = element === null || element === void 0 || (_element$structure_js6 = element.structure_json) === null || _element$structure_js6 === void 0 ? void 0 : _element$structure_js6.length_unit) !== null && _element$structure_js5 !== void 0 ? _element$structure_js5 : 'in';
|
|
368
372
|
var properties = element.properties.map(function (value, key) {
|
|
369
373
|
return initialProperties && initialProperties.has(key) ? initialProperties.get(key) : value.get('defaultValue');
|
|
370
374
|
});
|
|
@@ -391,18 +395,18 @@ export var Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
391
395
|
var _sizeinfo = {
|
|
392
396
|
width: new Map({
|
|
393
397
|
_length: temp.width,
|
|
394
|
-
_unit:
|
|
395
|
-
length: convert(temp.width).from(
|
|
398
|
+
_unit: widthUnit,
|
|
399
|
+
length: convert(temp.width).from(widthUnit).to('cm') // unit of size in dataBundle is inch
|
|
396
400
|
}),
|
|
397
401
|
height: new Map({
|
|
398
402
|
_length: temp.height,
|
|
399
|
-
_unit:
|
|
400
|
-
length: convert(temp.height).from(
|
|
403
|
+
_unit: heightUnit,
|
|
404
|
+
length: convert(temp.height).from(heightUnit).to('cm')
|
|
401
405
|
}),
|
|
402
406
|
depth: new Map({
|
|
403
407
|
_length: temp.depth,
|
|
404
|
-
_unit:
|
|
405
|
-
length: convert(temp.depth).from(
|
|
408
|
+
_unit: lengthUnit,
|
|
409
|
+
length: convert(temp.depth).from(lengthUnit).to('cm')
|
|
406
410
|
})
|
|
407
411
|
};
|
|
408
412
|
properties = properties.set('width', _sizeinfo.width).set('height', _sizeinfo.height).set('depth', _sizeinfo.depth);
|
|
@@ -29,8 +29,10 @@ export default function (state, action) {
|
|
|
29
29
|
if (item.type.includes('Light')) {
|
|
30
30
|
var height = item.properties.getIn(['height', '_length']);
|
|
31
31
|
var heightUnit = item.properties.getIn(['height', '_unit']);
|
|
32
|
-
var newAltitude = action.value - convert(height).from(heightUnit).to('in');
|
|
32
|
+
var newAltitude = convert(action.value).from(_layer.unit).to('in') - convert(height).from(heightUnit).to('in');
|
|
33
33
|
item = item.setIn(['properties', 'altitude', '_length'], convert(newAltitude).from('in').to(_layer.unit));
|
|
34
|
+
item = item.setIn(['properties', 'altitude', '_unit'], _layer.unit);
|
|
35
|
+
item = item.setIn(['properties', 'altitude', 'length'], convert(newAltitude).from('in').to('cm'));
|
|
34
36
|
}
|
|
35
37
|
return item;
|
|
36
38
|
});
|
|
@@ -34,8 +34,10 @@ export default function (state, action) {
|
|
|
34
34
|
if (item.type.includes('Light')) {
|
|
35
35
|
var height = item.properties.getIn(['height', '_length']);
|
|
36
36
|
var heightUnit = item.properties.getIn(['height', '_unit']);
|
|
37
|
-
var newAltitude = action.value - convert(height).from(heightUnit).to('in');
|
|
37
|
+
var newAltitude = convert(action.value).from(_layer.unit).to('in') - convert(height).from(heightUnit).to('in');
|
|
38
38
|
item = item.setIn(['properties', 'altitude', '_length'], convert(newAltitude).from('in').to(_layer.unit));
|
|
39
|
+
item = item.setIn(['properties', 'altitude', '_unit'], _layer.unit);
|
|
40
|
+
item = item.setIn(['properties', 'altitude', 'length'], convert(newAltitude).from('in').to('cm'));
|
|
39
41
|
}
|
|
40
42
|
return item;
|
|
41
43
|
});
|
package/es/utils/geometry.js
CHANGED
|
@@ -741,9 +741,9 @@ export function getAllItemSpecified(scene, catalog, filter) {
|
|
|
741
741
|
var info = cat === null || cat === void 0 ? void 0 : cat.info;
|
|
742
742
|
var props = item.properties;
|
|
743
743
|
var getSize = function getSize(key) {
|
|
744
|
-
var _props$getIn;
|
|
744
|
+
var _props$getIn, _props$getIn2, _props$getIn3;
|
|
745
745
|
var length = props === null || props === void 0 || (_props$getIn = props.getIn) === null || _props$getIn === void 0 ? void 0 : _props$getIn.call(props, [key, '_length']);
|
|
746
|
-
return length != null ? convert(length).from('in').to(scene.unit) : 0;
|
|
746
|
+
return length != null ? convert(length).from((_props$getIn2 = props === null || props === void 0 || (_props$getIn3 = props.getIn) === null || _props$getIn3 === void 0 ? void 0 : _props$getIn3.call(props, [key, '_unit'])) !== null && _props$getIn2 !== void 0 ? _props$getIn2 : 'in').to(scene.unit) : 0;
|
|
747
747
|
};
|
|
748
748
|
val.size = {
|
|
749
749
|
width: getSize('width'),
|
|
@@ -2550,10 +2550,10 @@ export function calcDistancesFromItemToWalls(curItem, layer) {
|
|
|
2550
2550
|
height: height
|
|
2551
2551
|
};
|
|
2552
2552
|
var curiteminfo = getCalcRectFromItem2(itemInfo);
|
|
2553
|
-
var allItemRect = getAllItems2(curItem, layer);
|
|
2554
|
-
var allLines = getAllLines(layer);
|
|
2555
|
-
var allLineRects = buildRectFromLines(layer, allLines);
|
|
2556
|
-
var allRect = allLineRects.concat(allItemRect.others);
|
|
2553
|
+
var allItemRect = getAllItems2(curItem, layer); // get all item edge rects
|
|
2554
|
+
var allLines = getAllLines(layer); // get all wall lines
|
|
2555
|
+
var allLineRects = buildRectFromLines(layer, allLines); // make line rects from wall lines
|
|
2556
|
+
var allRect = allLineRects.concat(allItemRect.others); // item edges + wall lines
|
|
2557
2557
|
var _loop = function _loop(i) {
|
|
2558
2558
|
// [rectCenterPoint] has four middle points of cabinet rect edges
|
|
2559
2559
|
var centerpoint = curiteminfo.rectCenterPoint[i];
|
|
@@ -27,9 +27,18 @@ function _default(_ref) {
|
|
|
27
27
|
alti = _ref.alti,
|
|
28
28
|
obj_property = _ref.obj_property,
|
|
29
29
|
outlineSVGData = _ref.outlineSVGData,
|
|
30
|
-
cds = _ref.cds
|
|
30
|
+
cds = _ref.cds,
|
|
31
|
+
_ref$width_unit = _ref.width_unit,
|
|
32
|
+
width_unit = _ref$width_unit === void 0 ? 'in' : _ref$width_unit,
|
|
33
|
+
_ref$height_unit = _ref.height_unit,
|
|
34
|
+
height_unit = _ref$height_unit === void 0 ? 'in' : _ref$height_unit,
|
|
35
|
+
_ref$length_unit = _ref.length_unit,
|
|
36
|
+
length_unit = _ref$length_unit === void 0 ? 'in' : _ref$length_unit;
|
|
37
|
+
var widthUnit = width_unit === 'inch' ? 'in' : width_unit;
|
|
38
|
+
var heightUnit = height_unit === 'inch' ? 'in' : height_unit;
|
|
39
|
+
var lengthUnit = length_unit === 'inch' ? 'in' : length_unit;
|
|
31
40
|
var _length = alti || 0;
|
|
32
|
-
var length = (0, _convertUnitsLite.convert)(_length).from(
|
|
41
|
+
var length = (0, _convertUnitsLite.convert)(_length).from(lengthUnit).to('cm');
|
|
33
42
|
// const length = _length;
|
|
34
43
|
|
|
35
44
|
var additional_props = [];
|
|
@@ -40,8 +49,8 @@ function _default(_ref) {
|
|
|
40
49
|
type: 'length-measure',
|
|
41
50
|
defaultValue: {
|
|
42
51
|
_length: sizeinfo.width,
|
|
43
|
-
_unit:
|
|
44
|
-
length: (0, _convertUnitsLite.convert)(sizeinfo.width).from(
|
|
52
|
+
_unit: widthUnit,
|
|
53
|
+
length: (0, _convertUnitsLite.convert)(sizeinfo.width).from(widthUnit).to('cm')
|
|
45
54
|
}
|
|
46
55
|
}
|
|
47
56
|
};
|
|
@@ -53,8 +62,8 @@ function _default(_ref) {
|
|
|
53
62
|
type: 'length-measure',
|
|
54
63
|
defaultValue: {
|
|
55
64
|
_length: sizeinfo.width,
|
|
56
|
-
_unit:
|
|
57
|
-
length: (0, _convertUnitsLite.convert)(sizeinfo.width).from(
|
|
65
|
+
_unit: widthUnit,
|
|
66
|
+
length: (0, _convertUnitsLite.convert)(sizeinfo.width).from(widthUnit).to('cm')
|
|
58
67
|
}
|
|
59
68
|
},
|
|
60
69
|
depth: {
|
|
@@ -62,8 +71,8 @@ function _default(_ref) {
|
|
|
62
71
|
type: 'length-measure',
|
|
63
72
|
defaultValue: {
|
|
64
73
|
_length: sizeinfo.depth,
|
|
65
|
-
_unit:
|
|
66
|
-
length: (0, _convertUnitsLite.convert)(sizeinfo.depth).from(
|
|
74
|
+
_unit: lengthUnit,
|
|
75
|
+
length: (0, _convertUnitsLite.convert)(sizeinfo.depth).from(lengthUnit).to('cm')
|
|
67
76
|
}
|
|
68
77
|
},
|
|
69
78
|
height: {
|
|
@@ -71,8 +80,8 @@ function _default(_ref) {
|
|
|
71
80
|
type: 'length-measure',
|
|
72
81
|
defaultValue: {
|
|
73
82
|
_length: sizeinfo.height,
|
|
74
|
-
_unit:
|
|
75
|
-
length: (0, _convertUnitsLite.convert)(sizeinfo.height).from(
|
|
83
|
+
_unit: heightUnit,
|
|
84
|
+
length: (0, _convertUnitsLite.convert)(sizeinfo.height).from(heightUnit).to('cm')
|
|
76
85
|
}
|
|
77
86
|
}
|
|
78
87
|
};
|
|
@@ -104,7 +113,7 @@ function _default(_ref) {
|
|
|
104
113
|
type: 'length-measure',
|
|
105
114
|
defaultValue: {
|
|
106
115
|
_length: _length,
|
|
107
|
-
_unit:
|
|
116
|
+
_unit: lengthUnit,
|
|
108
117
|
length: length
|
|
109
118
|
}
|
|
110
119
|
},
|
|
@@ -145,6 +154,9 @@ function _default(_ref) {
|
|
|
145
154
|
obj: obj_property,
|
|
146
155
|
cds: cds,
|
|
147
156
|
structure_json: structure_json,
|
|
157
|
+
width_unit: widthUnit,
|
|
158
|
+
length_unit: lengthUnit,
|
|
159
|
+
height_unit: heightUnit,
|
|
148
160
|
render2D: function render2D(element, layer, scene) {
|
|
149
161
|
return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
|
|
150
162
|
},
|
package/lib/class/project.js
CHANGED
|
@@ -112,6 +112,8 @@ var Project = exports["default"] = /*#__PURE__*/function () {
|
|
|
112
112
|
// sceneJSON && (sceneJSON.layers[layerID] = newlayer);
|
|
113
113
|
// }
|
|
114
114
|
|
|
115
|
+
// check type of ceilHeight and make it to Number
|
|
116
|
+
if (typeof sceneJSON.layers[layerID].ceilHeight !== 'number') sceneJSON.layers[layerID].ceilHeight = Number(sceneJSON.layers[layerID].ceilHeight);
|
|
115
117
|
var newScene = new _models.Scene(sceneJSON);
|
|
116
118
|
state = new _models.State({
|
|
117
119
|
scene: newScene.toJS(),
|
|
@@ -75,7 +75,7 @@ function RulerDist(_ref) {
|
|
|
75
75
|
ay = 5;
|
|
76
76
|
}
|
|
77
77
|
if (ruLength > 0) {
|
|
78
|
-
if (ruLength <
|
|
78
|
+
if ((0, _convertUnitsLite.convert)(ruLength).from(rulerUnit).to('in') < 3) {
|
|
79
79
|
return /*#__PURE__*/_react["default"].createElement("g", {
|
|
80
80
|
transform: transform
|
|
81
81
|
}, /*#__PURE__*/_react["default"].createElement("g", null, /*#__PURE__*/_react["default"].createElement("text", {
|
|
@@ -940,6 +940,7 @@ function Viewer2D(_ref, _ref2) {
|
|
|
940
940
|
// handle action when click elevation about selected line
|
|
941
941
|
var _mode = _constants.MODE_ELEVATION_VIEW;
|
|
942
942
|
projectActions.setMode(_mode);
|
|
943
|
+
internalType = constants.INTERNAL_EVENT_TOGGLE_TO_ELEVATION;
|
|
943
944
|
break;
|
|
944
945
|
} else {
|
|
945
946
|
var tlines = [];
|
|
@@ -928,7 +928,7 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
|
|
|
928
928
|
}
|
|
929
929
|
function getDistances(layer, isCalcWall) {
|
|
930
930
|
fVLine.forEach(function (line, index) {
|
|
931
|
-
getLineDistance(line, layer, isCalcWall
|
|
931
|
+
getLineDistance(line, layer, (0, _helper.isEmpty)(isCalcWall) ? false : isCalcWall, index);
|
|
932
932
|
});
|
|
933
933
|
}
|
|
934
934
|
function getLineDistance(obj, layer, isCalcWall, index) {
|
|
@@ -1020,6 +1020,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
|
|
|
1020
1020
|
sprite1.renderOrder = 2;
|
|
1021
1021
|
sprite1.scale.set(0.2, 0.1, 0.2);
|
|
1022
1022
|
sprite1.layers.set(1);
|
|
1023
|
+
sprite1.material.depthTest = false;
|
|
1023
1024
|
obj.add(sprite1);
|
|
1024
1025
|
if (obj.parent != null) {
|
|
1025
1026
|
// is not lighting
|
|
@@ -1108,7 +1109,7 @@ function getLineDistance(obj, layer, isCalcWall, index) {
|
|
|
1108
1109
|
obj.geometry.attributes.position.array[4] = _newVec.y;
|
|
1109
1110
|
obj.geometry.attributes.position.array[5] = _newVec.z;
|
|
1110
1111
|
obj.geometry.attributes.position.needsUpdate = true;
|
|
1111
|
-
var _dist = (0, _math.formatNumber)(distance, _constants.DECIMAL_PLACES_2);
|
|
1112
|
+
var _dist = (0, _convertUnitsLite.convert)((0, _math.formatNumber)(distance, _constants.DECIMAL_PLACES_2)).from('cm').to('in');
|
|
1112
1113
|
if (_dist > 3) {
|
|
1113
1114
|
var _canvas2 = getDistanceCanvas(_dist, layer);
|
|
1114
1115
|
var _wid = _canvas2.width / window.innerWidth * 30;
|
|
@@ -1911,6 +1912,7 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
|
|
|
1911
1912
|
if (!catalogElement) catalogElement = catalog.getElement((0, _utils.returnReplaceableDeepSearchType)(item.type));
|
|
1912
1913
|
if (!catalogElement) return false;
|
|
1913
1914
|
return catalogElement.render3D(item, layer, sceneData, mode).then(function (item3D) {
|
|
1915
|
+
var _item$properties$getI, _item$properties$getI2, _item$properties$getI3;
|
|
1914
1916
|
if (item3D instanceof Three.LOD) {
|
|
1915
1917
|
planData.sceneGraph.LODs[itemID] = item3D;
|
|
1916
1918
|
}
|
|
@@ -2026,9 +2028,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
|
|
|
2026
2028
|
var catid = item.type;
|
|
2027
2029
|
var cat = catalog.elements[catid];
|
|
2028
2030
|
if (!cat) cat = catalog.elements[(0, _utils.returnReplaceableDeepSearchType)(catid)];
|
|
2029
|
-
var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from('in').to(sceneData.unit);
|
|
2030
|
-
var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from('in').to(sceneData.unit);
|
|
2031
|
-
var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from('in').to(sceneData.unit);
|
|
2031
|
+
var width = (0, _convertUnitsLite.convert)(item.properties.getIn(['width', '_length'])).from((_item$properties$getI = item.properties.getIn(['width', '_unit'])) !== null && _item$properties$getI !== void 0 ? _item$properties$getI : 'in').to(sceneData.unit);
|
|
2032
|
+
var height = (0, _convertUnitsLite.convert)(item.properties.getIn(['height', '_length'])).from((_item$properties$getI2 = item.properties.getIn(['height', '_unit'])) !== null && _item$properties$getI2 !== void 0 ? _item$properties$getI2 : 'in').to(sceneData.unit);
|
|
2033
|
+
var depth = (0, _convertUnitsLite.convert)(item.properties.getIn(['depth', '_length'])).from((_item$properties$getI3 = item.properties.getIn(['depth', '_unit'])) !== null && _item$properties$getI3 !== void 0 ? _item$properties$getI3 : 'in').to(sceneData.unit);
|
|
2032
2034
|
val.size = {
|
|
2033
2035
|
width: width,
|
|
2034
2036
|
height: height,
|
|
@@ -3099,23 +3101,18 @@ function _addMGMesh(molding, planData, layer, data, svg_width, svg_height, flag)
|
|
|
3099
3101
|
// let layoutType = molding.items[0].layoutpos;
|
|
3100
3102
|
// let visible = molding.items[0];
|
|
3101
3103
|
molding.pointGroups.forEach(function (pointGroup) {
|
|
3104
|
+
var _child$width_unit, _child$height_unit, _child$length_unit;
|
|
3102
3105
|
var geometry = new Three.BufferGeometry();
|
|
3103
3106
|
var length = data.length; //point array
|
|
3104
|
-
var
|
|
3105
|
-
|
|
3106
|
-
|
|
3107
|
-
|
|
3108
|
-
|
|
3109
|
-
|
|
3110
|
-
|
|
3111
|
-
|
|
3112
|
-
|
|
3113
|
-
}
|
|
3114
|
-
temp_unit = child.length_unit;
|
|
3115
|
-
if (temp_unit === 'inch') {
|
|
3116
|
-
child.length = (0, _convertUnitsLite.convert)(child.length).from('in').to('cm');
|
|
3117
|
-
child.length_unit = 'cm';
|
|
3118
|
-
}
|
|
3107
|
+
var widthUnit = child.width_unit === 'inch' ? 'in' : (_child$width_unit = child.width_unit) !== null && _child$width_unit !== void 0 ? _child$width_unit : 'in';
|
|
3108
|
+
var heightUnit = child.height_unit === 'inch' ? 'in' : (_child$height_unit = child.height_unit) !== null && _child$height_unit !== void 0 ? _child$height_unit : 'in';
|
|
3109
|
+
var lengthUnit = child.length_unit === 'inch' ? 'in' : (_child$length_unit = child.length_unit) !== null && _child$length_unit !== void 0 ? _child$length_unit : 'in';
|
|
3110
|
+
child.height = (0, _convertUnitsLite.convert)(child.height).from(heightUnit).to('cm');
|
|
3111
|
+
child.height_unit = 'cm';
|
|
3112
|
+
child.width = (0, _convertUnitsLite.convert)(child.width).from(widthUnit).to('cm');
|
|
3113
|
+
child.width_unit = 'cm';
|
|
3114
|
+
child.length = (0, _convertUnitsLite.convert)(child.length).from(lengthUnit).to('cm');
|
|
3115
|
+
child.length_unit = 'cm';
|
|
3119
3116
|
geometry.needsUpdate = true;
|
|
3120
3117
|
geometry = moldingVertices(pointGroup, geometry, data, child, svg_width, svg_height, molding.pointGroups.length);
|
|
3121
3118
|
var total = geometry.attributes.position.count;
|
|
@@ -3647,7 +3644,7 @@ function addWarningBox(itemId, altitude, planData) {
|
|
|
3647
3644
|
deleteSpecifiedMeshObjects('WarningBox' + itemId);
|
|
3648
3645
|
var item3D = planData.sceneGraph.layers[planData.sceneData.selectedLayer].items[itemId];
|
|
3649
3646
|
if (item3D == undefined) return;
|
|
3650
|
-
var altitudeLength =
|
|
3647
|
+
var altitudeLength = altitude;
|
|
3651
3648
|
var sBounding = item3D.children[0].userData;
|
|
3652
3649
|
var width = sBounding.max.x - sBounding.min.x;
|
|
3653
3650
|
var height = sBounding.max.y - sBounding.min.y;
|
|
@@ -829,11 +829,12 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
829
829
|
}
|
|
830
830
|
var source = obj.parent.parent.parent;
|
|
831
831
|
if (target.userData.type == 'item') {
|
|
832
|
+
var _item$properties$getI;
|
|
832
833
|
var sRot = layer.getIn(['items', source.userData.itemId]).rotation;
|
|
833
834
|
var tRot = layer.getIn(['items', target.userData.itemId]) ? layer.getIn(['items', target.userData.itemId]).rotation : 0;
|
|
834
835
|
var item = layer.getIn(['items', source.userData.itemId]);
|
|
835
836
|
var layoutType = item.layoutpos;
|
|
836
|
-
var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
837
|
+
var altitudeLength = (0, _convertUnitsLite.convert)(item.properties.getIn(['altitude', '_length'])).from((_item$properties$getI = item.properties.getIn(['altitude', '_unit'])) !== null && _item$properties$getI !== void 0 ? _item$properties$getI : 'in').to('cm');
|
|
837
838
|
var sBounding = source.children[0].userData;
|
|
838
839
|
var tBounding = target.children[0].userData;
|
|
839
840
|
var tPos = target.position.clone();
|
|
@@ -933,8 +934,9 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
|
|
|
933
934
|
snapFlag = false;
|
|
934
935
|
return;
|
|
935
936
|
} else {
|
|
937
|
+
var _item3$properties$get;
|
|
936
938
|
var _layoutType = _item3.layoutpos;
|
|
937
|
-
var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from('in').to('cm');
|
|
939
|
+
var _altitudeLength = (0, _convertUnitsLite.convert)(_item3.properties.getIn(['altitude', '_length'])).from((_item3$properties$get = _item3.properties.getIn(['altitude', '_unit'])) !== null && _item3$properties$get !== void 0 ? _item3$properties$get : 'in').to('cm');
|
|
938
940
|
var _sBounding = source.children[0].userData;
|
|
939
941
|
var _width = _sBounding.max.x - _sBounding.min.x;
|
|
940
942
|
var _height = _sBounding.max.y - _sBounding.min.y;
|
package/lib/constants.js
CHANGED
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.END_ROTATING_ITEM = exports.END_LOADING = exports.END_FITTING_IMAGE = exports.END_DRAWING_LINE = exports.END_DRAWING_ITEM = exports.END_DRAWING_HOLE_3D = exports.END_DRAWING_HOLE = exports.END_DRAGGING_VERTEX = exports.END_DRAGGING_LINE = exports.END_DRAGGING_ITEM_3D = exports.END_DRAGGING_ITEM = exports.END_DRAGGING_HOLE_3D = exports.END_DRAGGING_HOLE = exports.END_CREATING_HOLE = exports.END_CREATING_CABINET = exports.ELEVATION_VIEW_TITLE = exports.ELEVATION_VIEW_RIGHT = exports.ELEVATION_VIEW_LEFT = exports.ELEVATION_VIEW_KEYWORD = exports.ELEVATION_VIEW_FRONT = exports.ELEVATION_VIEW_BACK = exports.ELEVATION_VIEW = exports.ELEMENT_VERTEX = exports.ELEMENT_LINE = exports.ELEMENT_ITEM = exports.ELEMENT_HOLE = exports.ELEMENT_AREA = exports.EDIT_WIDTH = exports.EDIT = exports.DUPLICATE_SELECTED = exports.DISTANCE_MEASUREMENT_LINE_COLOR = exports.DISTANCE_EPSILON = exports.DIFFERENT_VALUES_PATH_LENGTH = exports.DELTA = exports.DEFAULT_FONT_FAMILY = exports.DECIMAL_PLACES_3 = exports.DECIMAL_PLACES_2 = exports.DASH_LINE_COLOR = exports.CREATE_ROOM_WITH_SHAPE = exports.COPY_PROPERTIES = exports.CLIENTS_NAME = exports.CHANGE_WINDOW_DOOR_MEASURE = exports.CHANGE_WALL_LENGTH_MEASURE = exports.CHANGE_WALL_CABINET_MEASURE = exports.CHANGE_MEASUREMENT_UNIT = exports.CHANGE_CATALOG_PAGE = exports.CHANGE_BASE_CABINET_MEASURE = exports.CEIL_UNITS_LENGTH = exports.BROWN_COLOR = exports.BOTTOM_MOLDING_LOCATION = exports.BOTTOM = exports.BG_COLOR_OVERLAY = exports.BG_COLOR_HOVER = exports.BG_COLOR_1 = exports.BG_COLOR_0 = exports.BEGIN_UPLOADING_IMAGE = exports.BEGIN_ROTATING_ITEM_3D = exports.BEGIN_ROTATING_ITEM = exports.BEGIN_FITTING_IMAGE = exports.BEGIN_DRAWING_LINE = exports.BEGIN_DRAGGING_VERTEX = exports.BEGIN_DRAGGING_LINE = exports.BEGIN_DRAGGING_ITEM_3D = exports.BEGIN_DRAGGING_ITEM = exports.BEGIN_DRAGGING_HOLE_3D = exports.BEGIN_DRAGGING_HOLE = exports.BASE_ITEM_MEASUREMENT_LINE_COLOR = exports.BASE_CABINET_LAYOUTPOS = exports.BACK_DIST_ANG = exports.ATT_VERTEXT_TWO = exports.ATT_VERTEXT_ONE = exports.ATT_LINE_LENGTH = exports.ATT_ITEM_ROTATION = exports.ATT_ITEM_POS = exports.ATT_HOLE_OFFSET_B = exports.ATT_HOLE_OFFSET_A = exports.ARROW_TEXT_FORECOLOR = exports.ARROW_TEXT_FONTFACE = exports.ARROW_TEXT_BACKCOLOR = exports.ARROW_COLOR = exports.ARRAY_ELEVATION_VIEW_MODES = exports.ARRAY_3D_MODES = exports.AREA_ACTIONS = exports.API_SERVER_URL = exports.ANIMATE_STEP_MIN = exports.ANIMATE_STEP_MAX = exports.ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT = exports.ANIMATE_OBJECT = exports.ALTERATE_STATE = exports.ADD_VERTICAL_GUIDE = exports.ADD_TO_GROUP = exports.ADD_LAYER = exports.ADD_HORIZONTAL_GUIDE = exports.ADD_GROUP_FROM_SELECTED = exports.ADD_GROUP = exports.ADD_ELEMENT_TO_CATALOG = exports.ADD_CIRCULAR_GUIDE = exports.ADD_CABINETS = exports.ADD_APPLIANCES = exports.ACCENT_COLOR = void 0;
|
|
7
|
-
exports.
|
|
8
|
-
exports.
|
|
9
|
-
exports.
|
|
10
|
-
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = exports.UPDATE_DRAWING_ITEM = exports.UPDATE_DRAWING_HOLE_3D = exports.UPDATE_DRAWING_HOLE = exports.UPDATE_DRAGGING_VERTEX = void 0;
|
|
7
|
+
exports.MODE_DRAWING_ITEM = exports.MODE_DRAWING_HOLE_3D = exports.MODE_DRAWING_HOLE = exports.MODE_DRAGGING_VERTEX = exports.MODE_DRAGGING_LINE = exports.MODE_DRAGGING_ITEM_3D = exports.MODE_DRAGGING_ITEM = exports.MODE_DRAGGING_HOLE_3D = exports.MODE_DRAGGING_HOLE = exports.MODE_CONFIGURING_PROJECT = exports.MODE_BACK_ELEVATION_VIEW = exports.MODE_3D_VIEW = exports.MODE_3D_FIRST_PERSON = exports.MODE_2D_ZOOM_OUT = exports.MODE_2D_ZOOM_IN = exports.MODE_2D_PAN = exports.MODE = exports.MIN_ANGLE_DISALLOW_DRAW_WALL = exports.MIDDLE_MOLDING_LOCATION = exports.MEPSILON = exports.MAX_ZOOM_IN_SCALE = exports.MAX_ANGLE_SCALE = exports.MAKE_FLOOR_PLAN = exports.LOGOUT = exports.LOGIN_SUCCESS = exports.LOGIN_ERROR = exports.LOCAL_STORAGE_TOKEN_VALUE = exports.LOCAL_STORAGE_TOKEN_NAME = exports.LOCAL_STORAGE_ORIGINAL_TOKEN = exports.LOCAL_STORAGE_CUSTOMER_INFO = exports.LOCAL_STORAGE_CART_ACTION = exports.LOAD_PROJECT = exports.LIST_QUANTITIES = exports.LIST_PARTS = exports.LINE_THICKNESS = exports.LINE_ACTIONS = exports.LEFT_DIST_ANG = exports.LEFT = exports.LABEL_COLOR = exports.KITCHEN_KONFIGURATOR = exports.KEYBOARD_BUTTON_CODE = exports.ITEM_TYPE = exports.ITEM_MOVE_UP = exports.ITEMS_ACTIONS = exports.INVERT = exports.INTERNAL_EVENT_UNSELECT_ALL = exports.INTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.INTERNAL_EVENT_SYNC_SCENE = exports.INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_SELECT_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_ITEMS_CATALOG = exports.INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAG_ELEMENT = exports.INSTALLATION_TYPE_SKU_SUFFIX = exports.INSTALLATION_TYPE_NAME = exports.INSTALLATION_SUFFIX_TYPE = exports.INIT_CATALOG = exports.HOLE_NAMES = exports.HOLE_ACTIONS = exports.HDR_URLS = exports.HAS_LOADINGBAR = exports.GROUP_TRANSLATE = exports.GROUP_ROTATE = exports.GROUP_ACTIONS = exports.GO_BACK_TO_CATALOG_PAGE = exports.FRONT_DIST_ANG = exports.FINISHING_TYPE = exports.FINISHING_TOUCH = exports.EXTERNAL_EVENT_ZOOM_OUT = exports.EXTERNAL_EVENT_ZOOM_IN = exports.EXTERNAL_EVENT_UPDATE_PROPERTY = exports.EXTERNAL_EVENT_UPDATE_ATTRIBUTE = exports.EXTERNAL_EVENT_UNDO = exports.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.EXTERNAL_EVENT_TOGGLE_TO_3D = exports.EXTERNAL_EVENT_TOGGLE_TO_2D = exports.EXTERNAL_EVENT_SYNC_SCENE = exports.EXTERNAL_EVENT_SET_MOLDING = exports.EXTERNAL_EVENT_SET_FINISHING = exports.EXTERNAL_EVENT_ROTATE_PAN = exports.EXTERNAL_EVENT_REPLACE_CABINET = exports.EXTERNAL_EVENT_REDO = exports.EXTERNAL_EVENT_PROJECT_SETTING = exports.EXTERNAL_EVENT_NEW_PROJECT = exports.EXTERNAL_EVENT_MOVE_PAN = exports.EXTERNAL_EVENT_LOAD_PROJECT = exports.EXTERNAL_EVENT_DUPLICATE_ELEMENT = exports.EXTERNAL_EVENT_DELETE_ELEMENT = exports.EXTERNAL_EVENT_CHANGE_DOORSTYLE = exports.EXTERNAL_EVENT_CENTERING_2D = exports.EXTERNAL_EVENT_ADD_WALL = exports.EXTERNAL_EVENT_ADD_ROOM_SHAPE = exports.EXTERNAL_EVENT_ADD_ITEM = exports.EXTERNAL_EVENT_ADD_HOLE = exports.ERROR_DATABASE = exports.EPSILON = exports.END_UPLOADING_IMAGE = exports.END_ROTATING_ITEM_3D = void 0;
|
|
8
|
+
exports.SET_DOOR_HANDLE = exports.SET_DISTANT = exports.SET_COUNTER_TOP = exports.SET_BACKSPLASH_VISIBLE = exports.SET_BACKSPLASH = exports.SET_APPLIANCE_MATERIAL = exports.SELECT_TOOL_ZOOM_OUT = exports.SELECT_TOOL_ZOOM_IN = exports.SELECT_TOOL_UPLOAD_IMAGE = exports.SELECT_TOOL_PAN = exports.SELECT_TOOL_EDIT = exports.SELECT_TOOL_DRAWING_LINE = exports.SELECT_TOOL_DRAWING_ITEM_3D = exports.SELECT_TOOL_DRAWING_ITEM = exports.SELECT_TOOL_DRAWING_HOLE_3D = exports.SELECT_TOOL_DRAWING_HOLE = exports.SELECT_TOOL_3D_VIEW = exports.SELECT_TOOL_3D_FIRST_PERSON = exports.SELECT_LINE = exports.SELECT_LAYER = exports.SELECT_ITEM = exports.SELECT_HOLE = exports.SELECT_GROUP = exports.SELECT_DOOR_STYLE = exports.SELECT_AREA = exports.SELECT_ALL = exports.SELECTALL = exports.SECONDARY_PURPLE_COLOR = exports.SECONDARY_BLUE_COLOR = exports.SCENE_ACTIONS = exports.SAVE_PROJECT = exports.SAVE_DESIGN = exports.ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_MEASUREMENT_LINE_COLOR = exports.ROOM_ELEMENT_MEASUREMENT_LINE_COLOR = exports.ROLLBACK = exports.RIGHT_DIST_ANG = exports.RIGHT = exports.REVIEW_AND_QUOTE = exports.REQUEST_ASSISTANCE = exports.REPLACE_SUBMODULE = exports.REPLACE_ITEM = exports.REMOVE_VERTICAL_GUIDE = exports.REMOVE_REPLACE_SUBMODULE = exports.REMOVE_LINEAR = exports.REMOVE_LAYER = exports.REMOVE_HORIZONTAL_GUIDE = exports.REMOVE_GROUP_AND_DELETE_ELEMENTS = exports.REMOVE_GROUP = exports.REMOVE_FROM_GROUP = exports.REMOVE_DRAWING_SUPPORT = exports.REMOVE_CIRCULAR_GUIDE = exports.REMOVE = exports.REDO = exports.RECREATE = exports.PUSH_LAST_SELECTED_CATALOG_ELEMENT_TO_HISTORY = exports.PROP_RESIZE_WIDTH = exports.PROP_RESIZE_HEIGHT = exports.PROP_RESIZE_DEPTH = exports.PROP_OPEN_DOORS = exports.PROP_FLIP_DOOR_HANDLE = exports.PROP_ALTITUDE = exports.PROJECT_SETTING_OPTION = exports.PROJECT_RE_NAME = exports.PROJECT_NAME_LENGTH_LIMIT = exports.PROJECT_ACTIONS = exports.PRODUCT = exports.PRIMARY_GREEN_COLOR = exports.PASTE_PROPERTIES = exports.OVERLAP_SOME = exports.OVERLAP_SAME = exports.OVERLAP_NONE = exports.OVERLAP_LINK = exports.OVERLAP_INCLUDED = exports.OPEN_PROJECT_CONFIGURATOR = exports.OPEN_CATALOG = exports.OBJTYPE_MESH = exports.OBJTYPE_GROUP = exports.NO_DATA_DATABASE = exports.NEW_PROJECT_BTN = exports.NEW_PROJECT = exports.NEW_DESIGN = exports.MOVE_COMPONENT = exports.MOLDING_LOCATIONS = exports.MODE_WAITING_DRAWING_LINE = exports.MODE_VIEWING_CATALOG = exports.MODE_UPLOADING_IMAGE = exports.MODE_SNAPPING = exports.MODE_ROTATING_ITEM_3D = exports.MODE_ROTATING_ITEM = exports.MODE_RIGHT_ELEVATION_VIEW = exports.MODE_LEFT_ELEVATION_VIEW = exports.MODE_IDLE_3D = exports.MODE_IDLE = exports.MODE_FRONT_VIEW = exports.MODE_FRONT_ELEVATION_VIEW = exports.MODE_FITTING_IMAGE = exports.MODE_ELEVATION_VIEW = exports.MODE_DRAWING_LINE = exports.MODE_DRAWING_ITEM_3D = void 0;
|
|
9
|
+
exports.UPDATE_DRAGGING_ITEM_CHANGED = exports.UPDATE_DRAGGING_ITEM_3DY = exports.UPDATE_DRAGGING_ITEM_3DX = exports.UPDATE_DRAGGING_ITEM = exports.UPDATE_DRAGGING_HOLE_RULER_CHANGED = exports.UPDATE_DRAGGING_HOLE_CHANGED = exports.UPDATE_DRAGGING_HOLE_3D = exports.UPDATE_DRAGGING_HOLE = exports.UPDATE_CEIL_HEIGHT_UNIT = exports.UPDATE_CEIL_HEIGHT = exports.UPDATE_3D_CEIL_HEIGHT_UNIT = exports.UPDATE_3D_CEIL_HEIGHT = exports.UPDATE_2D_CAMERA = exports.UNSELECT_GROUP = exports.UNSELECT_ALL = exports.UNIT_MILLIMETER = exports.UNIT_MILE = exports.UNIT_METER = exports.UNIT_INCH = exports.UNIT_FOOT = exports.UNIT_CENTIMETER = exports.UNIT_ANGLE = exports.UNITS_LENGTH = exports.UNDO = exports.UNCREATE = exports.TWO_D_FLOOR_PLAN = exports.TOP_MOLDING_LOCATION = exports.TOP = exports.TOGGLE_SNAP = exports.TOGGLE_LOADING_CABINET = exports.TOE_KICK_MOLDING = exports.TITLE_SMALL_COLOR = exports.TITLE_COLOR = exports.THROW_WARNING = exports.THROW_ERROR = exports.TEXT_COLOR_NEUTRAL_7 = exports.TEXT_COLOR_NEUTRAL_6 = exports.TEXT_COLOR_NEUTRAL_5 = exports.TEXT_COLOR_NEUTRAL_4 = exports.TEXT_COLOR_NEUTRAL_3 = exports.TEXT_COLOR_NEUTRAL_2 = exports.TEXT_COLOR_NEUTRAL_1 = exports.TEXT_COLOR_NEUTRAL_0 = exports.TEXT_COLOR = exports.TECHNICAL_VIEW = exports.TALL_CABINET_LAYOUTPOS = exports.TAKE_PICTURE = exports.SUBTOTAL = exports.SUBMIT_REQUEST_ASSIST = exports.SUBMIT_DESIGN = exports.SUBMIT_ADD_CART = exports.STORE_DIST_ARRAY = exports.STOP_DRAWING_LINE = exports.STEP_CABINET_CHOOSE_PRODUCT = exports.STATUS_WARNING_LIGHT_COLOR = exports.STATUS_WARNING_COLOR = exports.STATUS_POSITIVE_LIGHT_COLOR = exports.STATUS_POSITIVE_COLOR = exports.STATUS_OVERDUE_LIGHT_COLOR = exports.STATUS_OVERDUE_COLOR = exports.STATUS_NEGATIVE_LIGHT_COLOR = exports.STATUS_NEGATIVE_COLOR = exports.STATUS_INFO_LIGHT_COLOR = exports.STATUS_INFO_COLOR = exports.SHIFT2DON = exports.SHIFT2DOFF = exports.SHAPE_SVG_WIDTH = exports.SHAPE_SVG_PADDING = exports.SHAPE_SVG_DEPTH = exports.SHADE_LIGHT_PURPLE_COLOR = exports.SHADE_LIGHT_GREEN_COLOR = exports.SHADE_LIGHT_BLUE_COLOR = exports.SHADE_DARK_PURPLE_COLOR = exports.SHADE_DARK_GREEN_COLOR = exports.SHADE_DARK_BLUE_COLOR = exports.SET_WALL_COLOR = exports.SET_USER_DATA = exports.SET_STATE_PROPERTIES = exports.SET_ROTATE_STATUS = exports.SET_RELATED_LINE = exports.SET_PROPERTIES = exports.SET_PROJECT_PROPERTIES = exports.SET_PROJECT_ID = exports.SET_MOVE_STATUS = exports.SET_MOLDING = exports.SET_MODELLING = exports.SET_MODE = exports.SET_LINES_ATTRIBUTES = exports.SET_LAYER_PROPERTIES = exports.SET_ITEMS_ATTRIBUTES = exports.SET_IS_HELP = exports.SET_IS_CABINET_DRAWING = exports.SET_INITIAL_DOOR_STYLE = exports.SET_HOLES_ATTRIBUTES = exports.SET_HANDLE_MATERIAL = exports.SET_GROUP_PROPERTIES = exports.SET_GROUP_BARYCENTER = exports.SET_GROUP_ATTRIBUTES = exports.SET_FLOOR_STYLES = exports.SET_DOOR_STYLE = void 0;
|
|
10
|
+
exports.ZOOM_VARIABLE = exports.WARRANTY_VIEW = exports.WARRANTY_SUPPORT = exports.WARNING_MESSAGE = exports.WALL_ITEM_MEASUREMENT_LINE_COLOR = exports.WALL_CABINET_LAYOUTPOS = exports.VIEWER3D_ACTIONS = exports.VIEWER2D_ACTIONS = exports.VERTEX_ACTIONS = exports.VALIDATE_ITEM_POSTIONS = exports.USER_ACTIONS = exports.UPDATE_ZOOM_SCALE = exports.UPDATE_ROTATING_ITEM_CHANGED = exports.UPDATE_ROTATING_ITEM = exports.UPDATE_ROTATING = exports.UPDATE_POPUP_OPEN = exports.UPDATE_MOVING_STATE = exports.UPDATE_MOUSE_COORDS = exports.UPDATE_MOLDING = exports.UPDATE_ITEM_POSITION = exports.UPDATE_DRAWING_LINE = exports.UPDATE_DRAWING_ITEM = exports.UPDATE_DRAWING_HOLE_3D = exports.UPDATE_DRAWING_HOLE = exports.UPDATE_DRAGGING_VERTEX = exports.UPDATE_DRAGGING_LINE = void 0;
|
|
11
11
|
//API server
|
|
12
12
|
// export const API_SERVER = 'http://localhost:3000/';
|
|
13
13
|
// ACTIONS project
|
|
@@ -761,6 +761,7 @@ var INTERNAL_EVENT_DRAW_ELEMENT = exports.INTERNAL_EVENT_DRAW_ELEMENT = 'INTERNA
|
|
|
761
761
|
var INTERNAL_EVENT_ROTATE_ELEMENT = exports.INTERNAL_EVENT_ROTATE_ELEMENT = 'INTERNAL_EVENT_ROTATE_ELEMENT';
|
|
762
762
|
var INTERNAL_EVENT_REPLACE_CABINET = exports.INTERNAL_EVENT_REPLACE_CABINET = 'INTERNAL_EVENT_REPLACE_CABINET';
|
|
763
763
|
var INTERNAL_EVENT_START_DRAW_WALL = exports.INTERNAL_EVENT_START_DRAW_WALL = 'INTERNAL_EVENT_START_DRAW_WALL';
|
|
764
|
+
var INTERNAL_EVENT_TOGGLE_TO_ELEVATION = exports.INTERNAL_EVENT_TOGGLE_TO_ELEVATION = 'INTERNAL_EVENT_TOGGLE_TO_ELEVATION';
|
|
764
765
|
|
|
765
766
|
// room shape type
|
|
766
767
|
var ROOM_SHAPE_TYPE = exports.ROOM_SHAPE_TYPE = {
|
package/lib/index.js
CHANGED
|
@@ -34,7 +34,7 @@ function nextFrame() {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
// DIY-714 [Temp Fix] Rewrite API URLs
|
|
37
|
-
var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com)/;
|
|
37
|
+
var API_HOST_REGEX = /(https?:\/\/)?(api\.diydesignspace\.com|api\.addovisuals\.com|127\.0\.0\.1:4002)/;
|
|
38
38
|
var API_HOST_REPLACEMENT = 'https://api-old.diydesignspace.com';
|
|
39
39
|
function rewriteApiUrl(url) {
|
|
40
40
|
return typeof url === 'string' ? url.replace(API_HOST_REGEX, API_HOST_REPLACEMENT) : url;
|
package/lib/models.js
CHANGED
|
@@ -365,6 +365,7 @@ var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
365
365
|
return (0, _createClass2["default"])(Catalog, [{
|
|
366
366
|
key: "factoryElement",
|
|
367
367
|
value: function factoryElement(type, options, initialProperties, state) {
|
|
368
|
+
var _element$structure_js, _element$structure_js2, _element$structure_js3, _element$structure_js4, _element$structure_js5, _element$structure_js6;
|
|
368
369
|
if (!this.elements.has(type)) {
|
|
369
370
|
var catList = this.elements.map(function (element) {
|
|
370
371
|
return element.name;
|
|
@@ -372,6 +373,9 @@ var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
372
373
|
throw new Error("Element ".concat(type, " does not exist in catalog ").concat(catList));
|
|
373
374
|
}
|
|
374
375
|
var element = this.elements.get(type);
|
|
376
|
+
var widthUnit = (_element$structure_js = element === null || element === void 0 || (_element$structure_js2 = element.structure_json) === null || _element$structure_js2 === void 0 ? void 0 : _element$structure_js2.width_unit) !== null && _element$structure_js !== void 0 ? _element$structure_js : 'in';
|
|
377
|
+
var heightUnit = (_element$structure_js3 = element === null || element === void 0 || (_element$structure_js4 = element.structure_json) === null || _element$structure_js4 === void 0 ? void 0 : _element$structure_js4.height_unit) !== null && _element$structure_js3 !== void 0 ? _element$structure_js3 : 'in';
|
|
378
|
+
var lengthUnit = (_element$structure_js5 = element === null || element === void 0 || (_element$structure_js6 = element.structure_json) === null || _element$structure_js6 === void 0 ? void 0 : _element$structure_js6.length_unit) !== null && _element$structure_js5 !== void 0 ? _element$structure_js5 : 'in';
|
|
375
379
|
var properties = element.properties.map(function (value, key) {
|
|
376
380
|
return initialProperties && initialProperties.has(key) ? initialProperties.get(key) : value.get('defaultValue');
|
|
377
381
|
});
|
|
@@ -398,18 +402,18 @@ var Catalog = exports.Catalog = /*#__PURE__*/function (_Record10) {
|
|
|
398
402
|
var _sizeinfo = {
|
|
399
403
|
width: new _immutable.Map({
|
|
400
404
|
_length: temp.width,
|
|
401
|
-
_unit:
|
|
402
|
-
length: (0, _convertUnitsLite.convert)(temp.width).from(
|
|
405
|
+
_unit: widthUnit,
|
|
406
|
+
length: (0, _convertUnitsLite.convert)(temp.width).from(widthUnit).to('cm') // unit of size in dataBundle is inch
|
|
403
407
|
}),
|
|
404
408
|
height: new _immutable.Map({
|
|
405
409
|
_length: temp.height,
|
|
406
|
-
_unit:
|
|
407
|
-
length: (0, _convertUnitsLite.convert)(temp.height).from(
|
|
410
|
+
_unit: heightUnit,
|
|
411
|
+
length: (0, _convertUnitsLite.convert)(temp.height).from(heightUnit).to('cm')
|
|
408
412
|
}),
|
|
409
413
|
depth: new _immutable.Map({
|
|
410
414
|
_length: temp.depth,
|
|
411
|
-
_unit:
|
|
412
|
-
length: (0, _convertUnitsLite.convert)(temp.depth).from(
|
|
415
|
+
_unit: lengthUnit,
|
|
416
|
+
length: (0, _convertUnitsLite.convert)(temp.depth).from(lengthUnit).to('cm')
|
|
413
417
|
})
|
|
414
418
|
};
|
|
415
419
|
properties = properties.set('width', _sizeinfo.width).set('height', _sizeinfo.height).set('depth', _sizeinfo.depth);
|
|
@@ -35,8 +35,10 @@ function _default(state, action) {
|
|
|
35
35
|
if (item.type.includes('Light')) {
|
|
36
36
|
var height = item.properties.getIn(['height', '_length']);
|
|
37
37
|
var heightUnit = item.properties.getIn(['height', '_unit']);
|
|
38
|
-
var newAltitude = action.value - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
38
|
+
var newAltitude = (0, _convertUnitsLite.convert)(action.value).from(_layer.unit).to('in') - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
39
39
|
item = item.setIn(['properties', 'altitude', '_length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to(_layer.unit));
|
|
40
|
+
item = item.setIn(['properties', 'altitude', '_unit'], _layer.unit);
|
|
41
|
+
item = item.setIn(['properties', 'altitude', 'length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to('cm'));
|
|
40
42
|
}
|
|
41
43
|
return item;
|
|
42
44
|
});
|
|
@@ -40,8 +40,10 @@ function _default(state, action) {
|
|
|
40
40
|
if (item.type.includes('Light')) {
|
|
41
41
|
var height = item.properties.getIn(['height', '_length']);
|
|
42
42
|
var heightUnit = item.properties.getIn(['height', '_unit']);
|
|
43
|
-
var newAltitude = action.value - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
43
|
+
var newAltitude = (0, _convertUnitsLite.convert)(action.value).from(_layer.unit).to('in') - (0, _convertUnitsLite.convert)(height).from(heightUnit).to('in');
|
|
44
44
|
item = item.setIn(['properties', 'altitude', '_length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to(_layer.unit));
|
|
45
|
+
item = item.setIn(['properties', 'altitude', '_unit'], _layer.unit);
|
|
46
|
+
item = item.setIn(['properties', 'altitude', 'length'], (0, _convertUnitsLite.convert)(newAltitude).from('in').to('cm'));
|
|
45
47
|
}
|
|
46
48
|
return item;
|
|
47
49
|
});
|
package/lib/utils/geometry.js
CHANGED
|
@@ -841,9 +841,9 @@ function getAllItemSpecified(scene, catalog, filter) {
|
|
|
841
841
|
var info = cat === null || cat === void 0 ? void 0 : cat.info;
|
|
842
842
|
var props = item.properties;
|
|
843
843
|
var getSize = function getSize(key) {
|
|
844
|
-
var _props$getIn;
|
|
844
|
+
var _props$getIn, _props$getIn2, _props$getIn3;
|
|
845
845
|
var length = props === null || props === void 0 || (_props$getIn = props.getIn) === null || _props$getIn === void 0 ? void 0 : _props$getIn.call(props, [key, '_length']);
|
|
846
|
-
return length != null ? (0, _convertUnitsLite.convert)(length).from('in').to(scene.unit) : 0;
|
|
846
|
+
return length != null ? (0, _convertUnitsLite.convert)(length).from((_props$getIn2 = props === null || props === void 0 || (_props$getIn3 = props.getIn) === null || _props$getIn3 === void 0 ? void 0 : _props$getIn3.call(props, [key, '_unit'])) !== null && _props$getIn2 !== void 0 ? _props$getIn2 : 'in').to(scene.unit) : 0;
|
|
847
847
|
};
|
|
848
848
|
val.size = {
|
|
849
849
|
width: getSize('width'),
|
|
@@ -2650,10 +2650,10 @@ function calcDistancesFromItemToWalls(curItem, layer) {
|
|
|
2650
2650
|
height: height
|
|
2651
2651
|
};
|
|
2652
2652
|
var curiteminfo = getCalcRectFromItem2(itemInfo);
|
|
2653
|
-
var allItemRect = getAllItems2(curItem, layer);
|
|
2654
|
-
var allLines = getAllLines(layer);
|
|
2655
|
-
var allLineRects = buildRectFromLines(layer, allLines);
|
|
2656
|
-
var allRect = allLineRects.concat(allItemRect.others);
|
|
2653
|
+
var allItemRect = getAllItems2(curItem, layer); // get all item edge rects
|
|
2654
|
+
var allLines = getAllLines(layer); // get all wall lines
|
|
2655
|
+
var allLineRects = buildRectFromLines(layer, allLines); // make line rects from wall lines
|
|
2656
|
+
var allRect = allLineRects.concat(allItemRect.others); // item edges + wall lines
|
|
2657
2657
|
var _loop = function _loop(i) {
|
|
2658
2658
|
// [rectCenterPoint] has four middle points of cabinet rect edges
|
|
2659
2659
|
var centerpoint = curiteminfo.rectCenterPoint[i];
|