Compare commits

..

No commits in common. "c4a894fdd195af1ffa019da7342ef9b95051a410" and "3aac4f8ac096fe5eaa0f65e757b36289f82ac9fe" have entirely different histories.

3 changed files with 360 additions and 1454 deletions

View File

@ -6,8 +6,6 @@ import { calculateAngle, drawRidgeRoof, drawShedRoof, toGeoJSON } from '@/util/q
import * as turf from '@turf/turf' import * as turf from '@turf/turf'
import { LINE_TYPE, POLYGON_TYPE } from '@/common/common' import { LINE_TYPE, POLYGON_TYPE } from '@/common/common'
import Big from 'big.js' import Big from 'big.js'
import { drawSkeletonRidgeRoof, drawSkeletonWithTransformedEdges } from '@/util/skeleton-utils'
import { logger } from '@/util/logger'
export const QPolygon = fabric.util.createClass(fabric.Polygon, { export const QPolygon = fabric.util.createClass(fabric.Polygon, {
type: 'QPolygon', type: 'QPolygon',
@ -244,12 +242,6 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
* @param settingModalFirstOptions * @param settingModalFirstOptions
*/ */
drawHelpLine(settingModalFirstOptions) { drawHelpLine(settingModalFirstOptions) {
// canvas에 skeleton 상태 저장 객체 초기화
if (!this.canvas.skeletonStates) {
this.canvas.skeletonStates = {};
this.canvas.skeletonLines = [];
}
/* innerLines 초기화 */ /* innerLines 초기화 */
this.canvas this.canvas
.getObjects() .getObjects()
@ -326,10 +318,7 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
drawRidgeRoof(this.id, this.canvas, textMode) drawRidgeRoof(this.id, this.canvas, textMode)
} }
} else { } else {
drawRidgeRoof(this.id, this.canvas, textMode)
drawSkeletonRidgeRoof(this.id, this.canvas, textMode)
//drawRidgeRoof(this.id, this.canvas, textMode)
} }
}, },

View File

@ -21,7 +21,6 @@ const Trestle = forwardRef((props, ref) => {
const [isAutoSelecting, setIsAutoSelecting] = useState(false) // const [isAutoSelecting, setIsAutoSelecting] = useState(false) //
const [autoSelectTimeout, setAutoSelectTimeout] = useState(null) // const [autoSelectTimeout, setAutoSelectTimeout] = useState(null) //
const autoSelectTimeoutRef = useRef(null) const autoSelectTimeoutRef = useRef(null)
// () // ()
const AUTO_SELECT_TIMEOUT = 700 // API const AUTO_SELECT_TIMEOUT = 700 // API
const { const {
@ -468,8 +467,7 @@ const Trestle = forwardRef((props, ref) => {
...selectedRoofBase, ...selectedRoofBase,
}, },
construction: { construction: {
//...constructionList.find((data) => newAddedRoofs[index].construction.constTp === data.constTp), ...constructionList.find((data) => newAddedRoofs[index].construction.constTp === data.constTp),
...constructionList.find((data) => trestleState.constTp === data.constTp),
cvrYn, cvrYn,
snowGdPossYn, snowGdPossYn,
cvrChecked, cvrChecked,

File diff suppressed because it is too large Load Diff