Author: paperwing
Date: 2012-02-28 08:22:57 -0800 (Tue, 28 Feb 2012)
New Revision: 28383
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/pom.xml
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
Log:
Fixed TextRenderer-related visual style preview window crash
Modified: csplugins/trunk/toronto/yuedong/paperwing-impl/pom.xml
===================================================================
--- csplugins/trunk/toronto/yuedong/paperwing-impl/pom.xml 2012-02-28
15:45:51 UTC (rev 28382)
+++ csplugins/trunk/toronto/yuedong/paperwing-impl/pom.xml 2012-02-28
16:22:57 UTC (rev 28383)
@@ -24,6 +24,7 @@
<artifactId>jogl</artifactId>
<version>2.0-b48-20120215</version>
+
<!--
<version>2.0-b45-20111219</version>
<version>2.0-b23-20110303</version>
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
2012-02-28 15:45:51 UTC (rev 28382)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/MainGraphicsHandler.java
2012-02-28 16:22:57 UTC (rev 28383)
@@ -53,6 +53,8 @@
renderProcedures.add(new RenderNodesProcedure());
renderProcedures.add(new RenderArcEdgesProcedure());
renderProcedures.add(new RenderSelectionBoxProcedure());
+
+ renderProcedures.add(new RenderNodeLabelsProcedure());
}
@Override
@@ -67,7 +69,7 @@
// and the VizMapper preview. The cause was likely due to the
TextRenderer class being initialized
// too early.
if (graphicsData.getFramesElapsed() == 1) {
- renderProcedures.add(new RenderNodeLabelsProcedure());
+
}
// Control light positioning
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
2012-02-28 15:45:51 UTC (rev 28382)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/WindBirdsEyeRenderingEngineFactory.java
2012-02-28 16:22:57 UTC (rev 28383)
@@ -30,6 +30,7 @@
protected WindRenderingEngine getNewRenderingEngine(Object container,
View<CyNetwork> viewModel, VisualLexicon visualLexicon)
{
+
System.out.println("WindBirdsEyeRenderingEngineFactory.getNewRenderingEngine()
called");
return new WindBirdsEyeRenderingEngine(container, viewModel,
visualLexicon);
}
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
2012-02-28 15:45:51 UTC (rev 28382)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderNodeLabelsProcedure.java
2012-02-28 16:22:57 UTC (rev 28383)
@@ -34,15 +34,15 @@
private TextRenderer textRenderer;
- public RenderNodeLabelsProcedure() {
-
- textRenderer = new TextRenderer(TEXT_DEFAULT_FONT);
+ public RenderNodeLabelsProcedure() {
}
@Override
public void initialize(GraphicsData graphicsData) {
GL2 gl = graphicsData.getGlContext();
+ textRenderer = new TextRenderer(TEXT_DEFAULT_FONT);
+
// Increase rendering efficiency; can set to true if desired
// textRenderer.setSmoothing(false);
--
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.
