Author: paperwing
Date: 2011-08-22 11:05:45 -0700 (Mon, 22 Aug 2011)
New Revision: 26620
Modified:
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/WindRenderingEngine.java
Log:
attempt at fixing the animator bug, seems like a possible fix
Modified:
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
2011-08-22 17:54:27 UTC (rev 26619)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2011-08-22 18:05:45 UTC (rev 26620)
@@ -85,7 +85,7 @@
/** A multiplicative factor for the width of the edges when reading
from the
* visual property mappings
*/
- private static final float EDGE_WIDTH_FACTOR = 0.01f;
+ private static final float EDGE_WIDTH_FACTOR = 0.17f;
/** How many straight edge segments to use for approximating a curved
edge,
* this value does not have to be static */
@@ -266,7 +266,6 @@
/** A boolean to disable real-time shape picking to improve framerate */
private boolean skipHover = false;
-
/** A projection of the current mouse position into 3D coordinates to
be used
* for mouse drag movement of certain objects */
private Vector3 currentSelectedProjection;
@@ -1629,7 +1628,7 @@
}
@Override
- public void dispose(GLAutoDrawable arg0) {
+ public void dispose(GLAutoDrawable autoDrawable) {
}
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-08-22 17:54:27 UTC (rev 26619)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2011-08-22 18:05:45 UTC (rev 26620)
@@ -15,6 +15,7 @@
import java.beans.VetoableChangeListener;
import java.util.Properties;
+import javax.media.opengl.GLAutoDrawable;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
import javax.media.opengl.awt.GLJPanel;
@@ -145,7 +146,15 @@
// TODO: check whether to use GLCanvas or GLJPanel
GLJPanel panel = new GLJPanel(capabilities);
- graphics = new Graphics(networkView, visualLexicon);
+ graphics = new Graphics(networkView, visualLexicon) {
+
+ @Override
+ public void dispose(GLAutoDrawable drawable) {
+ animator.stop();
+
+ super.dispose(drawable);
+ }
+ };
panel.addGLEventListener(graphics);
--
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.
