Author: kono
Date: 2011-06-17 14:06:43 -0700 (Fri, 17 Jun 2011)
New Revision: 25798
Added:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
Removed:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ColorContinuousMappingCellRenderer.java
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/CyGradientTrackRenderer.java
Log:
Mapping icon generator for continuous mappings had been fixed.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertyBuilder.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -63,6 +63,7 @@
import com.l2fprod.common.propertysheet.DefaultProperty;
import com.l2fprod.common.propertysheet.PropertyEditorRegistry;
+import com.l2fprod.common.propertysheet.PropertyRendererFactory;
import com.l2fprod.common.propertysheet.PropertyRendererRegistry;
import com.l2fprod.common.propertysheet.PropertySheetPanel;
import com.l2fprod.common.propertysheet.PropertySheetTable;
@@ -79,12 +80,10 @@
private EditorManager editorManager;
private CyNetworkManager cyNetworkManager;
- private CyTableManager tableMgr;
public VizMapPropertyBuilder(CyNetworkManager cyNetworkManager,
EditorManager editorManager, CyTableManager tableMgr) {
this.cyNetworkManager = cyNetworkManager;
this.editorManager = editorManager;
- this.tableMgr = tableMgr;
}
/**
@@ -171,7 +170,7 @@
}
final VisualPropertyEditor<V> vpEditor =
editorManager.getVisualPropertyEditor(vp);
- logger.debug("vpEditor is " + vpEditor);
+ logger.debug("==========>>>>>> Setting vpEditor:" + vpEditor);
if (visualMapping instanceof DiscreteMapping && (attrName !=
null)) {
// Discrete Mapping
@@ -207,19 +206,22 @@
} else if (visualMapping instanceof ContinuousMapping &&
(attrName != null)) {
- final VizMapperProperty<String, String,
VisualMappingFunction<K, V>> graphicalView = new VizMapperProperty<String,
String, VisualMappingFunction<K, V>>(
- CellType.CONTINUOUS,
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, String.class);
+ logger.debug("==========>>>>>> Setting Continuous:" +
vpEditor);
+
+ final VizMapperProperty<String, String,
VisualMappingFunction<K, V>> graphicalView =
+ new VizMapperProperty<String, String,
VisualMappingFunction<K, V>>(CellType.CONTINUOUS,
AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW, String.class);
graphicalView.setValue(visualMapping);
graphicalView.setDisplayName(AbstractVizMapperPanel.GRAPHICAL_MAP_VIEW);
graphicalView.setParentProperty(topProperty);
topProperty.addSubProperty(graphicalView);
- // FIXME
final TableCellRenderer continuousRenderer =
vpEditor.getContinuousTableCellRenderer();
-
+
+ //FIXME
final PropertySheetTable table =
propertySheetPanel.getTable();
- ((PropertyRendererRegistry)
table.getRendererFactory()).registerRenderer(graphicalView, continuousRenderer);
-
+ final PropertyRendererRegistry rendReg =
(PropertyRendererRegistry) table.getRendererFactory();
+ rendReg.registerRenderer(graphicalView,
continuousRenderer);
+
final PropertyEditorRegistry cellEditorFactory =
(PropertyEditorRegistry) table.getEditorFactory();
final PropertyEditor continuousCellEditor =
editorManager.getVisualPropertyEditor(vp)
.getContinuousMappingEditor();
Deleted:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ColorContinuousMappingCellRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ColorContinuousMappingCellRenderer.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ColorContinuousMappingCellRenderer.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -1,53 +0,0 @@
-package org.cytoscape.view.vizmap.gui.internal.cellrenderer;
-
-import java.awt.Component;
-import java.awt.Paint;
-
-import javax.swing.ImageIcon;
-import javax.swing.JTable;
-
-import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.GradientEditor;
-import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
-
-import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
-
-/**
- * Cell renderer for Continuous Color mapping
- *
- */
-public class ColorContinuousMappingCellRenderer extends DefaultCellRenderer {
-
- private static final long serialVersionUID = -6734053848878359286L;
-
- private final GradientEditor editor;
-
- public ColorContinuousMappingCellRenderer(final GradientEditor editor) {
- this.editor = editor;
- }
-
- @Override public Component getTableCellRendererComponent(JTable table,
Object value,
- boolean isSelected, boolean hasFocus, int row, int
column) {
-
- if(value == null || value instanceof ContinuousMapping ==
false) {
- this.setText("! (Unkonown Mapping)");
- return this;
- }
-
- if (isSelected) {
- setBackground(table.getSelectionBackground());
- setForeground(table.getSelectionForeground());
- } else {
- setBackground(table.getBackground());
- setForeground(table.getForeground());
- }
-
-
- final int height = table.getRowHeight(row);
- final int width =
table.getColumnModel().getColumn(column).getWidth();
- final ImageIcon icon = editor.drawIcon(width, height-2, false);
- this.setIcon(icon);
-
- return this;
- }
-
-}
Copied:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
(from rev 25624,
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ColorContinuousMappingCellRenderer.java)
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
(rev 0)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ContinuousMappingCellRenderer.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -0,0 +1,55 @@
+package org.cytoscape.view.vizmap.gui.internal.cellrenderer;
+
+import java.awt.Component;
+
+import javax.swing.ImageIcon;
+import javax.swing.JTable;
+
+import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
+import org.cytoscape.view.vizmap.mappings.ContinuousMapping;
+
+import com.l2fprod.common.swing.renderer.DefaultCellRenderer;
+
+/**
+ * Cell renderer for Continuous Color mapping
+ *
+ */
+public class ContinuousMappingCellRenderer extends DefaultCellRenderer {
+
+ private static final long serialVersionUID = -6734053848878359286L;
+
+ private final AbstractContinuousMappingEditor<?, ?> editor;
+
+ public ContinuousMappingCellRenderer(final
AbstractContinuousMappingEditor<?, ?> editor) {
+ if(editor == null)
+ throw new NullPointerException("Editor object is
null.");
+
+ this.editor = editor;
+ }
+
+
+ @Override public Component getTableCellRendererComponent(JTable table,
Object value,
+ boolean isSelected, boolean hasFocus, int row, int
column) {
+
+ if(value == null || value instanceof ContinuousMapping ==
false) {
+ this.setText("Unkonown Mapping");
+ return this;
+ }
+
+ if (isSelected) {
+ setBackground(table.getSelectionBackground());
+ setForeground(table.getSelectionForeground());
+ } else {
+ setBackground(table.getBackground());
+ setForeground(table.getForeground());
+ }
+
+ final int height = table.getRowHeight(row);
+ final int width =
table.getColumnModel().getColumn(column).getWidth();
+ final ImageIcon icon = editor.drawIcon(width, height-2, false);
+ this.setIcon(icon);
+
+ return this;
+ }
+
+}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -42,7 +42,8 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
-import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.ColorContinuousMappingCellRenderer;
+import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.ContinuousMappingCellRenderer;
+import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.GradientEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyColorPropertyEditor;
@@ -65,8 +66,7 @@
discreteTableCellRenderer = REG.getRenderer(Color.class);
-
continuousEditor = new GradientEditor(manager, appManager,
selectedManager, editorManager, vmm);
- continuousTableCellRenderer = new
ColorContinuousMappingCellRenderer((GradientEditor) continuousEditor);
+ continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DiscreteValuePropertyEditor.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -7,6 +7,8 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
+import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.ContinuousMappingCellRenderer;
+import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
import org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.C2DEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyComboBoxPropertyEditor;
@@ -25,10 +27,11 @@
super(type, new CyComboBoxPropertyEditor());
discreteTableCellRenderer = REG.getRenderer(type);
- // continuousTableCellRenderer = new IconCellRenderer<T>(icons);
+
CyComboBoxPropertyEditor cbe = (CyComboBoxPropertyEditor)
propertyEditor;
cbe.setAvailableValues(values.toArray());
continuousEditor = new C2DEditor<T>(manager, appManager,
selectedManager, editorManager, vmm);
+ continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/NumberVisualPropertyEditor.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -39,6 +39,8 @@
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.gui.SelectedVisualStyleManager;
import org.cytoscape.view.vizmap.gui.editor.EditorManager;
+import
org.cytoscape.view.vizmap.gui.internal.cellrenderer.ContinuousMappingCellRenderer;
+import
org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.AbstractContinuousMappingEditor;
import org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor.C2CEditor;
import
org.cytoscape.view.vizmap.gui.internal.editor.propertyeditor.CyNumberPropertyEditor;
@@ -54,8 +56,7 @@
discreteTableCellRenderer = REG.getRenderer(type);
continuousEditor = new C2CEditor(manager, appManager,
selectedManager, editorManager, vmm);
- // FIXME
- continuousTableCellRenderer = null;
+ continuousTableCellRenderer = new
ContinuousMappingCellRenderer((AbstractContinuousMappingEditor<?, ?>)
continuousEditor);;
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousTrackRenderer.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -872,7 +872,7 @@
values.add(above);
for (Thumb<V> thumb : stops) {
- floatProperty[i] = (Float) thumb.getObject();
+ floatProperty[i] = ((Number)
thumb.getObject()).floatValue();
fractions[i] = thumb.getPosition();
values.add((V) thumb.getObject());
i++;
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/CyGradientTrackRenderer.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/CyGradientTrackRenderer.java
2011-06-17 21:00:21 UTC (rev 25797)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/CyGradientTrackRenderer.java
2011-06-17 21:06:43 UTC (rev 25798)
@@ -452,11 +452,7 @@
return new ImageIcon(bi);
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+
public Double getSelectedThumbValue() {
final float position = slider.getModel()
.getThumbAt(slider.getSelectedIndex()).getPosition();
--
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.
