Author: kono
Date: 2011-03-29 11:51:15 -0700 (Tue, 29 Mar 2011)
New Revision: 24610
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/VisualPropertyIconFactory.java
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/FontEditor.java
Log:
Fixed broken icon generators.
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-29 16:56:28 UTC (rev 24609)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/TextIcon.java
2011-03-29 18:51:15 UTC (rev 24610)
@@ -25,6 +25,8 @@
// Turn AA on
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
+
+ System.out.println("################ Text Icon paint called: "
+ value.getClass());
final Font original = g2d.getFont();
if (value != null) {
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-29 16:56:28 UTC (rev 24609)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/icon/VisualPropertyIconFactory.java
2011-03-29 18:51:15 UTC (rev 24610)
@@ -37,6 +37,7 @@
} else if(value instanceof Font) {
icon = new FontFaceIcon((Font) value, w, h, "");
} else {
+ // If not found, use text as icon.
icon = new TextIcon(value, w, h, value.toString());
}
Modified:
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
===================================================================
---
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
2011-03-29 16:56:28 UTC (rev 24609)
+++
core3/ding-presentation-impl/trunk/src/main/java/org/cytoscape/ding/impl/visualproperty/FontTwoDVisualProperty.java
2011-03-29 18:51:15 UTC (rev 24610)
@@ -35,6 +35,7 @@
package org.cytoscape.ding.impl.visualproperty;
import java.awt.Font;
+import java.awt.GraphicsEnvironment;
import java.util.HashSet;
import java.util.Set;
@@ -45,12 +46,16 @@
public class FontTwoDVisualProperty extends AbstractVisualProperty<Font> {
private static final Range<Font> FONT_RANGE;
+ private static final int DEF_FONT_SIZE = 12;
static {
final Set<Font> fontSet = new HashSet<Font>();
- //TODO: register all available system fonts here.
- FONT_RANGE = new DiscreteRangeImpl<Font>(Font.class,
- fontSet);
+ final Font[] allFonts =
GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
+
+ for(Font f: allFonts)
+ fontSet.add(f.deriveFont(DEF_FONT_SIZE));
+
+ FONT_RANGE = new DiscreteRangeImpl<Font>(Font.class,fontSet);
}
public FontTwoDVisualProperty(final Font def, final String id,
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
2011-03-29 16:56:28 UTC (rev 24609)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/DiscreteTrackRenderer.java
2011-03-29 18:51:15 UTC (rev 24610)
@@ -96,6 +96,8 @@
private final EditorValueRangeTracer tracer;
private final Map<V, Icon> iconMap;
+
+ private final RenderingEngine<CyNetwork> engine;
/**
*
@@ -119,6 +121,7 @@
this.below = below;
this.above = above;
this.tracer = tracer;
+ this.engine = engine;
this.vp = mapping.getVisualProperty();
final Range<V> rangeObject = vp.getRange();
@@ -522,10 +525,15 @@
return;
g.translate(x, y);
- final Icon icon = iconMap.get(key);
- if(icon != null)
- icon.paintIcon(this, g, x, y);
+ Icon icon = iconMap.get(key);
+ if(icon == null) {
+ // Need to render icon.
+ icon = engine.createIcon(vp, key, ICON_SIZE, ICON_SIZE);
+ }
+
+ icon.paintIcon(this, g, x, y);
+
g.translate(-x, -y);
// // TODO: Move this to somewhere more appropreate!
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/FontEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/FontEditor.java
2011-03-29 16:56:28 UTC (rev 24609)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/valueeditor/FontEditor.java
2011-03-29 18:51:15 UTC (rev 24610)
@@ -49,72 +49,60 @@
import org.cytoscape.view.vizmap.gui.editor.ValueEditor;
-
-
-/**
- *
- */
-public class FontEditor extends JDialog implements ValueEditor<Font>{
+public class FontEditor extends JDialog implements ValueEditor<Font> {
private final static long serialVersionUID = 1202339876814272L;
-
+
private Font font;
- private FontChooser chooser = new FontChooser();
+ private final FontChooser chooser;
public FontEditor() {
super();
this.setModal(true);
+ this.chooser = new FontChooser();
init();
}
/**
- * DOCUMENT ME!
- *
- * @param f
- * DOCUMENT ME!
- * @param begin
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Display editor for the given data type.
*/
- public Font showEditor(Component parent, Font initialValue) {
+ public Font showEditor(final Component parent, final Font initialValue)
{
this.setLocationRelativeTo(parent);
setModal(true);
setAlwaysOnTop(true);
font = initialValue;
- chooser.setSelectedFont(font.deriveFont(1F));
+ if(font != null)
+ chooser.setSelectedFont(font.deriveFont(1F));
setVisible(true);
return getThisFont();
}
-
private void init() {
- this.setTitle("Please select a font...");
+ this.setTitle("Please select new font...");
if (font != null)
chooser.setSelectedFont(font.deriveFont(1F));
- // JComboBox face = chooser.getFaceComboBox();
JPanel butPanel = new JPanel(false);
// buttons - OK/Cancel
JButton okBut = new JButton("OK");
okBut.addActionListener(new AbstractAction() {
- private final static long serialVersionUID =
1202339876795625L;
+ private final static long serialVersionUID =
1202339876795625L;
- public void actionPerformed(ActionEvent e) {
- font =
chooser.getSelectedFont().deriveFont(12F);
- dispose();
- }
- });
+ public void actionPerformed(ActionEvent e) {
+ font =
chooser.getSelectedFont().deriveFont(12F);
+ dispose();
+ }
+ });
JButton cancelBut = new JButton("Cancel");
cancelBut.addActionListener(new AbstractAction() {
- private final static long serialVersionUID =
1202339876804773L;
+ private final static long serialVersionUID =
1202339876804773L;
- public void actionPerformed(ActionEvent e) {
- dispose();
- }
- });
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ }
+ });
butPanel.add(okBut);
butPanel.add(cancelBut);
@@ -132,12 +120,8 @@
return font;
}
-
-
public Class<Font> getType() {
- // TODO Auto-generated method stub
return Font.class;
}
-
}
--
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.
