Author: kono
Date: 2009-08-07 18:21:32 -0700 (Fri, 07 Aug 2009)
New Revision: 17747
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/DrawableBuilder.java
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawable.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
Log:
Minor fixes only.
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawable.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawable.java
2009-08-08 00:49:43 UTC (rev 17746)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/CyDrawable.java
2009-08-08 01:21:32 UTC (rev 17747)
@@ -4,6 +4,7 @@
import java.util.Set;
import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualProperty;
public interface CyDrawable {
@@ -13,9 +14,22 @@
*/
public void draw();
+ /**
+ * Set all visual properties
+ *
+ * @param viewModel
+ */
public void setContext(View<?> viewModel);
/**
+ * Set only specified visual property value.
+ *
+ * @param viewModel
+ * @param vp
+ */
+ public void setContext(View<?> viewModel, VisualProperty<?> vp);
+
+ /**
* Get all children of this drawable.
* These visual objects will be painted automatically if draw() is
called.
*
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/DrawableBuilder.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/DrawableBuilder.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/DrawableBuilder.java
2009-08-08 01:21:32 UTC (rev 17747)
@@ -0,0 +1,5 @@
+package org.cytoscape.view.presentation.processing;
+
+public interface DrawableBuilder {
+
+}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
2009-08-08 00:49:43 UTC (rev 17746)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/Cube.java
2009-08-08 01:21:32 UTC (rev 17747)
@@ -10,6 +10,7 @@
import java.awt.Paint;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.swing.Icon;
@@ -17,6 +18,7 @@
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.View;
import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.processing.CyDrawable;
import org.cytoscape.view.presentation.processing.Pickable;
@@ -49,8 +51,10 @@
private float size;
private int r, g, b, alpha;
-
+
+ private Map<VisualProperty<?>, Object> fieldMap;
+
public Cube(PApplet parent, VisualLexicon lexicon) {
super();
this.p = parent;
@@ -93,7 +97,6 @@
this.x =
viewModel.getVisualProperty(NODE_X_LOCATION).floatValue();
this.y =
viewModel.getVisualProperty(NODE_Y_LOCATION).floatValue();
-
if(p.random(1)> 0.5) {
viewModel.setVisualProperty(NODE_Z_LOCATION, 500d);
}
@@ -117,6 +120,15 @@
this.alpha = ((Color)color).getAlpha();
}
}
+
+ public void setContext(View<?> viewModel, VisualProperty<?> vp) {
+ // If the VP is not in the context, ignore
+ if(lexicon.getAllVisualProperties().contains(vp) == false)
return;
+
+ // Extract value for the visual property
+ Object value = viewModel.getVisualProperty(vp);
+
+ }
public boolean isPicked() {
return picked;
@@ -139,4 +151,6 @@
}
+
+
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
