Author: kono
Date: 2009-06-11 11:38:09 -0700 (Thu, 11 Jun 2009)
New Revision: 16929
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
Removed:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PShape.java
Log:
Shape is separated into 2D and 3D.
Copied:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
(from rev 16921,
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PShape.java)
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape.java
2009-06-11 18:38:09 UTC (rev 16929)
@@ -0,0 +1,41 @@
+package org.cytoscape.view.presentation.processing;
+
+import java.awt.Color;
+
+/**
+ *
+ * Defines shape of object rendered in Processing.
+ *
+ * @author kono, kozo
+ * @version 0.0.1
+ *
+ *
+ */
+public interface ObjectShape {
+
+ public void draw();
+
+ /**
+ * Name of this shape, such as ellipse, rectangle, triangle, etc.
+ *
+ * @return Name of shape as string
+ *
+ */
+ public String getDisplayName();
+
+ public float getX();
+ public float getY();
+
+ public void setX(final float x);
+ public void setY(final float y);
+
+ public Color getColor();
+ public void setColor(Color color);
+
+ public float getWidth();
+ public float getHeight();
+
+ public void setWidth(final float width);
+ public void setHeight(final float height);
+
+}
Added:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
(rev 0)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/ObjectShape3D.java
2009-06-11 18:38:09 UTC (rev 16929)
@@ -0,0 +1,11 @@
+package org.cytoscape.view.presentation.processing;
+
+public interface ObjectShape3D extends ObjectShape {
+
+ public float getZ();
+ public void setZ(final float z);
+
+ public float getDepth();
+ public void setDepth(final float depth);
+
+}
Deleted:
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PShape.java
===================================================================
---
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PShape.java
2009-06-11 17:45:15 UTC (rev 16928)
+++
csplugins/trunk/soc/kozo/processing-renderer/processing-rendering-engine/src/main/java/org/cytoscape/view/presentation/processing/PShape.java
2009-06-11 18:38:09 UTC (rev 16929)
@@ -1,20 +0,0 @@
-package org.cytoscape.view.presentation.processing;
-
-/**
- *
- * Defines shape of object rendered in Processing.
- *
- * @author kono, kozo
- * @version 0.0.1
- *
- *
- */
-public interface PShape {
-
- public void draw();
-
- public String getDisplayName();
-
-
-
-}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---