qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[1267] 500에러 - str => Number 변환 #289

Merged
ysCha merged 1 commits from dev into prd-deploy 2025-08-20 17:01:43 +09:00
Conversation 0 Commits 1 Files Changed 3 +15 -7
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/fabric/QLine.js
View File

@ -17,7 +17,7 @@ export const QLine = fabric.util.createClass(fabric.Line, {
initialize: function (points, options, length = 0) { initialize: function (points, options, length = 0) {
// 소수점 전부 제거 // 소수점 전부 제거
points = points.map((point) => Number(point?.toFixed(1))) points = points.map((point) => Number(point).toFixed(1))
this.callSuper('initialize', points, { ...options, selectable: options.selectable ?? true }) this.callSuper('initialize', points, { ...options, selectable: options.selectable ?? true })
if (options.id) { if (options.id) {

12
src/components/fabric/QPolygon.js
View File

@ -710,14 +710,14 @@ export const QPolygon = fabric.util.createClass(fabric.Polygon, {
inPolygonImproved(point) { inPolygonImproved(point) {
const vertices = this.points const vertices = this.points
let inside = false let inside = false
const testX = Number(point.x.toFixed(this.toFixed)) const testX = Number(point.x).toFixed(this.toFixed)
const testY = Number(point.y.toFixed(this.toFixed)) const testY = Number(point.y).toFixed(this.toFixed)
for (let i = 0, j = vertices.length - 1; i < vertices.length; j = i++) { for (let i = 0, j = vertices.length - 1; i < vertices.length; j = i++) {
const xi = Number(vertices[i].x.toFixed(this.toFixed)) const xi = Number(vertices[i].x).toFixed(this.toFixed)
const yi = Number(vertices[i].y.toFixed(this.toFixed)) const yi = Number(vertices[i].y).toFixed(this.toFixed)
const xj = Number(vertices[j].x.toFixed(this.toFixed)) const xj = Number(vertices[j].x).toFixed(this.toFixed)
const yj = Number(vertices[j].y.toFixed(this.toFixed)) const yj = Number(vertices[j].y).toFixed(this.toFixed)
// 점이 정점 위에 있는지 확인 // 점이 정점 위에 있는지 확인
if (Math.abs(xi - testX) < 0.01 && Math.abs(yi - testY) < 0.01) { if (Math.abs(xi - testX) < 0.01 && Math.abs(yi - testY) < 0.01) {

8
src/util/canvas-util.js
View File

@ -342,6 +342,14 @@ export const findIntersection1 = (line1, line2) => {
} }
export const calculateIntersection = (line1, line2) => { export const calculateIntersection = (line1, line2) => {
line1.x1 = Number(line1.x1)
line1.y1 = Number(line1.y1)
line1.x2 = Number(line1.x2)
line1.y2 = Number(line1.y2)
line2.x1 = Number(line2.x1)
line2.y1 = Number(line2.y1)
line2.x2 = Number(line2.x2)
line2.y2 = Number(line2.y2)
const result = intersect([line1.x1, line1.y1], [line1.x2, line1.y2], [line2.x1, line2.y1], [line2.x2, line2.y2]) const result = intersect([line1.x1, line1.y1], [line1.x2, line1.y2], [line2.x1, line2.y1], [line2.x2, line2.y2])
if (!result) { if (!result) {
return null return null