Author: clopes
Date: 2012-06-27 13:01:00 -0700 (Wed, 27 Jun 2012)
New Revision: 29708
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
Log:
Fixes #1116 (Round Rectangles are not rendered in some cases)
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
2012-06-27 17:05:08 UTC (rev 29707)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
2012-06-27 20:01:00 UTC (rev 29708)
@@ -62,18 +62,15 @@
}
private final Byte rendererShapeID;
-
private final String displayName;
private final String serializableString;
private static final Map<Byte, Shape> nodeShapes =
GraphGraphics.getNodeShapes();
- public DNodeShape(final Byte rendererShapeID, final String displayName,
- final String serializableString) {
+ public DNodeShape(final Byte rendererShapeID, final String displayName,
final String serializableString) {
+ this.rendererShapeID = rendererShapeID;
this.displayName = displayName;
this.serializableString = serializableString;
-
- this.rendererShapeID = rendererShapeID;
}
@Override
@@ -98,5 +95,4 @@
public Shape getShape() {
return nodeShapes.get(rendererShapeID);
}
-
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-06-27 17:05:08 UTC (rev 29707)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-06-27 20:01:00 UTC (rev 29708)
@@ -417,12 +417,13 @@
@Override
public boolean setWidth(final double originalWidth) {
final Double width;
+
// Check bypass
- if(isValueLocked(DVisualLexicon.NODE_WIDTH))
+ if (isValueLocked(DVisualLexicon.NODE_WIDTH))
width = getVisualProperty(DVisualLexicon.NODE_WIDTH);
else
width = originalWidth;
-
+
synchronized (graphView.m_lock) {
if (!graphView.m_spacial.exists(m_inx,
graphView.m_extentsBuff, 0))
return false;
@@ -438,12 +439,12 @@
graphView.m_spacial.delete(m_inx);
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];
+// TODO Is it really necessary?
+// 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() == GraphGraphics.SHAPE_ROUNDED_RECTANGLE))
+// setShape(NodeShapeVisualProperty.RECTANGLE);
- if (!(Math.max(w, h) < (1.99d * Math.min(w, h))) &&
(getShape() == GraphGraphics.SHAPE_ROUNDED_RECTANGLE))
- setShape(NodeShapeVisualProperty.RECTANGLE);
-
graphView.m_contentChanged = true;
return true;
@@ -464,7 +465,7 @@
public boolean setHeight(double originalHeight) {
final Double height;
// Check bypass
- if(isValueLocked(DVisualLexicon.NODE_HEIGHT))
+ if (isValueLocked(DVisualLexicon.NODE_HEIGHT))
height = getVisualProperty(DVisualLexicon.NODE_HEIGHT);
else
height = originalHeight;
--
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.
