Author: paperwing
Date: 2011-06-08 14:18:43 -0700 (Wed, 08 Jun 2011)
New Revision: 25678
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context.xml
Log:
now able to read data from cytoscape's cynetworkview objects
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
(rev 0)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2011-06-08 21:18:43 UTC (rev 25678)
@@ -0,0 +1,492 @@
+package org.cytoscape.paperwing.internal;
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.nio.FloatBuffer;
+import java.util.Set;
+
+import javax.media.opengl.GL;
+import javax.media.opengl.GL2;
+import javax.media.opengl.GLAutoDrawable;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+import javax.media.opengl.glu.GLU;
+import javax.media.opengl.glu.GLUquadric;
+import com.jogamp.opengl.util.gl2.GLUT;
+
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.model.CyNetworkManager;
+import org.cytoscape.model.CyNode;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.view.model.CyNetworkViewManager;
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.model.VisualLexicon;
+import org.cytoscape.view.presentation.RenderingEngineManager;
+import org.cytoscape.view.presentation.property.RichVisualLexicon;
+
+public class Graphics implements GLEventListener {
+
+ private static final float LARGE_SPHERE_RADIUS = 1.0f; // 1.5f
+ private static final float SMALL_SPHERE_RADIUS = 0.125f; // 0.015f
+ private static final float EDGE_RADIUS = 0.008f;
+
+ private static final int NODE_SLICES_DETAIL = 24;
+ private static final int NODE_STACKS_DETAIL = 24;
+ private static final int EDGE_SLICES_DETAIL = 3;
+ private static final int EDGE_STACKS_DETAIL = 1;
+
+ private class DrawnNode {
+ public float x;
+ public float y;
+ public float z;
+ }
+
+ private class DrawnEdge {
+ public float x;
+ public float y;
+ public float z;
+ public float rotateAxisX;
+ public float rotateAxisY;
+ public float rotateAxisZ;
+ public float rotateAngle;
+ public float length;
+ }
+
+ private DrawnNode[] nodes;
+ private DrawnEdge[] edges;
+
+ private int nodeListIndex;
+ private int edgeListIndex;
+
+ private long startTime;
+ private long endTime;
+ private int framesElapsed = 0;
+
+ private int nodeSeed = 556;
+ private int edgeSeed = 556;
+
+ private KeyboardMonitor keys;
+ private MouseMonitor mouse;
+ private SimpleCamera camera;
+
+ private CyApplicationManager applicationManager;
+ private CyNetworkManager networkManager;
+ private CyNetworkViewManager networkViewManager;
+ private RenderingEngineManager renderingEngineManager;
+
+ private CyNetworkView networkView;
+ private VisualLexicon visualLexicon;
+
+ public static void initSingleton() {
+ GLProfile.initSingleton(false);
+ System.out.println("initSingleton called");
+ }
+
+ public Graphics(CyNetworkView networkView, VisualLexicon visualLexicon)
{
+ keys = new KeyboardMonitor();
+ mouse = new MouseMonitor();
+
+ // TODO: add default constant speeds for camera movement
+ camera = new SimpleCamera(new Vector3(0, 0, 2), new Vector3(0,
0, 0),
+ new Vector3(0, 1, 0), 0.04, 0.003, 0.01, 0.01,
0.4);
+
+ this.networkView = networkView;
+ this.visualLexicon = visualLexicon;
+ }
+
+ public void trackInput(Component component) {
+ component.addMouseListener(mouse);
+ component.addMouseMotionListener(mouse);
+ component.addMouseWheelListener(mouse);
+ component.addFocusListener(mouse);
+
+ component.addKeyListener(keys);
+ component.addFocusListener(keys);
+ }
+
+ public void setManagers(CyApplicationManager applicationManager,
+ CyNetworkManager networkManager,
+ CyNetworkViewManager networkViewManager,
+ RenderingEngineManager renderingEngineManager) {
+ this.applicationManager = applicationManager;
+ this.networkManager = networkManager;
+ this.networkViewManager = networkViewManager;
+ this.renderingEngineManager = renderingEngineManager;
+ }
+
+ @Override
+ public void display(GLAutoDrawable drawable) {
+ checkInput();
+
+ GL2 gl = drawable.getGL().getGL2();
+
+ gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+ gl.glLoadIdentity();
+
+ Vector3 position = camera.getPosition();
+ Vector3 target = camera.getTarget();
+ Vector3 up = camera.getUp();
+
+ // System.out.println(position + " " + target + " " + up);
+
+ GLU glu = new GLU();
+ glu.gluLookAt(position.x(), position.y(), position.z(),
target.x(),
+ target.y(), target.z(), up.x(), up.y(), up.z());
+
+ // gl.glRotated(direction.angle(current) * 180 / Math.PI,
normal.x(),
+ // normal.y(), normal.z());
+ // gl.glTranslated(-camera.x(), -camera.y(), -camera.z());
+
+ float[] lightPosition = { -4.0f, 4.0f, 6.0f, 1.0f };
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION,
+ FloatBuffer.wrap(lightPosition));
+
+ gl.glColor3f(0.6f, 0.6f, 0.6f);
+ gl.glTranslatef(0.0f, 0.0f, -6.0f);
+
+ gl.glColor3f(0.73f, 0.73f, 0.73f);
+ drawNodes(gl);
+ gl.glColor3f(0.53f, 0.53f, 0.55f);
+ drawEdges(gl);
+
+ framesElapsed++;
+ }
+
+ private void checkInput() {
+ if (keys.hasHeld() || keys.hasNew()) {
+ Set<Integer> pressed = keys.getPressed();
+ Set<Integer> held = keys.getHeld();
+ Set<Integer> released = keys.getReleased();
+
+ if (pressed.contains(KeyEvent.VK_SPACE)) {
+ endTime = System.nanoTime();
+
+ double duration = (endTime - startTime) /
Math.pow(10, 9);
+ double frameRate = framesElapsed / duration;
+ System.out.println("Average fps over " +
duration + " seconds: "
+ + frameRate);
+ }
+
+ if (pressed.contains(KeyEvent.VK_C)) {
+ camera.setSpeed(0.04, 0.003, 0.01, 0.1, 0.4);
+ camera.moveTo(0, 0, 2);
+ }
+
+ if (pressed.contains(KeyEvent.VK_SPACE)) {
+ System.out.println("===");
+ System.out.print("direction: " +
camera.getDirection());
+ System.out.print(", left: " + camera.getLeft());
+ System.out.println(", up: " + camera.getUp());
+ System.out.print("position: " +
camera.getPosition());
+ System.out.println(", target: " +
camera.getTarget());
+ System.out.println("===");
+ }
+
+ if (held.contains(KeyEvent.VK_Z)) {
+ camera.rollClockwise();
+ }
+
+ if (held.contains(KeyEvent.VK_X)) {
+ camera.rollCounterClockwise();
+ }
+
+ if (held.contains(KeyEvent.VK_SHIFT)) {
+
+ if (held.contains(KeyEvent.VK_LEFT)) {
+ camera.orbitLeft();
+ }
+
+ if (held.contains(KeyEvent.VK_RIGHT)) {
+ camera.orbitRight();
+ }
+
+ if (held.contains(KeyEvent.VK_UP)) {
+ camera.orbitUp();
+ }
+
+ if (held.contains(KeyEvent.VK_DOWN)) {
+ camera.orbitDown();
+ }
+
+ } else {
+
+ if (pressed.contains(KeyEvent.VK_B)) {
+ System.out.println("number of networks:
"
+ +
networkManager.getNetworkSet().size());
+ System.out.println("current network: "
+ +
applicationManager.getCurrentNetwork());
+ if
(applicationManager.getCurrentNetwork() != null) {
+ System.out
+
.println("number of nodes in current network: "
+
+ applicationManager
+
.getCurrentNetwork()
+
.getNodeList().size());
+ }
+ System.out.println("current network
view: "
+ +
applicationManager.getCurrentNetworkView());
+ if
(applicationManager.getCurrentNetworkView() != null) {
+ System.out
+
.println("number of views in current network: "
+
+ applicationManager
+
.getCurrentNetworkView()
+
.getNodeViews().size());
+ }
+
+ // System.out.println("supported visual
properties: "
+ // +
applicationManager.getCurrentRenderingEngine()
+ //
.getVisualLexicon()
+ //
.getAllVisualProperties());
+ }
+
+ if (pressed.contains(KeyEvent.VK_N)) {
+ System.out.println("current rendering
engine: "
+ +
applicationManager.getCurrentRenderingEngine().getClass().getName());
+
+ System.out.println("number of rendering
engines: "
+ +
renderingEngineManager.getAllRenderingEngines().size());
+
+
+ }
+
+ if (pressed.contains(KeyEvent.VK_M)) {
+ System.out.println("Old rendering
engine: " + applicationManager.getCurrentRenderingEngine());
+
+
renderingEngineManager.removeRenderingEngine(applicationManager.getCurrentRenderingEngine());
+
+ System.out.println("New rendering
engine: " + applicationManager.getCurrentRenderingEngine());
+ }
+
+ if (pressed.contains(KeyEvent.VK_COMMA)) {
+ System.out.println("networkViewSet: " +
networkViewManager.getNetworkViewSet());
+
+ for (CyNetworkView view :
networkViewManager.getNetworkViewSet()) {
+ System.out.println("current
model: " + view.getModel());
+ System.out.println("current
model suid: " + view.getModel().getSUID());
+ System.out.println("current
suid: " + view.getSUID());
+ }
+ }
+
+ if (pressed.contains(KeyEvent.VK_H)) {
+ System.out.println("visualLexicon: " +
visualLexicon);
+
+ float x, y, z;
+ if (visualLexicon != null) {
+
+ for (View<CyNode> nodeView :
networkView.getNodeViews()) {
+ x = ((Double)
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION)).floatValue();
+ y = ((Double)
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION)).floatValue();
+ z = ((Double)
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION)).floatValue();
+
+
System.out.println("Node found at " + x + ", " + y + ", " + z);
+ }
+
+ }
+ }
+
+
+ }
+
+ if (held.contains(KeyEvent.VK_W)) {
+ camera.moveForward();
+ }
+
+ if (held.contains(KeyEvent.VK_S)) {
+ camera.moveBackward();
+ }
+
+ if (held.contains(KeyEvent.VK_A)) {
+ camera.moveLeft();
+ }
+
+ if (held.contains(KeyEvent.VK_D)) {
+ camera.moveRight();
+ }
+
+ if (held.contains(KeyEvent.VK_Q)) {
+ camera.moveDown();
+ }
+
+ if (held.contains(KeyEvent.VK_E)) {
+ camera.moveUp();
+ }
+
+ keys.update();
+ }
+
+ if (mouse.hasMoved() || mouse.hasNew()) {
+ if (keys.getHeld().contains(KeyEvent.VK_SHIFT)) {
+ camera.turnRight(mouse.dX());
+ camera.turnUp(mouse.dY());
+ }
+
+ if (mouse.dWheel() != 0) {
+ camera.zoomOut((double) mouse.dWheel());
+ }
+
+ mouse.update();
+ }
+ }
+
+ private void drawNodes(GL2 gl) {
+ float x, y, z;
+
+ if (visualLexicon != null) {
+
+ for (View<CyNode> nodeView :
networkView.getNodeViews()) {
+ x = ((Double)
nodeView.getVisualProperty(RichVisualLexicon.NODE_X_LOCATION)).floatValue() /
200.0f;
+ y = ((Double)
nodeView.getVisualProperty(RichVisualLexicon.NODE_Y_LOCATION)).floatValue() /
200.0f;
+ z = ((Double)
nodeView.getVisualProperty(RichVisualLexicon.NODE_Z_LOCATION)).floatValue() /
200.0f;
+
+ gl.glTranslatef(x, y, z);
+ gl.glCallList(nodeListIndex);
+ gl.glTranslatef(-x, -y, -z);
+
+ }
+
+ }
+ }
+
+ private void drawEdges(GL2 gl) {
+
+ /*
+ // gl.glColor3f(0.9f, 0.1f, 0.1f);
+ for (int i = 0; i < EDGE_COUNT; i++) {
+ gl.glTranslatef(edges[i].x, edges[i].y, edges[i].z);
+ gl.glRotatef(edges[i].rotateAngle, edges[i].rotateAxisX,
+ edges[i].rotateAxisY,
edges[i].rotateAxisZ);
+ gl.glScalef(1.0f, 1.0f, edges[i].length);
+ gl.glCallList(edgeListIndex);
+ gl.glScalef(1.0f, 1.0f, 1.0f / edges[i].length);
+ // glut.glutSolidCylinder(EDGE_RADIUS, edges[i].length,
+ // EDGE_SLICES_DETAIL, EDGE_STACKS_DETAIL);
+
+ // gl.glCallList(nodeListIndex);
+ // Undo the transformation operations we performed above
+ gl.glRotatef(-edges[i].rotateAngle,
edges[i].rotateAxisX,
+ edges[i].rotateAxisY,
edges[i].rotateAxisZ);
+ gl.glTranslatef(-edges[i].x, -edges[i].y, -edges[i].z);
+ }
+ */
+ }
+
+ private void drawNodesEdges(GL2 gl) {
+ gl.glCallList(edgeListIndex);
+ gl.glCallList(nodeListIndex);
+ }
+
+ @Override
+ public void dispose(GLAutoDrawable arg0) {
+
+ }
+
+ @Override
+ public void init(GLAutoDrawable drawable) {
+ GL2 gl = drawable.getGL().getGL2();
+ initLighting(drawable);
+
+ gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+ gl.glEnable(GL.GL_DEPTH_TEST);
+
+ gl.glDepthFunc(GL.GL_LEQUAL);
+ // gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_NICEST);
+ gl.glHint(GL2.GL_PERSPECTIVE_CORRECTION_HINT, GL.GL_FASTEST);
+ // gl.glPolygonMode(GL2.GL_FRONT_AND_BACK, GL2.GL_LINE);
+
+ gl.glViewport(0, 0, drawable.getWidth(), drawable.getHeight());
+
+ //generateNodes();
+ //generateEdges();
+ startTime = System.nanoTime();
+ createDisplayLists(gl);
+ }
+
+ private void createDisplayLists(GL2 gl) {
+ nodeListIndex = gl.glGenLists(1);
+ edgeListIndex = gl.glGenLists(1);
+
+ GLUT glut = new GLUT();
+ GLU glu = new GLU();
+
+ GLUquadric quadric = glu.gluNewQuadric();
+ glu.gluQuadricDrawStyle(quadric, GLU.GLU_FILL);
+ glu.gluQuadricNormals(quadric, GLU.GLU_SMOOTH);
+
+ gl.glNewList(nodeListIndex, GL2.GL_COMPILE);
+ glu.gluSphere(quadric, SMALL_SPHERE_RADIUS, NODE_SLICES_DETAIL,
+ NODE_STACKS_DETAIL);
+ // glut.glutSolidSphere(SMALL_SPHERE_RADIUS, NODE_SLICES_DETAIL,
+ // NODE_STACKS_DETAIL);
+ gl.glEndList();
+
+ gl.glNewList(edgeListIndex, GL2.GL_COMPILE);
+ glu.gluCylinder(quadric, EDGE_RADIUS, EDGE_RADIUS, 1.0,
+ EDGE_SLICES_DETAIL, EDGE_STACKS_DETAIL);
+ // glut.glutSolidCylinder(EDGE_RADIUS, 1.0f, EDGE_SLICES_DETAIL,
+ // EDGE_STACKS_DETAIL);
+ gl.glEndList();
+ }
+
+ private void initLighting(GLAutoDrawable drawable) {
+ GL2 gl = drawable.getGL().getGL2();
+
+ float[] global = { 0.2f, 0.2f, 0.2f, 1.0f };
+
+ gl.glEnable(GL2.GL_LIGHTING);
+ gl.glLightModelfv(GL2.GL_LIGHT_MODEL_AMBIENT,
FloatBuffer.wrap(global));
+ gl.glShadeModel(GL2.GL_SMOOTH);
+
+ float[] ambient = { 0.0f, 0.0f, 0.0f, 1.0f };
+ float[] diffuse = { 1.0f, 1.0f, 1.0f, 1.0f };
+ float[] specular = { 1.0f, 1.0f, 1.0f, 1.0f };
+ float[] position = { -4.0f, 4.0f, 6.0f, 1.0f };
+
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_AMBIENT,
FloatBuffer.wrap(ambient));
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_DIFFUSE,
FloatBuffer.wrap(diffuse));
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_SPECULAR,
FloatBuffer.wrap(specular));
+ gl.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION,
FloatBuffer.wrap(position));
+
+ gl.glEnable(GL2.GL_LIGHT0);
+
+ gl.glEnable(GL2.GL_COLOR_MATERIAL);
+ gl.glColorMaterial(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE);
+
+
+ float[] specularReflection = { 0.5f, 0.5f, 0.5f, 1.0f };
+ gl.glMaterialfv(GL2.GL_FRONT, GL2.GL_SPECULAR,
+ FloatBuffer.wrap(specularReflection));
+ gl.glMateriali(GL2.GL_FRONT, GL2.GL_SHININESS, 40);
+ }
+
+ @Override
+ public void reshape(GLAutoDrawable drawable, int x, int y, int width,
+ int height) {
+
+ if (height <= 0) {
+ height = 1;
+ }
+
+ GL2 gl = drawable.getGL().getGL2();
+
+ gl.glMatrixMode(GL2.GL_PROJECTION);
+ gl.glLoadIdentity();
+
+ GLU glu = new GLU();
+ glu.gluPerspective(45.0f, (float) width / height, 0.2f, 50.0f);
+
+ gl.glMatrixMode(GL2.GL_MODELVIEW);
+ gl.glLoadIdentity();
+ }
+
+ /*
+ // Draw X axis gl.glTranslatef(-overhang, 0.0f, 0.0f);
+ gl.glRotatef(90, 0, 1, 0); gl.glColor3f(1.0f, 0.0f, 0.0f);
+ glut.glutSolidCylinder(0.005f, axisLength, 6, 3); gl.glRotatef(-90, 0,
1, 0); gl.glTranslatef(overhang, 0.0f, 0.0f);
+
+ // Draw Y axis gl.glTranslatef(0.0f, -overhang, 0.0f);
+ gl.glRotatef(-90, 1, 0, 0); gl.glColor3f(0.0f, 1.0f, 0.0f);
+ glut.glutSolidCylinder(0.005f, axisLength, 6, 3); gl.glRotatef(90, 1,
0, 0); gl.glTranslatef(0.0f, overhang, 0.0f);
+
+ // Draw Z axis gl.glTranslatef(0.0f, 0.0f, -overhang);
+ gl.glColor3f(0.0f, 0.0f, 1.0f); glut.glutSolidCylinder(0.005f,
+ axisLength, 6, 3); gl.glTranslatef(0.0f, 0.0f, overhang);
+ */
+}
Property changes on:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2011-06-08 20:33:40 UTC (rev 25677)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2011-06-08 21:18:43 UTC (rev 25678)
@@ -55,6 +55,8 @@
System.out.println("Setting up canvas..");
setUpCanvas(container);
}
+
+ System.out.println("Provided visualLexicon: " + visualLexicon);
}
public static void setNetworkViewManager(CyNetworkViewManager
networkViewManager) {
@@ -77,7 +79,7 @@
// TODO: check whether to use GLCanvas or GLJPanel
GLJPanel panel = new GLJPanel(capabilities);
- TestGraphics graphics = new TestGraphics();
+ Graphics graphics = new Graphics(networkView,
visualLexicon);
panel.addGLEventListener(graphics);
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
2011-06-08 20:33:40 UTC (rev 25677)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
2011-06-08 21:18:43 UTC (rev 25678)
@@ -38,7 +38,8 @@
this.renderingEngineManager = renderingEngineManager;
this.visualLexicon = lexicon;
- TestGraphics.initSingleton();
+ // TestGraphics.initSingleton();
+ Graphics.initSingleton();
WindRenderingEngine.setNetworkViewManager(networkViewManager);
}
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-08 20:33:40 UTC (rev 25677)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-08 21:18:43 UTC (rev 25678)
@@ -15,7 +15,7 @@
<osgi:reference id="cyNetworkViewManagerRef"
interface="org.cytoscape.view.model.CyNetworkViewManager" />
- <osgi:reference id="cyRenderingEngineManagerRef"
+ <osgi:reference id="cyRenderingEngineManagerRef"
interface="org.cytoscape.view.presentation.RenderingEngineManager"
/>
<!-- Exported Services -->
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-08 20:33:40 UTC (rev 25677)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-08 21:18:43 UTC (rev 25678)
@@ -30,6 +30,10 @@
<constructor-arg ref="cyRenderingEngineManagerRef"/>
</bean>
+ <bean name="windVisualLexicon"
+ class="org.cytoscape.paperwing.internal.WindVisualLexicon">
+ </bean>
+
<bean name="windRenderingEngineFactory"
class="org.cytoscape.paperwing.internal.WindRenderingEngineFactory">
<constructor-arg ref="cyNetworkViewManagerRef"/>
@@ -43,9 +47,5 @@
<constructor-arg ref="cyRenderingEngineManagerRef"/>
<constructor-arg ref="windVisualLexicon"/>
</bean>
-
- <bean name="windVisualLexicon"
- class="org.cytoscape.paperwing.internal.WindVisualLexicon">
- </bean>
</beans>
--
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.
