|
|
@ -91,6 +91,12 @@ function createLine(points, id, end) {
|
|
|
|
newPoints = [startX, startY, startX + distance20, startY, endX - distance20, endY, endX, endY];
|
|
|
|
newPoints = [startX, startY, startX + distance20, startY, endX - distance20, endY, endX, endY];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var change = [
|
|
|
|
|
|
|
|
[],
|
|
|
|
|
|
|
|
[],
|
|
|
|
|
|
|
|
[]
|
|
|
|
|
|
|
|
];
|
|
|
|
|
|
|
|
console.log(newPoints);
|
|
|
|
for (let j = 0; j < 3; j++) {
|
|
|
|
for (let j = 0; j < 3; j++) {
|
|
|
|
var maxX = newPoints[2 + (2 * j)] - newPoints[0 + (2 * j)],
|
|
|
|
var maxX = newPoints[2 + (2 * j)] - newPoints[0 + (2 * j)],
|
|
|
|
resteX = newPoints[0 + (2 * j)],
|
|
|
|
resteX = newPoints[0 + (2 * j)],
|
|
|
@ -112,14 +118,33 @@ function createLine(points, id, end) {
|
|
|
|
logiques.forEach(function (logique) {
|
|
|
|
logiques.forEach(function (logique) {
|
|
|
|
if (x > logique.x && x < logique.x + imageWidth && y > logique.y && y < logique.y + imageHeight) iscollapsing = true;
|
|
|
|
if (x > logique.x && x < logique.x + imageWidth && y > logique.y && y < logique.y + imageHeight) iscollapsing = true;
|
|
|
|
if (iscollapsing) {
|
|
|
|
if (iscollapsing) {
|
|
|
|
createCircle(x, y, ["l"])
|
|
|
|
change[j].push([x, y]);
|
|
|
|
console.log("ouiiiiii")
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (change[j].length !== 0) {
|
|
|
|
|
|
|
|
var changePoints = [],
|
|
|
|
|
|
|
|
debBaseX = change[j][0][0],
|
|
|
|
|
|
|
|
debBaseY = change[j][0][1],
|
|
|
|
|
|
|
|
finBaseX = change[j][change[j].length - 1][0],
|
|
|
|
|
|
|
|
finBaseY = change[j][change[j].length - 1][1],
|
|
|
|
|
|
|
|
newStartX = debBaseX - ((finBaseX - debBaseX) / 100 * 10),
|
|
|
|
|
|
|
|
newStartY = debBaseY,
|
|
|
|
|
|
|
|
newStartX2 = debBaseX,
|
|
|
|
|
|
|
|
newStartY2 = debBaseY + (imageHeight / 100 * 40),
|
|
|
|
|
|
|
|
newStartX3 = finBaseX,
|
|
|
|
|
|
|
|
newStartY3 = finBaseY + (imageHeight / 100 * 40),
|
|
|
|
|
|
|
|
newStartX4 = finBaseX + ((finBaseX - debBaseX) / 100 * 40),
|
|
|
|
|
|
|
|
newStartY4 = finBaseY;
|
|
|
|
|
|
|
|
changePoints.push(newStartY4, newStartX4, newStartY3, newStartX3, newStartY2, newStartX2, newStartY, newStartX);
|
|
|
|
|
|
|
|
//on supprime les anciens points :
|
|
|
|
|
|
|
|
//for (let k = 0; k < 4; k++)
|
|
|
|
|
|
|
|
//newPoints.splice(newPoints.indexOf(newPoints[k + (2 * j)]), 1);
|
|
|
|
|
|
|
|
for (let k = 0; k < 8; k++)
|
|
|
|
|
|
|
|
newPoints.splice(newPoints.indexOf(newPoints[0 + (2 * j)]), 0, changePoints[k]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
console.log(newPoints);
|
|
|
|
let line = new Konva.Line({
|
|
|
|
let line = new Konva.Line({
|
|
|
|
points: newPoints,
|
|
|
|
points: newPoints,
|
|
|
|
stroke: colorLineInnactive,
|
|
|
|
stroke: colorLineInnactive,
|
|
|
|