mirrors/graphonline
1
0
Fork 0
mirror of https://github.com/UnickSoft/graphonline.git synced 2026-04-04 14:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix remove self edge

Browse Source
This commit is contained in:
Unick Soft
2020-07-09 19:58:41 +02:00
parent 8e2fe8066f
commit 17a276f797
4 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
script/EdgeModel.js
View File

@@ -11,6 +11,8 @@ function EdgeModel()
this.type = EdgeModels.line;
this.curvedValue = EdgeModel.prototype.defaultCruved;
this.default = true;
this.sizeOfLoop = 24;
this.loopShiftAngel = Math.PI / 6;
}
EdgeModel.prototype.defaultCruved = 0.1;
@@ -101,9 +103,19 @@ EdgeModel.prototype.HitTestLine = function(position1, position2, mousePos, facto
factor = 1.0;
}
var pos1 = position1;
var pos2 = position2;
var pos0 = mousePos;
// Self loop case
if (pos1.equals(pos2))
{
var xCenter = pos1.x - Math.cos(this.GetLoopShiftAngel()) * this.GetLoopSize();
var yCenter = pos1.y - Math.sin(this.GetLoopShiftAngel()) * this.GetLoopSize();
return Math.abs((Point.distance(new Point(xCenter, yCenter), pos0)) - this.GetLoopSize()) <= this.width * 1.5 * factor;
}
var r1 = pos0.distance(pos1);
var r2 = pos0.distance(pos2);
@@ -127,6 +139,19 @@ EdgeModel.prototype.HitTestLine = function(position1, position2, mousePos, facto
EdgeModel.prototype.HitTestCurved = function(position1, position2, mousePos)
{
var pos1 = position1;
var pos2 = position2;
var pos0 = mousePos;
// Self loop case
if (pos1.equals(pos2))
{
var xCenter = pos1.x - Math.cos(this.GetLoopShiftAngel()) * this.GetLoopSize();
var yCenter = pos1.y - Math.sin(this.GetLoopShiftAngel()) * this.GetLoopSize();
return Math.abs((Point.distance(new Point(xCenter, yCenter), pos0)) - this.GetLoopSize()) <= this.width * 1.5;
}
var interval_count = position1.distance(position2) / 100 * 30;
var start = position1;
@@ -174,3 +199,14 @@ EdgeModel.prototype.SetCurvedValue = function (value)
this.default = false;
}
EdgeModel.prototype.GetLoopSize = function ()
{
return this.sizeOfLoop;
}
EdgeModel.prototype.GetLoopShiftAngel = function ()
{
return this.loopShiftAngel;
}