Revert "- 회로번호 폰트 적용"
This reverts commit 4ed0ea19640a4c1ba7f024b2f94761894784200a.
This commit is contained in:
parent
4ed0ea1964
commit
2428d22c11
@ -14,7 +14,6 @@ import { globalLocaleStore } from '@/store/localeAtom'
|
|||||||
import { POLYGON_TYPE } from '@/common/common'
|
import { POLYGON_TYPE } from '@/common/common'
|
||||||
import { useSwal } from '@/hooks/useSwal'
|
import { useSwal } from '@/hooks/useSwal'
|
||||||
import { circuitNumDisplaySelector } from '@/store/settingAtom'
|
import { circuitNumDisplaySelector } from '@/store/settingAtom'
|
||||||
import { fontSelector } from '@/store/fontAtom'
|
|
||||||
|
|
||||||
export default function StepUp(props) {
|
export default function StepUp(props) {
|
||||||
const {
|
const {
|
||||||
@ -48,7 +47,6 @@ export default function StepUp(props) {
|
|||||||
// 선택된 값들을 저장할 상태 추가
|
// 선택된 값들을 저장할 상태 추가
|
||||||
const [selectedValues, setSelectedValues] = useState({})
|
const [selectedValues, setSelectedValues] = useState({})
|
||||||
const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector)
|
const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector)
|
||||||
const circuitNumberText = useRecoilValue(fontSelector('circuitNumberText'))
|
|
||||||
// useCanvasPopupStatusController(6)
|
// useCanvasPopupStatusController(6)
|
||||||
// const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore)
|
// const canvasPopupStatusState = useRecoilValue(canvasPopupStatusStore)
|
||||||
// if (Object.keys(canvasPopupStatusState[6]).length !== 0) {
|
// if (Object.keys(canvasPopupStatusState[6]).length !== 0) {
|
||||||
@ -114,11 +112,7 @@ export default function StepUp(props) {
|
|||||||
left: targetModule.left + targetModule.width / 2,
|
left: targetModule.left + targetModule.width / 2,
|
||||||
top: targetModule.top + targetModule.height / 2,
|
top: targetModule.top + targetModule.height / 2,
|
||||||
fill: 'black',
|
fill: 'black',
|
||||||
fontFamily: circuitNumberText.fontFamily.value,
|
fontSize: 20,
|
||||||
fontWeight: circuitNumberText.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
|
|
||||||
fontStyle: circuitNumberText.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
|
|
||||||
fontSize: circuitNumberText.fontSize.value,
|
|
||||||
fill: circuitNumberText.fontColor.value,
|
|
||||||
width: targetModule.width,
|
width: targetModule.width,
|
||||||
height: targetModule.height,
|
height: targetModule.height,
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
@ -427,7 +421,7 @@ export default function StepUp(props) {
|
|||||||
roofSurface.moduleList.forEach((module) => {
|
roofSurface.moduleList.forEach((module) => {
|
||||||
const targetModule = canvas.getObjects().filter((obj) => obj.id === module.uniqueId)[0]
|
const targetModule = canvas.getObjects().filter((obj) => obj.id === module.uniqueId)[0]
|
||||||
if (module.circuit === '') return
|
if (module.circuit === '') return
|
||||||
const moduleCircuitText = new fabricxtxt(module.circuit, {
|
const moduleCircuitText = new fabric.Text(module.circuit, {
|
||||||
left: targetModule.left + targetModule.width / 2,
|
left: targetModule.left + targetModule.width / 2,
|
||||||
top: targetModule.top + targetModule.height / 2,
|
top: targetModule.top + targetModule.height / 2,
|
||||||
fill: 'black',
|
fill: 'black',
|
||||||
|
|||||||
@ -7,7 +7,6 @@ import { useMessage } from '@/hooks/useMessage'
|
|||||||
import { useSwal } from '@/hooks/useSwal'
|
import { useSwal } from '@/hooks/useSwal'
|
||||||
import { canvasState } from '@/store/canvasAtom'
|
import { canvasState } from '@/store/canvasAtom'
|
||||||
import { moduleStatisticsState } from '@/store/circuitTrestleAtom'
|
import { moduleStatisticsState } from '@/store/circuitTrestleAtom'
|
||||||
import { fontSelector } from '@/store/fontAtom'
|
|
||||||
import { selectedModuleState } from '@/store/selectedModuleOptions'
|
import { selectedModuleState } from '@/store/selectedModuleOptions'
|
||||||
import { circuitNumDisplaySelector } from '@/store/settingAtom'
|
import { circuitNumDisplaySelector } from '@/store/settingAtom'
|
||||||
import { useContext, useEffect, useState } from 'react'
|
import { useContext, useEffect, useState } from 'react'
|
||||||
@ -33,7 +32,6 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
const { getPcsManualConfChk } = useMasterController()
|
const { getPcsManualConfChk } = useMasterController()
|
||||||
const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector)
|
const isDisplayCircuitNumber = useRecoilValue(circuitNumDisplaySelector)
|
||||||
const { setModuleStatisticsData } = useCircuitTrestle()
|
const { setModuleStatisticsData } = useCircuitTrestle()
|
||||||
const circuitNumberText = useRecoilValue(fontSelector('circuitNumberText'))
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setModuleStatisticsData()
|
setModuleStatisticsData()
|
||||||
@ -135,10 +133,7 @@ export default function PassivityCircuitAllocation(props) {
|
|||||||
left: obj.left + obj.width / 2,
|
left: obj.left + obj.width / 2,
|
||||||
top: obj.top + obj.height / 2,
|
top: obj.top + obj.height / 2,
|
||||||
fill: 'black',
|
fill: 'black',
|
||||||
fontFamily: circuitNumberText.fontFamily.value,
|
fontSize: 20,
|
||||||
fontWeight: circuitNumberText.fontWeight.value.toLowerCase().includes('bold') ? 'bold' : 'normal',
|
|
||||||
fontStyle: circuitNumberText.fontWeight.value.toLowerCase().includes('italic') ? 'italic' : 'normal',
|
|
||||||
fontSize: circuitNumberText.fontSize.value,
|
|
||||||
width: obj.width,
|
width: obj.width,
|
||||||
height: obj.height,
|
height: obj.height,
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user