Author: kono
Date: 2011-03-29 17:41:57 -0700 (Tue, 29 Mar 2011)
New Revision: 24619
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetTable.java
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/editor/ColorVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DoubleVisualPropertyEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
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/GradientEditorPanel.java
Log:
Fixed continuous icon generator.
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetTable.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetTable.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/VizMapPropertySheetTable.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -31,9 +31,7 @@
final String colorString =
Integer.toHexString(fontColor.getRGB());
- /*
- * Edit
- */
+
if (prop == null)
return null;
Modified:
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-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/cellrenderer/ColorContinuousMappingCellRenderer.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -1,9 +1,12 @@
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;
@@ -15,22 +18,21 @@
public class ColorContinuousMappingCellRenderer extends DefaultCellRenderer {
private static final long serialVersionUID = -6734053848878359286L;
+
+ private final GradientEditor editor;
+ public ColorContinuousMappingCellRenderer(final GradientEditor editor) {
+ this.editor = editor;
+ }
- public ColorContinuousMappingCellRenderer() {
-
- }
-
@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("!");
+ this.setText("! (Unkonown Mapping)");
return this;
}
-
- //ContinuousMapping<? extends Number, Paint> cm =
(ContinuousMapping<? extends Number, Paint>) value;
-
+
if (isSelected) {
setBackground(table.getSelectionBackground());
setForeground(table.getSelectionForeground());
@@ -38,9 +40,12 @@
setBackground(table.getBackground());
setForeground(table.getForeground());
}
-
- this.setText("Map type = " + value.toString());
+
+ 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-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/ColorVisualPropertyEditor.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -64,9 +64,9 @@
super(type, new CyColorPropertyEditor());
discreteTableCellRenderer = REG.getRenderer(Color.class);
- continuousTableCellRenderer = new
ColorContinuousMappingCellRenderer();
+
- continuousEditor = new GradientEditor(manager, appManager,
- selectedManager, editorManager, vmm);
+ continuousEditor = new GradientEditor(manager, appManager,
selectedManager, editorManager, vmm);
+ continuousTableCellRenderer = new
ColorContinuousMappingCellRenderer((GradientEditor) continuousEditor);
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DoubleVisualPropertyEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DoubleVisualPropertyEditor.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/DoubleVisualPropertyEditor.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -60,9 +60,10 @@
super(type, new CyDoublePropertyEditor(null));
discreteTableCellRenderer = REG.getRenderer(Double.class);
- continuousTableCellRenderer = new
ColorContinuousMappingCellRenderer();
continuousEditor = new C2CEditor(manager, appManager,
selectedManager,
editorManager, vmm);
+ //FIXME
+ continuousTableCellRenderer = null;
}
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -5,8 +5,12 @@
import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.ImageIcon;
import javax.swing.JDialog;
+import javax.swing.JLabel;
import javax.swing.JPanel;
import org.cytoscape.model.CyTableManager;
@@ -33,9 +37,15 @@
protected final VisualMappingManager vmm;
+ private final JLabel iconLabel;
+
+ private boolean isEditorDialogActive;
+
public AbstractContinuousMappingEditor(final CyTableManager manager,
final CyApplicationManager appManager,
final SelectedVisualStyleManager selectedManager, final
EditorManager editorManager, final VisualMappingManager vmm) {
+ this.isEditorDialogActive = false;
+ this.iconLabel = new JLabel();
this.vmm = vmm;
this.manager = manager;
this.appManager = appManager;
@@ -43,16 +53,35 @@
this.editorManager = editorManager;
editor = new JPanel();
+ ((JPanel)editor).setLayout(new BorderLayout());
+ ((JPanel)editor).add(iconLabel, BorderLayout.CENTER);
+
this.editor.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent ev) {
+
+ // Open only one editor at a time.
+ if(isEditorDialogActive)
+ return;
+
final JDialog editorDialog = new JDialog();
initComponents(editorDialog);
+ editorDialog.addWindowListener(new
WindowAdapter() {
+
+ @Override
+ public void windowClosed(WindowEvent
evt) {
+ final Dimension size =
editor.getSize();
+ drawIcon(size.width,
size.height, false);
+ isEditorDialogActive = false;
+ }
+ });
+
editorDialog.setTitle("Continuous Mapping
Editor: Mapping for " + mapping.getVisualProperty().getDisplayName());
editorDialog.setLocationRelativeTo(editor);
editorDialog.setVisible(true);
+ isEditorDialogActive = true;
}
private void initComponents(final JDialog dialog) {
@@ -68,8 +97,17 @@
dialog.pack();
}
});
+ }
+
+
+ public ImageIcon drawIcon(int width, int height, boolean detail) {
+ if(editorPanel == null)
+ return null;
+ final ImageIcon newIcon = this.editorPanel.drawIcon(width,
height, detail);
+ iconLabel.setIcon(newIcon);
+ return newIcon;
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -287,4 +287,18 @@
above = (V) evt.getNewValue();
}
}
+
+ @Override
+ public ImageIcon drawIcon(int iconWidth, int iconHeight, boolean
detail) {
+ final TrackRenderer rend = slider.getTrackRenderer();
+
+ if (rend instanceof ContinuousTrackRenderer) {
+ rend.getRendererComponent(slider);
+
+ return ((ContinuousTrackRenderer<Double, V>) rend)
+ .getTrackGraphicIcon(iconWidth,
iconHeight);
+ } else {
+ return null;
+ }
+ }
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2DMappingEditor.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -65,8 +65,9 @@
ContinuousMappingEditorPanel<Number, V> {
private final static long serialVersionUID = 1213748837197780L;
- private static final Logger logger =
LoggerFactory.getLogger(C2DMappingEditor.class);
-
+ private static final Logger logger = LoggerFactory
+ .getLogger(C2DMappingEditor.class);
+
private final EditorManager editorManager;
public C2DMappingEditor(final VisualStyle style,
@@ -74,12 +75,12 @@
final CyApplicationManager appManager,
final VisualMappingManager vmm, final EditorManager
editorManager) {
super(style, mapping, attr, appManager, vmm);
-
- if(editorManager == null)
+
+ if (editorManager == null)
throw new NullPointerException("Editor manager is
null.");
-
+
this.editorManager = editorManager;
-
+
this.iconPanel.setVisible(false);
this.belowPanel.setVisible(false);
this.abovePanel.setVisible(false);
@@ -115,7 +116,8 @@
* @param type
* @return
*/
- public ImageIcon getLegend(final int width, final int height, final
VisualProperty<?> type) {
+ public ImageIcon getLegend(final int width, final int height,
+ final VisualProperty<?> type) {
if (slider.getTrackRenderer() instanceof DiscreteTrackRenderer
== false) {
return null;
@@ -284,7 +286,8 @@
updateMap();
slider.setTrackRenderer(new
DiscreteTrackRenderer<Number, V>(
- mapping, below, above,
tracer, appManager.getCurrentRenderingEngine()));
+ mapping, below, above,
tracer, appManager
+
.getCurrentRenderingEngine()));
slider.repaint();
// Update network
@@ -328,7 +331,8 @@
*/
TriangleThumbRenderer thumbRend = new
TriangleThumbRenderer(slider);
DiscreteTrackRenderer<Number, V> dRend = new
DiscreteTrackRenderer<Number, V>(
- mapping, below, above, tracer,
appManager.getCurrentRenderingEngine());
+ mapping, below, above, tracer,
+ appManager.getCurrentRenderingEngine());
slider.setThumbRenderer(thumbRend);
slider.setTrackRenderer(dRend);
@@ -340,4 +344,13 @@
// TODO Auto-generated method stub
}
+
+ @Override
+ public ImageIcon drawIcon(int iconWidth, int iconHeight, boolean
detail) {
+ DiscreteTrackRenderer<Number, V> rend =
(DiscreteTrackRenderer<Number, V>) slider
+ .getTrackRenderer();
+ rend.getRendererComponent(slider);
+
+ return rend.getTrackGraphicIcon(iconWidth, iconHeight);
+ }
}
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -39,6 +39,7 @@
import java.util.List;
import javax.swing.GroupLayout;
+import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JSpinner;
@@ -398,6 +399,10 @@
abstract protected void addButtonActionPerformed(
java.awt.event.ActionEvent evt);
+
+ // Generate icon from current mapping.
+ abstract public ImageIcon drawIcon(int iconWidth, int iconHeight,
boolean detail);
+
private void initRangeValues() {
@@ -547,12 +552,7 @@
}
}
- /**
- * Watching spinner
- *
- * @author kono
- *
- */
+
class SpinnerChangeListener implements ChangeListener {
public void stateChanged(ChangeEvent e) {
Number newVal = spinnerModel.getNumber();
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-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/CyGradientTrackRenderer.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -71,24 +71,19 @@
// Preset fonts
private static final Font SMALL_FONT = new Font("SansSerif", Font.BOLD,
16);
private static final Font TITLE_FONT = new Font("SansSerif", Font.BOLD,
12);
-
+
// Width of the slider
private static final int THUMB_WIDTH = 12;
private int trackHeight = 40;
- // private Paint checker_paint;
private JXMultiThumbSlider<Color> slider;
-
- // private double minValue;
- // private double maxValue;
- // private double range;
+
private Color below;
private Color above;
private String attrName;
-
- private final VisualProperty<Color> type;
+ private final VisualProperty<Color> type;
private final EditorValueRangeTracer tracer;
/**
@@ -97,25 +92,18 @@
* @param gradientPicker
* DOCUMENT ME!
*/
- public CyGradientTrackRenderer(final VisualProperty<Color> type, final
Color below, final Color above, final String title, final
EditorValueRangeTracer tracer) {
- // checker_paint = ColorUtil.getCheckerPaint();
+ public CyGradientTrackRenderer(final VisualProperty<Color> type,
+ final Color below, final Color above, final String
title,
+ final EditorValueRangeTracer tracer) {
this.below = below;
this.above = above;
this.tracer = tracer;
- // this.minValue = minValue;
- // this.maxValue = maxValue;
this.attrName = title;
- // this.range = Math.abs(maxValue - minValue);
this.type = type;
}
- /**
- * DOCUMENT ME!
- *
- * @param g
- * DOCUMENT ME!
- */
+
public void paint(Graphics g) {
super.paint(g);
paintComponent(g);
@@ -125,15 +113,16 @@
final Graphics2D g = (Graphics2D) gfx;
// Turn AA on
- g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
+ g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
- double minValue = tracer.getMin(type);
- double maxValue = tracer.getMax(type);
- double range = tracer.getRange(type);
+ final double minValue = tracer.getMin(type);
+ final double maxValue = tracer.getMax(type);
+ final double range = tracer.getRange(type);
// calculate the track area
-
- int track_width = slider.getWidth() - THUMB_WIDTH;
+
+ final int track_width = slider.getWidth() - THUMB_WIDTH;
g.translate(THUMB_WIDTH / 2, 12);
// get the list of colors
@@ -327,55 +316,25 @@
return null;
}
- /**
- * DOCUMENT ME!
- *
- * @param x
- * DOCUMENT ME!
- * @param y
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
+
public String getToolTipForCurrentLocation(int x, int y) {
// TODO Auto-generated method stub
return null;
}
- /**
- * DOCUMENT ME!
- *
- * @param iconWidth
- * DOCUMENT ME!
- * @param iconHeight
- * DOCUMENT ME!
- * @param mapping
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public ImageIcon getTrackGraphicIcon(int iconWidth, int iconHeight) {
- return drawIcon(iconWidth, iconHeight, false);
- }
+
+// public ImageIcon getTrackGraphicIcon(int iconWidth, int iconHeight) {
+// return drawIcon(iconWidth, iconHeight, false);
+// }
+//
+//
+// public ImageIcon getLegend(int iconWidth, int iconHeight) {
+// return drawIcon(iconWidth, iconHeight, true);
+// }
- /**
- * DOCUMENT ME!
- *
- * @param iconWidth
- * DOCUMENT ME!
- * @param iconHeight
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public ImageIcon getLegend(int iconWidth, int iconHeight) {
- return drawIcon(iconWidth, iconHeight, true);
- }
-
- private ImageIcon drawIcon(int iconWidth, int iconHeight, boolean
detail) {
- if (slider == null) {
+ public ImageIcon drawIcon(int iconWidth, int iconHeight, boolean
detail) {
+ if (slider == null)
return null;
- }
final BufferedImage bi = new BufferedImage(iconWidth,
iconHeight,
BufferedImage.TYPE_INT_RGB);
Modified:
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2011-03-29 23:22:34 UTC (rev 24618)
+++
core3/vizmap-gui-impl/trunk/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2011-03-30 00:41:57 UTC (rev 24619)
@@ -64,9 +64,10 @@
public class GradientEditorPanel extends
ContinuousMappingEditorPanel<Double, Color> implements
PropertyChangeListener {
-
- private static final Logger logger =
LoggerFactory.getLogger(GradientEditorPanel.class);
-
+
+ private static final Logger logger = LoggerFactory
+ .getLogger(GradientEditorPanel.class);
+
private final static long serialVersionUID = 1202339877433771L;
// Preset colors
@@ -77,6 +78,7 @@
private final CyApplicationManager appManager;
private final ValueEditor<Paint> colorEditor;
+ private CyGradientTrackRenderer gRend;
/**
* Creates a new GradientEditorPanel object.
@@ -86,13 +88,14 @@
*/
public GradientEditorPanel(final VisualStyle style,
final ContinuousMapping<Double, Color> mapping, final
CyTable attr,
- final CyApplicationManager appManager, final
ValueEditor<Paint> colorEditor, final VisualMappingManager vmm) {
-
+ final CyApplicationManager appManager,
+ final ValueEditor<Paint> colorEditor, final
VisualMappingManager vmm) {
+
super(style, mapping, attr, appManager, vmm);
-
- if(colorEditor == null)
+
+ if (colorEditor == null)
throw new NullPointerException("Color Value Editor is
missing.");
-
+
this.colorEditor = colorEditor;
this.appManager = appManager;
@@ -106,24 +109,22 @@
addButtonActionPerformed(null);
}
-
- public ImageIcon getLegend(final int width, final int height) {
- final CyGradientTrackRenderer rend = (CyGradientTrackRenderer)
slider
- .getTrackRenderer();
- rend.getRendererComponent(slider);
+// public ImageIcon getLegend(final int width, final int height) {
+// final CyGradientTrackRenderer rend = (CyGradientTrackRenderer)
slider
+// .getTrackRenderer();
+// rend.getRendererComponent(slider);
+//
+// return rend.getLegend(width, height);
+// }
+//
+// public ImageIcon getIcon(final int iconWidth, final int iconHeight) {
+// final CyGradientTrackRenderer rend = (CyGradientTrackRenderer)
slider
+// .getTrackRenderer();
+// rend.getRendererComponent(slider);
+//
+// return rend.getTrackGraphicIcon(iconWidth, iconHeight);
+// }
- return rend.getLegend(width, height);
- }
-
-
- public ImageIcon getIcon(final int iconWidth, final int iconHeight) {
- final CyGradientTrackRenderer rend = (CyGradientTrackRenderer)
slider
- .getTrackRenderer();
- rend.getRendererComponent(slider);
-
- return rend.getTrackGraphicIcon(iconWidth, iconHeight);
- }
-
@Override
protected void addButtonActionPerformed(ActionEvent evt) {
@@ -160,7 +161,7 @@
// Update view.
style.apply(appManager.getCurrentNetworkView());
appManager.getCurrentNetworkView().updateView();
-
+
return;
}
@@ -201,19 +202,19 @@
}
private void setColor(final Color newColor) {
-
- logger.debug("%%%%%%%%% Set color called: New color = " +
newColor);
-
-
slider.getModel().getThumbAt(slider.getSelectedIndex()).setObject(newColor);
-
+ logger.debug("Set color called: New color = " + newColor);
+
+ slider.getModel().getThumbAt(slider.getSelectedIndex())
+ .setObject(newColor);
+
int selected = getSelectedPoint(slider.getSelectedIndex());
mapping.getPoint(selected).getRange().equalValue = newColor;
- final BoundaryRangeValues<Color> brv = new
BoundaryRangeValues<Color>(mapping
- .getPoint(selected).getRange().lesserValue,
newColor, mapping
- .getPoint(selected).getRange().greaterValue);
+ final BoundaryRangeValues<Color> brv = new
BoundaryRangeValues<Color>(
+
mapping.getPoint(selected).getRange().lesserValue, newColor,
+
mapping.getPoint(selected).getRange().greaterValue);
mapping.getPoint(selected).setRange(brv);
@@ -230,8 +231,10 @@
brv.greaterValue = newColor;
}
- //mapping.fireStateChanged();
+ // mapping.fireStateChanged();
+ // Update view.
+ style.apply(appManager.getCurrentNetworkView());
appManager.getCurrentNetworkView().updateView();
slider.repaint();
}
@@ -248,14 +251,15 @@
public void mouseClicked(MouseEvent e) {
final JComponent selectedThumb =
slider.getSelectedThumb();
-
+
if (selectedThumb != null) {
// final Point location =
selectedThumb.getLocation();
// double diff =
Math.abs(location.getX() - e.getX());
if (e.getClickCount() == 2) {
-
- final Paint newColor =
colorEditor.showEditor(slider, null);
+ final Paint newColor =
colorEditor.showEditor(slider,
+ null);
+
if (newColor != null) {
// Set new color
setColor((Color)
newColor);
@@ -269,7 +273,7 @@
final double minValue = tracer.getMin(type);
if (allPoints != null) {
- for(final ContinuousMappingPoint<Double, Color> point :
allPoints) {
+ for (final ContinuousMappingPoint<Double, Color> point
: allPoints) {
BoundaryRangeValues<Color> bound =
point.getRange();
slider.getModel()
@@ -304,9 +308,8 @@
slider.setToolTipText("Double-click handles to edit boundary
colors.");
}
+ public void propertyChange(PropertyChangeEvent e) {
- public void propertyChange(PropertyChangeEvent e) {
-
// FIXME!!!!!!!
if
(e.getPropertyName().equals(BelowAndAbovePanel.COLOR_CHANGED)) {
String sourceName = ((BelowAndAbovePanel)
e.getSource()).getName();
@@ -324,4 +327,13 @@
repaint();
}
}
+
+ @Override
+ public ImageIcon drawIcon(int iconWidth, int iconHeight, boolean
detail) {
+ final CyGradientTrackRenderer rend = (CyGradientTrackRenderer)
slider
+ .getTrackRenderer();
+ rend.getRendererComponent(slider);
+
+ return rend.drawIcon(iconWidth, iconHeight, detail);
+ }
}
--
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.
