Author: paperwing
Date: 2012-02-07 08:56:48 -0800 (Tue, 07 Feb 2012)
New Revision: 28205
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
Log:
Slightly increased arc self-edge radius growth to decrease overlapping
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-02-07 01:55:49 UTC (rev 28204)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-02-07 16:56:48 UTC (rev 28205)
@@ -50,8 +50,9 @@
private static final float DOTTED_EDGE_RADIUS = 0.017f;
private static final float DOTTED_EDGE_SPACING = 0.057f;
- private static final double ARC_SELF_EDGE_MINIMUM_RADIUS = 0.045;
- private static final double ARC_SELF_EDGE_RADIUS_FACTOR = 0.007;
+ private static final double ARC_SELF_EDGE_MINIMUM_RADIUS = 0.055; //
0.045 default feb 7, 2012
+ private static final double ARC_SELF_EDGE_RADIUS_FACTOR = 0.008; //
0.007 default feb 7, 2012
+ private static final double ARC_SELF_EDGE_EXPONENTIAL_BASE = 1.25;
/**
* The number of straight segments used to approximate a curved edge
@@ -387,7 +388,7 @@
if (container.selfEdge) {
// For self-edges, want greater edge level -> greater
radius
curvedEdgeRadius = ARC_SELF_EDGE_MINIMUM_RADIUS
- + ARC_SELF_EDGE_RADIUS_FACTOR *
Math.pow(edgeLevel, 1.2);
+ + ARC_SELF_EDGE_RADIUS_FACTOR *
Math.pow(edgeLevel, ARC_SELF_EDGE_EXPONENTIAL_BASE);
} else {
// For regular edges, want greater edge level ->
smaller radius (more curvature)
curvedEdgeRadius =
container.start.distance(container.end) * (0.5 + (double) 3.5 /
Math.pow(edgeLevel, 2));
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
