|
|
|
@ -14,6 +14,7 @@ import { equaln } from "../../../Geometry/GeUtils";
|
|
|
|
|
import { observer, inject } from "mobx-react";
|
|
|
|
|
import '../../../UI/Components/Modal/ModalStyle/Modal.less'
|
|
|
|
|
import { Button, Classes, H5 } from "@blueprintjs/core";
|
|
|
|
|
import { safeEval } from "../../../Common/eval";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@inject('board')
|
|
|
|
@ -43,12 +44,12 @@ export class BoardPropsComponent extends React.Component<{ board: Board }, {}>
|
|
|
|
|
let newConfig = {
|
|
|
|
|
name: data.Name,
|
|
|
|
|
type: data.BoardType,
|
|
|
|
|
height: parseFloat(FixedNotZero(data.Height, 2)),
|
|
|
|
|
width: parseFloat(FixedNotZero(data.Width, 2)),
|
|
|
|
|
thickness: parseFloat(FixedNotZero(data.Thickness, 2)),
|
|
|
|
|
rotateX: parseFloat(FixedNotZero(Math.radToDeg(ro.x), 2)),
|
|
|
|
|
rotateY: parseFloat(FixedNotZero(Math.radToDeg(ro.y), 2)),
|
|
|
|
|
rotateZ: parseFloat(FixedNotZero(Math.radToDeg(ro.z), 2)),
|
|
|
|
|
height: safeEval(FixedNotZero(data.Height, 2)),
|
|
|
|
|
width: safeEval(FixedNotZero(data.Width, 2)),
|
|
|
|
|
thickness: safeEval(FixedNotZero(data.Thickness, 2)),
|
|
|
|
|
rotateX: safeEval(FixedNotZero(Math.radToDeg(ro.x), 2)),
|
|
|
|
|
rotateY: safeEval(FixedNotZero(Math.radToDeg(ro.y), 2)),
|
|
|
|
|
rotateZ: safeEval(FixedNotZero(Math.radToDeg(ro.z), 2)),
|
|
|
|
|
}
|
|
|
|
|
if (this.m_ConfigOption)
|
|
|
|
|
Object.assign(this.m_ConfigOption, newConfig);
|
|
|
|
@ -122,22 +123,22 @@ export class BoardPropsComponent extends React.Component<{ board: Board }, {}>
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
board.Name = this.m_ConfigOption.name;
|
|
|
|
|
board.Height = parseFloat(this.m_ConfigOption.height.toString());
|
|
|
|
|
board.Width = parseFloat(this.m_ConfigOption.width.toString());
|
|
|
|
|
board.Thickness = parseFloat(this.m_ConfigOption.thickness.toString());
|
|
|
|
|
board.Height = safeEval(this.m_ConfigOption.height.toString());
|
|
|
|
|
board.Width = safeEval(this.m_ConfigOption.width.toString());
|
|
|
|
|
board.Thickness = safeEval(this.m_ConfigOption.thickness.toString());
|
|
|
|
|
board.BoardType = this.m_ConfigOption.type;
|
|
|
|
|
|
|
|
|
|
//应用旋转分量
|
|
|
|
|
let oldEuler = board.Rotation;
|
|
|
|
|
let newRoX = Math.degToRad(parseFloat(this.m_ConfigOption.rotateX.toString()));
|
|
|
|
|
let newRoY = Math.degToRad(parseFloat(this.m_ConfigOption.rotateY.toString()));
|
|
|
|
|
let newRoZ = Math.degToRad(parseFloat(this.m_ConfigOption.rotateZ.toString()));
|
|
|
|
|
let newRoX = Math.degToRad(safeEval(this.m_ConfigOption.rotateX.toString()));
|
|
|
|
|
let newRoY = Math.degToRad(safeEval(this.m_ConfigOption.rotateY.toString()));
|
|
|
|
|
let newRoZ = Math.degToRad(safeEval(this.m_ConfigOption.rotateZ.toString()));
|
|
|
|
|
|
|
|
|
|
//应用槽数据
|
|
|
|
|
board.KnifeRadius = parseFloat(this.m_GrooveOption.knifeRadius);
|
|
|
|
|
board.GroovesAddLength = parseFloat(this.m_GrooveOption.grooveAddLength);
|
|
|
|
|
board.GroovesAddWidth = parseFloat(this.m_GrooveOption.grooveAddWidth);
|
|
|
|
|
board.GroovesAddDepth = parseFloat(this.m_GrooveOption.grooveAddDepth);
|
|
|
|
|
board.KnifeRadius = safeEval(this.m_GrooveOption.knifeRadius);
|
|
|
|
|
board.GroovesAddLength = safeEval(this.m_GrooveOption.grooveAddLength);
|
|
|
|
|
board.GroovesAddWidth = safeEval(this.m_GrooveOption.grooveAddWidth);
|
|
|
|
|
board.GroovesAddDepth = safeEval(this.m_GrooveOption.grooveAddDepth);
|
|
|
|
|
|
|
|
|
|
if (!equaln(oldEuler.x, newRoX, 1e-2)
|
|
|
|
|
|| !equaln(oldEuler.y, newRoY, 1e-2)
|
|
|
|
|