Changeset 1087:d496d1d5a5e7 in lemon-0.x for src

Timestamp:

01/18/05 13:23:09 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1483

Message:

Correct bad arrow enpoint when parallel edges are enabled.

File:

• src/lemon/graph_to_eps.h (modified) (6 diffs)

src/lemon/graph_to_eps.h

@@ -153 +153 @@
   typedef typename Graph::InEdgeIt InEdgeIt;
   typedef typename Graph::OutEdgeIt OutEdgeIt;
+
+  static const int INTERPOL_PREC=20;
 
   bool dontPrint;
@@ -518 +520 @@
             if(_drawArrows) {
               int node_shape;
-              const int INERPOL_PREC=20;
               xy<double> s=_coords[g.source(*e)];
               xy<double> t=_coords[g.target(*e)];
@@ -525 +526 @@
               Bezier3 bez(s,mm,mm,t);
               double t1=0,t2=1;
-              for(int i=0;i<INERPOL_PREC;++i)
+              for(int i=0;i<INTERPOL_PREC;++i)
                 if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t2=(t1+t2)/2;
                 else t1=(t1+t2)/2;
@@ -532 +533 @@
               rn*=rn;
               t2=(t1+t2)/2;t1=0;
-              for(int i=0;i<INERPOL_PREC;++i)
+              for(int i=0;i<INTERPOL_PREC;++i)
                 if((bez((t1+t2)/2)-apoint).normSquare()>rn) t1=(t1+t2)/2;
                 else t2=(t1+t2)/2;
@@ -540 +541 @@
 //            node_shape=_nodeShapes[g.source(*e)];
 //            t1=0;t2=1;
-//            for(int i=0;i<INERPOL_PREC;++i)
+//            for(int i=0;i<INTERPOL_PREC;++i)
 //              if(isInsideNode(bez((t1+t2)/2)-t,rn,node_shape)) t1=(t1+t2)/2;
 //              else t2=(t1+t2)/2;
@@ -578 +579 @@
           if(_drawArrows) {
             xy<double> d(_coords[g.target(e)]-_coords[g.source(e)]);
+            double rn=_nodeSizes[g.target(e)]*_nodeScale;
+            int node_shape=_nodeShapes[g.target(e)];
+            double t1=0,t2=1;
+            for(int i=0;i<INTERPOL_PREC;++i)
+              if(isInsideNode((-(t1+t2)/2)*d,rn,node_shape)) t1=(t1+t2)/2;
+              else t2=(t1+t2)/2;
             double l=sqrt(d.normSquare());
             d/=l;
-            xy<double> x1(d*_nodeScale*_nodeSizes[g.source(e)]+
-                          _coords[g.source(e)]);
-            os << l-(_nodeSizes[g.source(e)]+
-                     _nodeSizes[g.target(e)])*_nodeScale << ' '
+            
+            os << l*(1-(t1+t2)/2) << ' '
                << _edgeWidths[e]*_edgeWidthScale << ' '
                << d.x << ' ' << d.y << ' '
-               << x1.x << ' ' << x1.y << ' '
+               << _coords[g.source(e)].x << ' '
+               << _coords[g.source(e)].y << ' '
                << _edgeColors[e].getR() << ' '
                << _edgeColors[e].getG() << ' '