Author: kono
Date: 2011-03-28 18:49:44 -0700 (Mon, 28 Mar 2011)
New Revision: 24604
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/NodeIcon.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/TextIcon.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
Log:
Fixed IconRenderers. Some of them are still broken.
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
2011-03-28 23:56:21 UTC (rev 24603)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/CustomGraphicsIcon.java
2011-03-29 01:49:44 UTC (rev 24604)
@@ -1,16 +1,31 @@
package org.cytoscape.ding.icon;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
-public class CustomGraphicsIcon extends VisualPropertyIcon<CyCustomGraphics> {
+public class CustomGraphicsIcon extends
VisualPropertyIcon<CyCustomGraphics<?>> {
private static final long serialVersionUID = -216647303312376087L;
- public CustomGraphicsIcon(CyCustomGraphics value, int width, int height,
+ public CustomGraphicsIcon(CyCustomGraphics<?> value, int width, int
height,
String name) {
super(value, width, height, name);
-
this.setImage(value.getRenderedImage());
}
+
+ @Override public void paintIcon(Component c, Graphics g, int x, int y) {
+ final Graphics2D g2d = (Graphics2D) g;
+
+ // AA on
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.translate(0, bottomPad);
+ g2d.drawImage(getImage(), 0, (c.getHeight() - height) / 2,
width, height, c);
+ g2d.translate(0, -bottomPad);
+ }
+
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/NodeIcon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/NodeIcon.java
2011-03-28 23:56:21 UTC (rev 24603)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/NodeIcon.java
2011-03-29 01:49:44 UTC (rev 24604)
@@ -35,7 +35,6 @@
package org.cytoscape.ding.icon;
import java.awt.BasicStroke;
-import java.awt.Color;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.Graphics2D;
@@ -110,6 +109,8 @@
* @param y DOCUMENT ME!
*/
@Override public void paintIcon(Component c, Graphics g, int x, int y) {
+ System.out.println("2################ Icon paint called: " +
this.getClass());
+
g2d = (Graphics2D) g;
final AffineTransform af = new AffineTransform();
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/TextIcon.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/TextIcon.java
2011-03-28 23:56:21 UTC (rev 24603)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/TextIcon.java
2011-03-29 01:49:44 UTC (rev 24604)
@@ -26,11 +26,11 @@
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- Font original = g2d.getFont();
+ final Font original = g2d.getFont();
if (value != null) {
g2d.setColor(color);
g2d.setFont(font);
- g2d.drawString(value.toString(), x + leftPad,
y+height/2+9);
+ g2d.drawString(value.toString(), leftPad, height/2+9);
}
g2d.setFont(original);
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
2011-03-28 23:56:21 UTC (rev 24603)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
2011-03-29 01:49:44 UTC (rev 24604)
@@ -6,7 +6,6 @@
import javax.swing.Icon;
-import org.cytoscape.ding.LineStyle;
import org.cytoscape.ding.NodeShape;
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
@@ -15,8 +14,6 @@
/**
* Static factory for icons.
- *
- * @author kono
*
*/
public class VisualPropertyIconFactory {
--
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.
