Author: kono
Date: 2009-07-02 18:47:06 -0700 (Thu, 02 Jul 2009)
New Revision: 17211
Removed:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5NodePresentation.java
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/ShapeFactory.java
Log:
Start updating code based on new gestalt style design.
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5NodePresentation.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5NodePresentation.java
2009-07-03 01:43:55 UTC (rev 17210)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/P5NodePresentation.java
2009-07-03 01:47:06 UTC (rev 17211)
@@ -1,17 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-import org.cytoscape.model.CyNode;
-import org.cytoscape.view.model.View;
-
-public interface P5NodePresentation extends P5Presentation<CyNode> {
-
-
- /**
- * return the backend view model for this node presentation.
- * This is immutable.
- *
- * @return Node View Model.
- */
- public View<CyNode> getViewModel();
-
-}
Modified:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/ShapeFactory.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/ShapeFactory.java
2009-07-03 01:43:55 UTC (rev 17210)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/internal/shape/ShapeFactory.java
2009-07-03 01:47:06 UTC (rev 17211)
@@ -1,43 +1,39 @@
package org.cytoscape.view.presentation.processing.internal.shape;
+import static
org.cytoscape.view.presentation.property.ThreeDVisualLexicon.NODE_Z_LOCATION;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_X_LOCATION;
+import static
org.cytoscape.view.presentation.property.TwoDVisualLexicon.NODE_Y_LOCATION;
import gestalt.p5.GestaltPlugIn;
-import gestalt.render.Drawable;
import gestalt.shape.AbstractShape;
-import gestalt.shape.Cube;
import gestalt.shape.DrawableFactory;
import org.cytoscape.model.CyNode;
import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.processing.P5NodePresentation;
+import org.cytoscape.view.presentation.processing.P5Presentation;
-import processing.core.PApplet;
-
-import static org.cytoscape.view.presentation.property.ThreeDVisualLexicon.*;
-
public class ShapeFactory {
-
+
private final GestaltPlugIn p;
-
+
private final DrawableFactory factory;
-
+
public ShapeFactory(GestaltPlugIn p) {
this.p = p;
this.factory = p.drawablefactory();
}
-
- public P5NodePresentation getNodeShape(View<CyNode> view) {
-
-
+
+ public P5Presentation<CyNode> getNodeShape(View<CyNode> view) {
+
/*
* Parse view info
*/
final Number x = view.getVisualProperty(NODE_X_LOCATION);
final Number y = view.getVisualProperty(NODE_Y_LOCATION);
final Number z = view.getVisualProperty(NODE_Z_LOCATION);
-
+
AbstractShape gNode = factory.cube();
gNode.position(x.floatValue(), y.floatValue(), z.floatValue());
-
+
return null;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
