Merge pull request 'globalPitch 추가' (#263) from dev into prd-deploy
Reviewed-on: #263
This commit is contained in:
commit
2a3f3bb568
@ -1,4 +1,4 @@
|
|||||||
import { ANGLE_TYPE, canvasState, currentAngleTypeSelector, pitchTextSelector } from '@/store/canvasAtom'
|
import { ANGLE_TYPE, canvasState, currentAngleTypeSelector, globalPitchState, pitchTextSelector } from '@/store/canvasAtom'
|
||||||
import { useRecoilValue } from 'recoil'
|
import { useRecoilValue } from 'recoil'
|
||||||
import { fabric } from 'fabric'
|
import { fabric } from 'fabric'
|
||||||
import { calculateIntersection, findAndRemoveClosestPoint, getDegreeByChon, getDegreeInOrientation, isPointOnLine } from '@/util/canvas-util'
|
import { calculateIntersection, findAndRemoveClosestPoint, getDegreeByChon, getDegreeInOrientation, isPointOnLine } from '@/util/canvas-util'
|
||||||
@ -17,6 +17,7 @@ export const usePolygon = () => {
|
|||||||
const lengthTextFontOptions = useRecoilValue(fontSelector('lengthText'))
|
const lengthTextFontOptions = useRecoilValue(fontSelector('lengthText'))
|
||||||
const currentAngleType = useRecoilValue(currentAngleTypeSelector)
|
const currentAngleType = useRecoilValue(currentAngleTypeSelector)
|
||||||
const pitchText = useRecoilValue(pitchTextSelector)
|
const pitchText = useRecoilValue(pitchTextSelector)
|
||||||
|
const globalPitch = useRecoilValue(globalPitchState)
|
||||||
|
|
||||||
const { getLengthByLine } = useLine()
|
const { getLengthByLine } = useLine()
|
||||||
|
|
||||||
@ -1337,7 +1338,7 @@ export const usePolygon = () => {
|
|||||||
defense = 'south'
|
defense = 'south'
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
pitch = polygon.lines[index]?.attributes?.pitch ?? representLine?.attributes?.pitch ?? 0
|
pitch = polygon.lines[index]?.attributes?.pitch ?? representLine?.attributes?.pitch ?? globalPitch
|
||||||
|
|
||||||
const roof = new QPolygon(roofPoint, {
|
const roof = new QPolygon(roofPoint, {
|
||||||
fontSize: polygon.fontSize,
|
fontSize: polygon.fontSize,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user