Compare commits
No commits in common. "c4a894fdd195af1ffa019da7342ef9b95051a410" and "3aac4f8ac096fe5eaa0f65e757b36289f82ac9fe" have entirely different histories.
c4a894fdd1
...
3aac4f8ac0
@ -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)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@ -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
Loading…
x
Reference in New Issue
Block a user