zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making relationship arrows a solid line

Browse Source
This commit is contained in:
Pablo Luna
2011-01-23 19:54:40 -03:00
parent 2b81b71cb4
commit cfe833f947
8 changed files with 96 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web2d/pom.xml
View File

@@ -92,6 +92,7 @@
<include>${basedir}/target/tmp/peer/svg/ArialFont-min.js</include>
<include>${basedir}/target/tmp/peer/svg/PolyLinePeer-min.js</include>
<include>${basedir}/target/tmp/peer/svg/CurvedLinePeer-min.js</include>
<include>${basedir}/target/tmp/peer/svg/ArrowPeer-min.js</include>
<include>${basedir}/target/tmp/peer/svg/TextPeer-min.js</include>
<include>${basedir}/target/tmp/peer/svg/WorkspacePeer-min.js</include>
<include>${basedir}/target/tmp/peer/svg/GroupPeer-min.js</include>
@@ -111,6 +112,7 @@
<include>${basedir}/target/tmp/Line-min.js</include>
<include>${basedir}/target/tmp/PolyLine-min.js</include>
<include>${basedir}/target/tmp/CurvedLine-min.js</include>
<include>${basedir}/target/tmp/Arrow-min.js</include>
<include>${basedir}/target/tmp/Rect-min.js</include>
<include>${basedir}/target/tmp/Text-min.js</include>
<include>${basedir}/target/tmp/Toolkit-min.js</include>

8
web2d/src/main/javascript/Toolkit.js
View File

@@ -75,11 +75,9 @@ web2d.peer.ToolkitVML =
},
createCurvedLine: function()
{
return new web2d.peer.vml.CurvedLinePeer();
},
createCurvedLine: function()
createArrow: function()
{
return new web2d.peer.vml.CurvedLinePeer();
},
createImage: function ()
{
@@ -142,6 +140,10 @@ web2d.peer.ToolkitSVG =
{
return new web2d.peer.svg.CurvedLinePeer();
},
createArrow: function()
{
return new web2d.peer.svg.ArrowPeer();
},
createText: function ()
{
return new web2d.peer.svg.TextPeer();

16
web2d/src/main/javascript/peer/svg/CurvedLinePeer.js
View File

@@ -196,13 +196,7 @@ web2d.peer.svg.CurvedLinePeer.prototype._updatePath = function(avoidControlPoint
yp2 = (x32==0?l2*Math.sign(y32):mp2*xp2);
}
var path = (this._showStartArrow?" "
+"M"+this._x1+","+this._y1+" "
+"L"+(xs2+this._x1)+","+(ys2+this._y1)
+"M"+this._x1+","+this._y1+" "
+"L"+(xp2+this._x1)+","+(yp2+this._y1)
:"")+
"M"+this._x1+","+this._y1
var path = "M"+this._x1+","+this._y1
+" C"+(this._control1.x+this._x1)+","+(this._control1.y+this._y1)+" "
+(this._control2.x+this._x2)+","+(this._control2.y+this._y2)+" "
+this._x2+","+this._y2+
@@ -211,13 +205,7 @@ web2d.peer.svg.CurvedLinePeer.prototype._updatePath = function(avoidControlPoint
+(this._control1.x+this._x1)+","+(this._control1.y+this._y1+3)+" "
+this._x1+","+(this._y1+3)+" Z"
:""
)+
(this._showEndArrow?" "
+"M"+this._x2+","+this._y2+" "
+"L"+(x+this._x2)+","+(y+this._y2)
+"M"+this._x2+","+this._y2+" "
+"L"+(xp+this._x2)+","+(yp+this._y2)
:"");
);
this._native.setAttribute("d",path);
};

1
web2d/src/test/javascript/render/curvedLine.html
View File

@@ -41,6 +41,7 @@
<script type="text/javascript" src="../../../../src/main/javascript/peer/svg/PolyLinePeer.js"></script>
<script type="text/javascript" src="../../../../src/main/javascript/peer/vml/PolyLinePeer.js"></script>
<script type="text/javascript" src="../../../../src/main/javascript/peer/svg/CurvedLinePeer.js"></script>
<script type="text/javascript" src="../../../../src/main/javascript/peer/svg/ArrowPeer.js"></script>
<script type="text/javascript" src="../../../../src/main/javascript/Group.js"></script>
<script type="text/javascript" src="../../../../src/main/javascript/peer/svg/GroupPeer.js"></script>
<script type="text/javascript" src="../../../../src/main/javascript/peer/vml/GroupPeer.js"></script>