Merge branch 'master' into develop

This commit is contained in:
Knut Sveidqvist
2020-05-30 17:11:23 +02:00
8 changed files with 71 additions and 59 deletions

View File

@@ -11,7 +11,7 @@ const question = (parent, node) => {
const w = bbox.width + node.padding;
const h = bbox.height + node.padding;
const s = (w + h) * 0.9;
const s = w + h;
const points = [
{ x: s / 2, y: 0 },
{ x: s, y: -s / 2 },
@@ -22,7 +22,8 @@ const question = (parent, node) => {
const questionElem = insertPolygonShape(shapeSvg, s, s, points);
updateNodeBounds(node, questionElem);
node.intersect = function(point) {
return intersect.polugon(node, points, point);
logger.warn('Intersect called');
return intersect.polygon(node, points, point);
};
return shapeSvg;
@@ -414,7 +415,7 @@ const circle = (parent, node) => {
updateNodeBounds(node, circle);
node.intersect = function(point) {
return intersect.circle(node, point);
return intersect.circle(node, node.rx, point);
};
return shapeSvg;
@@ -464,7 +465,7 @@ const start = (parent, node) => {
updateNodeBounds(node, circle);
node.intersect = function(point) {
return intersect.circle(node, point);
return intersect.circle(node, 7, point);
};
return shapeSvg;
@@ -527,7 +528,7 @@ const end = (parent, node) => {
updateNodeBounds(node, circle);
node.intersect = function(point) {
return intersect.circle(node, point);
return intersect.circle(node, 7, point);
};
return shapeSvg;