Author: kono
Date: 2009-12-03 11:19:10 -0800 (Thu, 03 Dec 2009)
New Revision: 18643
Modified:
corelibs/trunk/ding/src/ding/view/DGraphView.java
corelibs/trunk/ding/src/ding/view/DNodeDetails.java
corelibs/trunk/ding/src/ding/view/DNodeView.java
Log:
Fixed missing default image problem.
Modified: corelibs/trunk/ding/src/ding/view/DGraphView.java
===================================================================
--- corelibs/trunk/ding/src/ding/view/DGraphView.java 2009-12-02 02:43:08 UTC
(rev 18642)
+++ corelibs/trunk/ding/src/ding/view/DGraphView.java 2009-12-03 19:19:10 UTC
(rev 18643)
@@ -34,30 +34,10 @@
*/
package ding.view;
-import cytoscape.geom.rtree.RTree;
-
-import cytoscape.geom.spacial.MutableSpacialIndex2D;
-import cytoscape.geom.spacial.SpacialEntry2DEnumerator;
-
-import cytoscape.graph.fixed.FixedGraph;
-
-import cytoscape.render.immed.GraphGraphics;
-
-import cytoscape.render.stateful.GraphLOD;
-import cytoscape.render.stateful.GraphRenderer;
-
-import cytoscape.util.intr.IntBTree;
-import cytoscape.util.intr.IntEnumerator;
-import cytoscape.util.intr.IntHash;
-import cytoscape.util.intr.IntStack;
-
import giny.model.Edge;
import giny.model.GraphPerspective;
-import giny.model.NestedNetworkChangeEvent;
-import giny.model.NestedNetworkChangeEventListener;
import giny.model.Node;
import giny.model.RootGraph;
-
import giny.view.EdgeView;
import giny.view.GraphView;
import giny.view.GraphViewChangeListener;
@@ -65,31 +45,36 @@
import java.awt.Color;
import java.awt.Component;
+import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
import java.awt.Image;
import java.awt.Paint;
import java.awt.Shape;
-import java.awt.Dimension;
import java.awt.TexturePaint;
import java.awt.geom.GeneralPath;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
import java.awt.print.PageFormat;
import java.awt.print.Printable;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.imageio.ImageIO;
+import cytoscape.geom.rtree.RTree;
+import cytoscape.geom.spacial.MutableSpacialIndex2D;
+import cytoscape.geom.spacial.SpacialEntry2DEnumerator;
+import cytoscape.graph.fixed.FixedGraph;
+import cytoscape.render.immed.GraphGraphics;
+import cytoscape.render.stateful.GraphLOD;
+import cytoscape.render.stateful.GraphRenderer;
+import cytoscape.util.intr.IntBTree;
+import cytoscape.util.intr.IntEnumerator;
+import cytoscape.util.intr.IntHash;
+import cytoscape.util.intr.IntStack;
/**
@@ -107,7 +92,7 @@
*/
public class DGraphView implements GraphView, Printable {
// Size of snapshot image
- private static final int DEF_SNAPSHOT_SIZE = 2000;
+ private static final int DEF_SNAPSHOT_SIZE = 1500;
static final float DEFAULT_ANCHOR_SIZE = 9.0f;
static final Paint DEFAULT_ANCHOR_SELECTED_PAINT = Color.red;
Modified: corelibs/trunk/ding/src/ding/view/DNodeDetails.java
===================================================================
--- corelibs/trunk/ding/src/ding/view/DNodeDetails.java 2009-12-02 02:43:08 UTC
(rev 18642)
+++ corelibs/trunk/ding/src/ding/view/DNodeDetails.java 2009-12-03 19:19:10 UTC
(rev 18643)
@@ -579,14 +579,10 @@
@Override
public TexturePaint getNestedNetworkTexturePaint(final int node) {
final DNodeView dNodeView = (DNodeView)
m_view.getNodeView(~node);
- final GraphPerspective nestedNetwork =
dNodeView.getNode().getNestedNetwork();
- if (nestedNetwork == null) {
- return null;
- }
-
return dNodeView.getNestedNetworkTexturePaint();
}
+
/*
* A negative width value has the special meaning to remove overridden
width.
*/
Modified: corelibs/trunk/ding/src/ding/view/DNodeView.java
===================================================================
--- corelibs/trunk/ding/src/ding/view/DNodeView.java 2009-12-02 02:43:08 UTC
(rev 18642)
+++ corelibs/trunk/ding/src/ding/view/DNodeView.java 2009-12-03 19:19:10 UTC
(rev 18643)
@@ -41,6 +41,7 @@
import giny.view.GraphViewChangeListener;
import giny.view.Label;
import giny.view.NodeView;
+
import java.awt.AlphaComposite;
import java.awt.BasicStroke;
import java.awt.Color;
@@ -53,13 +54,13 @@
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
+
import javax.imageio.ImageIO;
import cytoscape.render.immed.GraphGraphics;
@@ -67,15 +68,16 @@
/**
- * DOCUMENT ME!
+ * Ding implementation of GINY NodeView.
*
* @author $author$
*/
public class DNodeView implements NodeView, Label {
// For Cytoscape 2.7: Nested Network Image size
- private static final float NESTED_IMAGE_SCALE_FACTOR = 0.7f;
+ private static final float NESTED_IMAGE_SCALE_FACTOR = 0.6f;
+
+ // This image will be used when view is not available for a nested
network.
private static BufferedImage DEFAULT_NESTED_NETWORK_IMAGE;
-
static {
try {
DEFAULT_NESTED_NETWORK_IMAGE =
ImageIO.read(DNodeView.class.getClassLoader().getResource("resources/images/default_network.png"));
@@ -141,6 +143,7 @@
m_graphicShapes = null;
m_graphicPaints = null;
+ // By default, no nested network is available.
nestedNetworkView = null;
}
@@ -1422,8 +1425,7 @@
final double IMAGE_HEIGHT =
getHeight()*NESTED_IMAGE_SCALE_FACTOR;
if (nestedNetworkView != null) {
return
nestedNetworkView.getSnapshot(IMAGE_WIDTH, IMAGE_HEIGHT);
- }
- else {
+ } else {
if (DEFAULT_NESTED_NETWORK_IMAGE ==
null) {
return null;
}
--
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.
