Author: kono
Date: 2010-06-28 16:56:37 -0700 (Mon, 28 Jun 2010)
New Revision: 20708
Modified:
corelibs/trunk/render.stateful/lib/cytoscape-render-immed.jar
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/GraphRenderer.java
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/NodeDetails.java
Log:
Image export bugs fixed. Still needs some optimizations.
Modified: corelibs/trunk/render.stateful/lib/cytoscape-render-immed.jar
===================================================================
(Binary files differ)
Modified:
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/GraphRenderer.java
===================================================================
---
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/GraphRenderer.java
2010-06-28 23:55:58 UTC (rev 20707)
+++
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/GraphRenderer.java
2010-06-28 23:56:37 UTC (rev 20708)
@@ -144,6 +144,7 @@
final GraphGraphics grafx, final
Paint bgPaint,
final double xCenter, final double
yCenter,
final double scaleFactor) {
+
nodeBuff.empty(); // Make sure we keep our promise.
// Define the visible window in node coordinate space.
@@ -427,11 +428,6 @@
? null : edgeDetails.targetArrowPaint(edge));
}
- // Compute dash length.
-// final float dashLength
= (((lodBits & LOD_DASHED_EDGES) == 0) ? 0.0f
-//
: edgeDetails
-//
.segmentDashLength(edge));
-
// Compute the anchors
to use when rendering edge.
final EdgeAnchors
anchors = (((lodBits & LOD_EDGE_ANCHORS) == 0) ? null
: edgeDetails
@@ -446,10 +442,7 @@
final float srcYAdj =
floatBuff3[1];
final float trgXAdj =
floatBuff4[0];
final float trgYAdj =
floatBuff4[1];
-//
grafx.drawEdgeFull(srcArrow, srcArrowSize, srcArrowPaint, trgArrow,
-//
trgArrowSize, trgArrowPaint, srcXAdj, srcYAdj,
-//
anchors, trgXAdj, trgYAdj, thickness, segPaint,
-//
dashLength);
+
grafx.drawEdgeFull(srcArrow, srcArrowSize, srcArrowPaint, trgArrow,
trgArrowSize, trgArrowPaint, srcXAdj, srcYAdj,
anchors, trgXAdj, trgYAdj, thickness, edgeStroke, segPaint);
@@ -1028,7 +1021,21 @@
}
- private static final void renderNodeHigh(final FixedGraph graph, final
GraphGraphics grafx, final int node, final float[] floatBuff1, final double[]
doubleBuff1, final double[] doubleBuff2, final NodeDetails nodeDetails, final
int lodBits) {
+ /**
+ * Render node view with details, including custom graphics.
+ *
+ * @param graph
+ * @param grafx
+ * @param node
+ * @param floatBuff1
+ * @param doubleBuff1
+ * @param doubleBuff2
+ * @param nodeDetails
+ * @param lodBits
+ */
+ private static final void renderNodeHigh(final FixedGraph graph, final
GraphGraphics grafx,
+ final int node, final float[] floatBuff1, final
double[] doubleBuff1, final double[] doubleBuff2,
+ final NodeDetails nodeDetails, final int lodBits) {
if ((floatBuff1[0] != floatBuff1[2]) && (floatBuff1[1] !=
floatBuff1[3])) {
// Compute visual attributes that do not depend on LOD.
Modified:
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/NodeDetails.java
===================================================================
---
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/NodeDetails.java
2010-06-28 23:55:58 UTC (rev 20707)
+++
corelibs/trunk/render.stateful/src/cytoscape/render/stateful/NodeDetails.java
2010-06-28 23:56:37 UTC (rev 20708)
@@ -492,7 +492,12 @@
return 100.0;
}
-
+ /**
+ * Child class should ovrride this method to render correct Nexted
Network Image.
+ *
+ * @param node
+ * @return
+ */
public TexturePaint getNestedNetworkTexturePaint(final int node) {
return null;
}
--
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.
