equal
deleted
inserted
replaced
841 if(_showEdges) { |
841 if(_showEdges) { |
842 os << "%Edges:\ngsave\n"; |
842 os << "%Edges:\ngsave\n"; |
843 if(_enableParallel) { |
843 if(_enableParallel) { |
844 std::vector<Edge> el; |
844 std::vector<Edge> el; |
845 for(EdgeIt e(g);e!=INVALID;++e) |
845 for(EdgeIt e(g);e!=INVALID;++e) |
846 if((!_undirected||g.source(e)<g.target(e))&&_edgeWidths[e]>0) |
846 if((!_undirected||g.source(e)<g.target(e))&&_edgeWidths[e]>0 |
|
847 &&g.source(e)!=g.target(e)) |
847 el.push_back(e); |
848 el.push_back(e); |
848 std::sort(el.begin(),el.end(),edgeLess(g)); |
849 std::sort(el.begin(),el.end(),edgeLess(g)); |
849 |
850 |
850 typename std::vector<Edge>::iterator j; |
851 typename std::vector<Edge>::iterator j; |
851 for(typename std::vector<Edge>::iterator i=el.begin();i!=el.end();i=j) { |
852 for(typename std::vector<Edge>::iterator i=el.begin();i!=el.end();i=j) { |
929 sw+=_edgeWidths[*e]*_edgeWidthScale/2.0+_parEdgeDist; |
930 sw+=_edgeWidths[*e]*_edgeWidthScale/2.0+_parEdgeDist; |
930 } |
931 } |
931 } |
932 } |
932 } |
933 } |
933 else for(EdgeIt e(g);e!=INVALID;++e) |
934 else for(EdgeIt e(g);e!=INVALID;++e) |
934 if((!_undirected||g.source(e)<g.target(e))&&_edgeWidths[e]>0) |
935 if((!_undirected||g.source(e)<g.target(e))&&_edgeWidths[e]>0 |
|
936 &&g.source(e)!=g.target(e)) |
935 if(_drawArrows) { |
937 if(_drawArrows) { |
936 xy<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]); |
938 xy<double> d(mycoords[g.target(e)]-mycoords[g.source(e)]); |
937 double rn=_nodeSizes[g.target(e)]*_nodeScale; |
939 double rn=_nodeSizes[g.target(e)]*_nodeScale; |
938 int node_shape=_nodeShapes[g.target(e)]; |
940 int node_shape=_nodeShapes[g.target(e)]; |
939 double t1=0,t2=1; |
941 double t1=0,t2=1; |