Author: scooter
Date: 2012-09-23 15:42:30 -0700 (Sun, 23 Sep 2012)
New Revision: 30464
Modified:
core3/api/trunk/custom-graphics-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
Log:
Add CyNetwork and CyNode to getLayers
Modified:
core3/api/trunk/custom-graphics-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
===================================================================
---
core3/api/trunk/custom-graphics-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
2012-09-23 01:08:26 UTC (rev 30463)
+++
core3/api/trunk/custom-graphics-api/src/main/java/org/cytoscape/view/presentation/customgraphics/CyCustomGraphics.java
2012-09-23 22:42:30 UTC (rev 30464)
@@ -3,7 +3,10 @@
import java.awt.Image;
import java.util.List;
+import org.cytoscape.model.CyIdentifiable;
+import org.cytoscape.model.CyNetwork;
+
/**
* Base interface for all Custom Graphics.
*
@@ -58,10 +61,12 @@
/**
* Get layers that belong to this object.
*
+ * @param network the node we want the layers for
+ * @param node the node we want the layers for (currently, only nodes
are supported
* @return Collection of layer objects (in this version, it's
CustomGraphicLayers from Ding)
*
*/
- public List<T> getLayers();
+ public List<T> getLayers(CyNetwork network, CyIdentifiable node);
/**
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
2012-09-23 01:08:26 UTC (rev 30463)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/AbstractDCustomGraphics.java
2012-09-23 22:42:30 UTC (rev 30464)
@@ -7,6 +7,9 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.cytoscape.model.CyNetwork;
+import org.cytoscape.model.CyIdentifiable;
+
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphicsFactory;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
@@ -81,7 +84,7 @@
}
- public List<T> getLayers() {
+ public List<T> getLayers(CyNetwork network, CyIdentifiable graphObject)
{
return layers;
}
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-09-23 01:08:26 UTC (rev 30463)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeView.java
2012-09-23 22:42:30 UTC (rev 30464)
@@ -61,8 +61,8 @@
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.view.presentation.customgraphics.CyCustomGraphics;
import org.cytoscape.view.presentation.customgraphics.CustomGraphicLayer;
+import org.cytoscape.view.presentation.customgraphics.PaintedShape;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
-import org.cytoscape.ding.customgraphics.vector.VectorCustomGraphics;
import org.cytoscape.ding.customgraphics.CustomGraphicsPositionCalculator;
import org.cytoscape.ding.impl.visualproperty.CustomGraphicsVisualProperty;
import org.cytoscape.ding.impl.visualproperty.ObjectPositionVisualProperty;
@@ -1140,7 +1140,7 @@
if (customGraphics == null || customGraphics instanceof
NullCustomGraphics)
return;
- final List<CustomGraphicLayer> layers =
customGraphics.getLayers();
+ final List<CustomGraphicLayer> layers =
customGraphics.getLayers(graphView.getModel(), model);
// No need to update
if (layers == null || layers.size() == 0)
@@ -1239,7 +1239,7 @@
final float fit = graphics.getFitRatio();
// Case 1: if custom graphic is a vector fit width and length
- if (graphics instanceof VectorCustomGraphics) {
+ if (graphics instanceof PaintedShape) {
scale = AffineTransform.getScaleInstance(fit * width /
cgW, fit * height / cgH);
} else {
// Case 2: node height value is larger than width
--
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.
