Author: clopes
Date: 2012-06-26 09:51:29 -0700 (Tue, 26 Jun 2012)
New Revision: 29691
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/DNodeDetails.java
Log:
Fixes #1168 ("V" node shape not rendered when set as bypass)
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-26 05:01:47 UTC (rev 29690)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/DNodeShape.java
2012-06-26 16:51:29 UTC (rev 29691)
@@ -7,7 +7,6 @@
import org.cytoscape.graph.render.immed.GraphGraphics;
import org.cytoscape.view.presentation.property.NodeShapeVisualProperty;
import org.cytoscape.view.presentation.property.values.NodeShape;
-import org.cytoscape.view.presentation.property.values.VisualPropertyValue;
public class DNodeShape implements NodeShape {
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2012-06-26 05:01:47 UTC (rev 29690)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java
2012-06-26 16:51:29 UTC (rev 29691)
@@ -263,24 +263,14 @@
@Override
public byte shape(final CyNode node) {
- // Check bypass
- final DNodeView dnv = m_view.getDNodeView(node);
- if(dnv.isValueLocked(DVisualLexicon.NODE_SHAPE)) {
- final NodeShape nodeShape =
dnv.getVisualProperty(DVisualLexicon.NODE_SHAPE);
- final DNodeShape dShape =
DNodeShape.getDShape(nodeShape);
- if(dShape == null)
- return DEF_NODE_SHAPE;
- else
- return dShape.getNativeShape();
- }
-
final Byte shape = m_shapes.get(node);
- if (shape == null)
- if ( m_shapeDefault == null )
+ if (shape == null) {
+ if (m_shapeDefault == null)
return super.shape(node);
- else
+ else
return m_shapeDefault.getNativeShape();
+ }
return shape;
}
@@ -350,7 +340,6 @@
selected.remove(node);
}
-
@Override
public float borderWidth(final CyNode node) {
// Check bypass
--
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.
