Author: paperwing
Date: 2012-03-16 14:12:53 -0700 (Fri, 16 Mar 2012)
New Revision: 28565
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/constants/
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/constants/GraphicsConstants.java
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
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/data/GraphicsData.java
Log:
Added GraphicsConstants class to centralize all constants into a single set of
classes, in process of implementing use of SetCurrentRenderingEngineListener to
stop the animators for inactive frames when multiple network views are present
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
2012-03-16 20:31:56 UTC (rev 28564)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/Graphics.java
2012-03-16 21:12:53 UTC (rev 28565)
@@ -236,7 +236,7 @@
gl.glEnable(GL2.GL_LIGHTING);
gl.glLightModelfv(GL2.GL_LIGHT_MODEL_AMBIENT,
FloatBuffer.wrap(global));
- gl.glShadeModel(GL2.GL_SMOOTH);
+ gl.glShadeModel(GL2.GL_FLAT);
/*
float[] ambient = { 0.4f, 0.4f, 0.4f, 1.0f };
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
2012-03-16 20:31:56 UTC (rev 28564)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngine.java
2012-03-16 21:12:53 UTC (rev 28565)
@@ -17,6 +17,9 @@
import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
+
+import org.cytoscape.application.events.SetCurrentRenderingEngineEvent;
+import org.cytoscape.application.events.SetCurrentRenderingEngineListener;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.paperwing.internal.task.TaskFactoryListener;
import org.cytoscape.service.util.CyServiceRegistrar;
@@ -61,6 +64,7 @@
private CyServiceRegistrar serviceRegistrar;
private NetworkViewAboutToBeDestroyedListener
networkViewDestroyedListener;
+ private SetCurrentRenderingEngineListener
setCurrentRenderingEngineListener;
/** Create a new WindRenderingEngine object */
public WindRenderingEngine(Object container, View<CyNetwork> viewModel,
@@ -179,9 +183,11 @@
protected abstract void setUpAnimatorStarting(Container container,
FPSAnimator animator);
+ //public void setUpListeners(CyServiceRegistrar serviceRegistrar) {
public void setUpNetworkViewDestroyedListener(CyServiceRegistrar
serviceRegistrar) {
this.serviceRegistrar = serviceRegistrar;
+ // NetworkViewDestroyedEvent listener
if (networkViewDestroyedListener == null) {
networkViewDestroyedListener =
getAboutToBeRemovedListener();
@@ -190,6 +196,24 @@
NetworkViewAboutToBeDestroyedListener.class,
new Properties());
}
+
+ /*
+ if (setCurrentRenderingEngineListener == null) {
+ final RenderingEngine<CyNetwork> renderingEngine =
this;
+
+ setCurrentRenderingEngineListener = new
SetCurrentRenderingEngineListener() {
+
+ @Override
+ public void
handleEvent(SetCurrentRenderingEngineEvent e) {
+ if (e.getRenderingEngine() !=
renderingEngine) {
+ animator.stop();
+ } else {
+ animator.start();
+ }
+ }
+ };
+ }
+ */
}
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
2012-03-16 20:31:56 UTC (rev 28564)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindRenderingEngineFactory.java
2012-03-16 21:12:53 UTC (rev 28565)
@@ -2,6 +2,7 @@
import java.util.Properties;
+import org.cytoscape.application.events.SetCurrentRenderingEngineListener;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.events.NetworkAboutToBeDestroyedListener;
import org.cytoscape.paperwing.internal.task.TaskFactoryListener;
@@ -74,6 +75,8 @@
engine.setUpNetworkViewDestroyedListener(serviceRegistrar);
engine.setupTaskFactories(taskFactoryListener, taskManager,
submenuTaskManager);
+//
serviceRegistrar.registerService(engine.getSetCurrentRenderingEngineListener(),
SetCurrentRenderingEngineListener.class, new Properties());
+
// System.out.println("returning engine: " + engine);
renderingEngineManager.addRenderingEngine(engine);
Added:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/constants/GraphicsConstants.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/constants/GraphicsConstants.java
(rev 0)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/constants/GraphicsConstants.java
2012-03-16 21:12:53 UTC (rev 28565)
@@ -0,0 +1,7 @@
+package org.cytoscape.paperwing.internal.constants;
+
+public class GraphicsConstants {
+
+ /** A value representing that no valid display list is being
referenced. */
+ public static final int EMPTY_DISPLAY_LIST = -1;
+}
Property changes on:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/constants/GraphicsConstants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/data/GraphicsData.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/data/GraphicsData.java
2012-03-16 20:31:56 UTC (rev 28564)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/data/GraphicsData.java
2012-03-16 21:12:53 UTC (rev 28565)
@@ -10,6 +10,7 @@
import org.cytoscape.paperwing.internal.Graphics;
import org.cytoscape.paperwing.internal.coordinator.ViewingCoordinator;
+import org.cytoscape.paperwing.internal.cytoscape.edges.EdgeAnalyser;
import org.cytoscape.paperwing.internal.geometric.Vector3;
import org.cytoscape.paperwing.internal.geometric.ViewingVolume;
import org.cytoscape.paperwing.internal.task.TaskFactoryListener;
@@ -92,6 +93,8 @@
private SubmenuTaskManager submenuTaskManager;
+ private EdgeAnalyser edgeAnalyser;
+
/**
* A {@link GraphicsSelectionData} object which is responsible for
* storing all data related to selection of objects in the network, such
@@ -135,6 +138,7 @@
camera = new SimpleCamera();
viewingVolume = new ViewingVolume();
frameRateTracker = new FrameRateTracker();
+ edgeAnalyser = new EdgeAnalyser();
}
public void setNetworkView(CyNetworkView networkView) {
@@ -340,5 +344,13 @@
public FrameRateTracker getFrameRateTracker() {
return frameRateTracker;
}
+
+ public void setEdgeAnalyser(EdgeAnalyser edgeAnalyser) {
+ this.edgeAnalyser = edgeAnalyser;
+ }
+
+ public EdgeAnalyser getEdgeAnalyser() {
+ return edgeAnalyser;
+ }
}
--
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.
