Author: kono
Date: 2010-06-28 18:31:28 -0700 (Mon, 28 Jun 2010)
New Revision: 20714
Modified:
corelibs/trunk/ding/lib/cytoscape-render-immed.jar
corelibs/trunk/ding/lib/cytoscape-render-stateful.jar
corelibs/trunk/ding/src/ding/view/DNodeView.java
Log:
Unnecessary ratio check for round rectangle is removed. From this revision,
round rectangle is always valid.
Modified: corelibs/trunk/ding/lib/cytoscape-render-immed.jar
===================================================================
(Binary files differ)
Modified: corelibs/trunk/ding/lib/cytoscape-render-stateful.jar
===================================================================
(Binary files differ)
Modified: corelibs/trunk/ding/src/ding/view/DNodeView.java
===================================================================
--- corelibs/trunk/ding/src/ding/view/DNodeView.java 2010-06-29 01:27:52 UTC
(rev 20713)
+++ corelibs/trunk/ding/src/ding/view/DNodeView.java 2010-06-29 01:31:28 UTC
(rev 20714)
@@ -478,14 +478,6 @@
graphView.m_spacial.insert(m_inx, xMin,
graphView.m_extentsBuff[1],
xMax, graphView.m_extentsBuff[3]);
- final double w = ((double) xMax) - xMin;
- final double h = ((double) graphView.m_extentsBuff[3])
- - graphView.m_extentsBuff[1];
-
- if (!(Math.max(w, h) < (1.99d * Math.min(w, h)))
- && (getShape() ==
NodeView.ROUNDED_RECTANGLE))
- setShape(NodeView.RECTANGLE);
-
graphView.m_contentChanged = true;
return true;
@@ -534,14 +526,6 @@
graphView.m_spacial.insert(m_inx,
graphView.m_extentsBuff[0], yMin,
graphView.m_extentsBuff[2], yMax);
- final double w = ((double) graphView.m_extentsBuff[2])
- - graphView.m_extentsBuff[0];
- final double h = ((double) yMax) - yMin;
-
- if (!(Math.max(w, h) < (1.99d * Math.min(w, h)))
- && (getShape() ==
NodeView.ROUNDED_RECTANGLE))
- setShape(NodeView.RECTANGLE);
-
graphView.m_contentChanged = true;
return true;
@@ -899,18 +883,6 @@
synchronized (graphView.m_lock) {
byte nativeShape = GinyUtil.getNativeNodeType(shape);
- // special case
- if (shape == NodeView.ROUNDED_RECTANGLE) {
- final double width = getWidth();
- final double height = getHeight();
-
- if (!(Math.max(width, height) < (1.99d * Math
- .min(width, height))))
- nativeShape =
GraphGraphics.SHAPE_RECTANGLE;
- else
- nativeShape =
GraphGraphics.SHAPE_ROUNDED_RECTANGLE;
- }
-
graphView.m_nodeDetails.overrideShape(m_inx,
nativeShape);
graphView.m_contentChanged = true;
}
--
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.
