Author: kono
Date: 2011-10-10 17:00:47 -0700 (Mon, 10 Oct 2011)
New Revision: 27119

Added:
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/about_icons.txt
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/no_image.png
Modified:
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
   
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/bitmap/URLImageCustomGraphics.java
Log:
fixes #420 Icon replaced for empty images.

Modified: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
   2011-10-10 23:35:04 UTC (rev 27118)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/customgraphics/NullCustomGraphics.java
   2011-10-11 00:00:47 UTC (rev 27119)
@@ -18,7 +18,7 @@
  */
 public class NullCustomGraphics extends AbstractDCustomGraphics {
        
-       private static final String DEF_IMAGE_FILE = 
"images/stock_dialog-warning-32.png";
+       private static final String DEF_IMAGE_FILE = "images/no_image.png";
        private static BufferedImage DEF_IMAGE;
        
        static  {

Modified: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
     2011-10-10 23:35:04 UTC (rev 27118)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
     2011-10-11 00:00:47 UTC (rev 27119)
@@ -3,6 +3,7 @@
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.Image;
 import java.awt.RenderingHints;
 
 import org.cytoscape.ding.customgraphics.CyCustomGraphics;
@@ -23,7 +24,9 @@
 
                // AA on
                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, 
RenderingHints.VALUE_ANTIALIAS_ON);
-               g2d.drawImage(getImage(), leftPad, (c.getHeight() - height) / 
2, width, height, c);
+               final Image original = this.getImage();
+               final Image resized = original.getScaledInstance(width, height, 
Image.SCALE_AREA_AVERAGING);
+               g2d.drawImage(resized, leftPad, (c.getHeight() - height) / 2, 
width, height, c);
        }
 
 }

Modified: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/bitmap/URLImageCustomGraphics.java
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/bitmap/URLImageCustomGraphics.java
   2011-10-10 23:35:04 UTC (rev 27118)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/customgraphics/bitmap/URLImageCustomGraphics.java
   2011-10-11 00:00:47 UTC (rev 27119)
@@ -18,7 +18,7 @@
 
 public class URLImageCustomGraphics extends AbstractDCustomGraphics {
 
-       private static final String DEF_IMAGE_FILE = 
"images/stock_dialog-warning-32.png";
+       private static final String DEF_IMAGE_FILE = "images/no_image.png";
        private static BufferedImage DEF_IMAGE;
        
        static  {

Added: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/about_icons.txt
===================================================================
--- 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/about_icons.txt
                         (rev 0)
+++ 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/about_icons.txt
 2011-10-11 00:00:47 UTC (rev 27119)
@@ -0,0 +1,5 @@
+no_image.png was created by:
+
+Artist: Delacro
+Iconset: iD Icons (52 icons)
+License: CC Attribution-Noncommercial-No Derivate 3.0
\ No newline at end of file

Added: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/no_image.png
===================================================================
(Binary files differ)


Property changes on: 
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/resources/images/no_image.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

-- 
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.

Reply via email to