Author: kono
Date: 2012-01-19 12:18:03 -0800 (Thu, 19 Jan 2012)
New Revision: 28049
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/YValueLegendPanel.java
Log:
Lots of Continuous Mapping GUI issues had been fixed.
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/DefaultViewPanelImpl.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -41,9 +41,7 @@
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.List;
import java.awt.event.MouseListener;
-import java.util.ArrayList;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/bypass/BypassManager.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -1,13 +1,9 @@
package org.cytoscape.view.vizmap.gui.internal.bypass;
import java.util.Collection;
-import java.util.Dictionary;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
-import javax.swing.text.View;
-
import org.cytoscape.model.CyEdge;
import org.cytoscape.model.CyNode;
import org.cytoscape.service.util.CyServiceRegistrar;
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/AbstractContinuousMappingEditor.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -1,7 +1,6 @@
package org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -24,8 +23,8 @@
public abstract class AbstractContinuousMappingEditor<K extends Number, V>
extends AbstractPropertyEditor {
- private static final Dimension DEF_SIZE = new Dimension(700, 300);
- private static final Dimension MIN_SIZE = new Dimension(500, 250);
+ private static final Dimension DEF_SIZE = new Dimension(500, 400);
+ private static final Dimension MIN_SIZE = new Dimension(300, 350);
protected ContinuousMapping<K, V> mapping;
protected ContinuousMappingEditorPanel<K, V> editorPanel;
@@ -78,26 +77,24 @@
}
});
- editorDialog.setTitle("Continuous Mapping
Editor: Mapping for " + mapping.getVisualProperty().getDisplayName());
+ editorDialog.setTitle("Continuous Mapping
Editor for " + mapping.getVisualProperty().getDisplayName());
editorDialog.setLocationRelativeTo(editor);
editorDialog.setAlwaysOnTop(true);
- editorDialog.setModal(true);
editorDialog.setVisible(true);
isEditorDialogActive = true;
}
private void initComponents(final JDialog dialog) {
- editorPanel.setBackground(Color.red);
dialog.setLayout(new BorderLayout());
dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
dialog.getContentPane().add(editorPanel,
BorderLayout.CENTER);
dialog.setPreferredSize(DEF_SIZE);
dialog.setMinimumSize(MIN_SIZE);
-
- dialog.pack();
- }
+
+ dialog.pack();
+ }
});
}
@@ -116,5 +113,4 @@
@Override public Object getValue() {
return mapping;
}
-
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/C2CMappingEditor.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -34,6 +34,7 @@
*/
package org.cytoscape.view.vizmap.gui.internal.editor.mappingeditor;
+import java.awt.Color;
import java.awt.event.ActionEvent;
import java.beans.PropertyChangeEvent;
@@ -60,7 +61,7 @@
*
*/
public class C2CMappingEditor<V extends Number> extends
ContinuousMappingEditorPanel<Double, V> {
-
+
private final static long serialVersionUID = 1213748836613718L;
// Default value for below and above.
@@ -69,17 +70,16 @@
private final V FIRST_LOCATION = (V) new Double(10f);
private final V SECOND_LOCATION = (V) new Double(30f);
-
- public C2CMappingEditor(
- final VisualStyle style,
- final ContinuousMapping<Double, V> mapping, final
CyTable attr,
+ private SpinnerNumberModel propertySpinnerModel;
+
+
+ public C2CMappingEditor(final VisualStyle style, final
ContinuousMapping<Double, V> mapping, final CyTable attr,
final CyApplicationManager appManager, final
VisualMappingManager vmm) {
super(style, mapping, attr, appManager, vmm);
abovePanel.setVisible(false);
belowPanel.setVisible(false);
- // FIXME
setSlider();
// Add two sliders by default.
@@ -87,11 +87,10 @@
addSlider(0d, FIRST_LOCATION);
addSlider(100d, SECOND_LOCATION);
}
-
+
setPropertySpinner();
}
-
public ImageIcon getIcon(final int iconWidth, final int iconHeight) {
final TrackRenderer rend = slider.getTrackRenderer();
@@ -99,18 +98,15 @@
if (rend instanceof ContinuousTrackRenderer) {
rend.getRendererComponent(slider);
- return ((ContinuousTrackRenderer<Double, V>) rend)
- .getTrackGraphicIcon(iconWidth,
iconHeight);
+ return ((ContinuousTrackRenderer<Double, V>)
rend).getTrackGraphicIcon(iconWidth, iconHeight);
} else {
return null;
}
}
-
public ImageIcon getLegend(final int width, final int height) {
- final ContinuousTrackRenderer<Double, V> rend =
(ContinuousTrackRenderer<Double, V>) slider
- .getTrackRenderer();
+ final ContinuousTrackRenderer<Double, V> rend =
(ContinuousTrackRenderer<Double, V>) slider.getTrackRenderer();
rend.getRendererComponent(slider);
return rend.getLegend(width, height);
@@ -145,13 +141,11 @@
final Double newVal = maxValue;
// Pick Up first point.
- final ContinuousMappingPoint<Double, V> previousPoint = mapping
- .getPoint(mapping.getPointCount() - 1);
+ final ContinuousMappingPoint<Double, V> previousPoint =
mapping.getPoint(mapping.getPointCount() - 1);
final BoundaryRangeValues<V> previousRange =
previousPoint.getRange();
- V lesserVal = slider.getModel().getSortedThumbs()
- .get(slider.getModel().getThumbCount() -
1).getObject();
+ V lesserVal =
slider.getModel().getSortedThumbs().get(slider.getModel().getThumbCount() -
1).getObject();
V equalVal = FIVE;
V greaterVal = previousRange.greaterValue;
@@ -181,8 +175,7 @@
mapping.removePoint(selectedIndex);
updateMap();
- ((ContinuousTrackRenderer) slider.getTrackRenderer())
- .removeSquare(selectedIndex);
+ ((ContinuousTrackRenderer)
slider.getTrackRenderer()).removeSquare(selectedIndex);
style.apply(appManager.getCurrentNetworkView());
appManager.getCurrentNetworkView().updateView();
@@ -191,7 +184,7 @@
}
private void setSlider() {
-
+
slider.updateUI();
final double minValue = tracer.getMin(type);
@@ -206,8 +199,7 @@
for (ContinuousMappingPoint<Double, V> point : allPoints) {
bound = point.getRange();
- fraction = ((Number) ((point.getValue() - minValue) /
actualRange))
- .floatValue() * 100d;
+ fraction = ((Number) ((point.getValue() - minValue) /
actualRange)).floatValue() * 100d;
slider.getModel().addThumb(fraction.floatValue(),
bound.equalValue);
}
@@ -224,8 +216,8 @@
*/
TriangleThumbRenderer thumbRend = new TriangleThumbRenderer();
- ContinuousTrackRenderer<Double, V> cRend = new
ContinuousTrackRenderer<Double, V>(
- style, mapping, below, above, tracer,
appManager);
+ ContinuousTrackRenderer<Double, V> cRend = new
ContinuousTrackRenderer<Double, V>(style, mapping, below, above,
+ tracer, appManager);
cRend.addPropertyChangeListener(this);
slider.setThumbRenderer(thumbRend);
@@ -233,13 +225,10 @@
slider.addMouseListener(new ThumbMouseListener());
}
-
public void propertyChange(PropertyChangeEvent evt) {
- if (evt.getPropertyName().equals(
-
ContinuousMappingEditorPanel.BELOW_VALUE_CHANGED)) {
+ if
(evt.getPropertyName().equals(ContinuousMappingEditorPanel.BELOW_VALUE_CHANGED))
{
below = (V) evt.getNewValue();
- } else if (evt.getPropertyName().equals(
-
ContinuousMappingEditorPanel.ABOVE_VALUE_CHANGED)) {
+ } else if
(evt.getPropertyName().equals(ContinuousMappingEditorPanel.ABOVE_VALUE_CHANGED))
{
above = (V) evt.getNewValue();
}
}
@@ -251,40 +240,39 @@
if (rend instanceof ContinuousTrackRenderer) {
rend.getRendererComponent(slider);
- return ((ContinuousTrackRenderer<Double, V>) rend)
- .getTrackGraphicIcon(iconWidth,
iconHeight);
+ return ((ContinuousTrackRenderer<Double, V>)
rend).getTrackGraphicIcon(iconWidth, iconHeight);
} else {
return null;
}
}
+
-
private void setPropertySpinner() {
SpinnerNumberModel propertySpinnerModel = new
SpinnerNumberModel(0.0d, Float.NEGATIVE_INFINITY,
Float.POSITIVE_INFINITY, 0.01d);
- propertySpinnerModel.addChangeListener(new
PropertySpinnerChangeListener(propertySpinnerModel));
+ propertySpinnerModel.addChangeListener(new
PropertyValueSpinnerChangeListener(propertySpinnerModel));
propertySpinner.setModel(propertySpinnerModel);
}
-
- private final class PropertySpinnerChangeListener implements
ChangeListener {
-
+
+ private final class PropertyValueSpinnerChangeListener implements
ChangeListener {
+
private final SpinnerNumberModel spinnerModel;
- public PropertySpinnerChangeListener(final SpinnerNumberModel
model) {
+ public PropertyValueSpinnerChangeListener(SpinnerNumberModel
model) {
this.spinnerModel = model;
}
public void stateChanged(ChangeEvent e) {
-// final Float newVal = new
Float(spinnerModel.getNumber().doubleValue());
-// final int selectedIndex = slider.getSelectedIndex();
-// ContinuousTrackRenderer trackRenderer =
(ContinuousTrackRenderer)slider.getTrackRenderer();
-// trackRenderer.setSelectedIndex(selectedIndex);
-//
-// trackRenderer.setSelectedValue(newVal);
-//
-// slider.repaint();
-// repaint();
-// updateCytoscape();
+
+ final Float newVal =
spinnerModel.getNumber().floatValue();
+ final int selectedIndex = slider.getSelectedIndex();
+
+
slider.getModel().getThumbAt(selectedIndex).setObject((V) newVal);
+
+ updateMap();
+ style.apply(appManager.getCurrentNetworkView());
+ appManager.getCurrentNetworkView().updateView();
+ slider.repaint();
}
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/ContinuousMappingEditorPanel.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -42,6 +42,8 @@
import java.beans.PropertyChangeListener;
import java.util.List;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
import javax.swing.GroupLayout;
import javax.swing.Icon;
import javax.swing.ImageIcon;
@@ -87,8 +89,10 @@
protected static final Color BACKGROUND = Color.WHITE;
private static final Dimension BUTTON_SIZE = new Dimension(120, 1);
- private static final Dimension SPINNER_SIZE = new Dimension(120, 1);
+ private static final Dimension SPINNER_SIZE = new Dimension(100, 25);
private static final Dimension EDITOR_SIZE = new Dimension(850, 350);
+
+ private static final Font SMALL_FONT = new Font("SansSerif", 1, 10);
protected static final String BELOW_VALUE_CHANGED =
"BELOW_VALUE_CHANGED";
protected static final String ABOVE_VALUE_CHANGED =
"ABOVE_VALUE_CHANGED";
@@ -174,13 +178,18 @@
// <editor-fold defaultstate="collapsed" desc=" Generated Code ">
private void initComponents() {
+ // Add margin
+ this.setOpaque(true);
+ this.setBackground(BACKGROUND);
+ this.setBorder(BorderFactory.createLineBorder(BACKGROUND, 5));
+
this.setSize(EDITOR_SIZE);
this.setMinimumSize(EDITOR_SIZE);
this.setPreferredSize(EDITOR_SIZE);
mainPanel.setBackground(BACKGROUND);
- this.setBackground(BACKGROUND);
+
abovePanel = new BelowAndAbovePanel(this, Color.yellow, false,
mapping);
abovePanel.setName("abovePanel");
belowPanel = new BelowAndAbovePanel(this, Color.white, true,
mapping);
@@ -189,7 +198,7 @@
belowPanel.setPreferredSize(new Dimension(20, 1));
rangeSettingPanel = new javax.swing.JPanel();
- pivotLabel = new javax.swing.JLabel();
+ handlePositionSpinnerLabel = new JLabel();
addButton = new javax.swing.JButton();
deleteButton = new javax.swing.JButton();
@@ -200,36 +209,20 @@
okButton = new JButton();
cancelButton = new JButton();
- rangeEditorPanel = new javax.swing.JPanel();
-
slider = new JXMultiThumbSlider<V>();
attrNameLabel = new javax.swing.JLabel();
iconPanel = new YValueLegendPanel(type);
- visualPropertyLabel = new javax.swing.JLabel();
- this.visualPropertyLabel.setText("Visual Property: " +
type.getDisplayName());
-
+ iconPanel.setBackground(BACKGROUND);
+
+ handlePositionSpinnerLabel.setFont(SMALL_FONT);
+ handlePositionSpinnerLabel.setText("Selected Handle Position:");
valueSpinner = new JSpinner();
valueSpinner.setPreferredSize(SPINNER_SIZE);
+ valueSpinner.setMaximumSize(SPINNER_SIZE);
valueSpinner.setEnabled(false);
- rotaryEncoder = new JXMultiThumbSlider<V>();
-
iconPanel.setPreferredSize(new Dimension(25, 1));
-
-
mainPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
- "Continuous Mapping for " +
type.getDisplayName(),
-
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
-
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", Font.BOLD, 12),
- new java.awt.Color(0, 0, 0)));
-
-
rangeSettingPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Range Setting",
-
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
-
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 10),
- new java.awt.Color(0, 0, 0)));
- pivotLabel.setFont(new java.awt.Font("SansSerif", 1, 12));
- pivotLabel.setForeground(java.awt.Color.darkGray);
- pivotLabel.setText("Pivot:");
-
+
addButton.setText("Add");
addButton.setPreferredSize(BUTTON_SIZE);
addButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
@@ -278,13 +271,25 @@
}
});
+
+ // Property value editor components
+ final JPanel propValuePanel = new JPanel();
+ propValuePanel.setBorder(BorderFactory.createEmptyBorder(5, 5,
5, 5));
+ propValuePanel.setPreferredSize(new Dimension(400, 40));
+ propValuePanel.setLayout(new BoxLayout(propValuePanel,
BoxLayout.X_AXIS));
+ propValuePanel.setBackground(BACKGROUND);
+ rangeSettingPanel.setBackground(BACKGROUND);
+
final Class<V> vpValueType = type.getRange().getType();
+ propertyLabel = new JLabel();
+ propertyLabel.setFont(SMALL_FONT);
if (Number.class.isAssignableFrom(vpValueType)) {
propertySpinner = new JSpinner();
propertySpinner.setPreferredSize(SPINNER_SIZE);
+ propertySpinner.setMaximumSize(SPINNER_SIZE);
propertySpinner.setEnabled(false);
propertyComponent = propertySpinner;
- propertyLabel = new JLabel(type.getDisplayName());
+ propertyLabel.setText(type.getDisplayName());
propertyLabel.setLabelFor(propertyComponent);
} else if (Paint.class.isAssignableFrom(vpValueType)) {
// We use the colorButton for both discrete and color
@@ -293,14 +298,26 @@
colorButton.setMargin(new Insets(2, 2, 2, 2));
colorButton.setEnabled(false);
propertyComponent = colorButton;
- propertyLabel = new JLabel(type.getDisplayName());
+ propertyLabel.setText(type.getDisplayName());
propertyLabel.setLabelFor(propertyComponent);
} else {
propertyComponent = new JLabel();
- propertyLabel = new JLabel("Double-click on icon to
change " + type.getDisplayName());
+ propertyLabel.setText("Double-click on icon to change "
+ type.getDisplayName());
}
-
+
+ propValuePanel.add(propertyLabel);
+ propValuePanel.add(propertyComponent);
+
+ final JPanel editorPanel = new JPanel();
+ editorPanel.setLayout(new BorderLayout());
+ editorPanel.setBorder(BorderFactory.createTitledBorder(null,
"Edit Handle Positions and Values",
+
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
+
javax.swing.border.TitledBorder.DEFAULT_POSITION, SMALL_FONT,
+ new java.awt.Color(0, 0, 0)));
+ editorPanel.setBackground(BACKGROUND);
+
final JPanel buttonPanel = new JPanel();
+ buttonPanel.setBackground(BACKGROUND);
GroupLayout buttonPanelLayout = new GroupLayout(buttonPanel);
buttonPanel.setLayout(buttonPanelLayout);
buttonPanelLayout.setHorizontalGroup(buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -319,12 +336,7 @@
buttonPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
.addComponent(okButton).addComponent(cancelButton)).addContainerGap()));
-
rangeEditorPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null,
"Range Editor",
-
javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION,
-
javax.swing.border.TitledBorder.DEFAULT_POSITION, new
java.awt.Font("SansSerif", 1, 10),
- new java.awt.Color(0, 0, 0)));
slider.setMaximumValue(100.0F);
- rotaryEncoder.setMaximumValue(100.0F);
GroupLayout sliderLayout = new GroupLayout(slider);
slider.setLayout(sliderLayout);
@@ -337,39 +349,33 @@
attrNameLabel.setForeground(java.awt.Color.darkGray);
attrNameLabel.setText("Attribute Name");
- GroupLayout jXMultiThumbSlider1Layout = new
GroupLayout(rotaryEncoder);
- rotaryEncoder.setLayout(jXMultiThumbSlider1Layout);
-
jXMultiThumbSlider1Layout.setHorizontalGroup(jXMultiThumbSlider1Layout.createParallelGroup(
- GroupLayout.Alignment.LEADING).addGap(0, 84,
Short.MAX_VALUE));
-
jXMultiThumbSlider1Layout.setVerticalGroup(jXMultiThumbSlider1Layout.createParallelGroup(
- GroupLayout.Alignment.LEADING).addGap(0, 65,
Short.MAX_VALUE));
-
- visualPropertyLabel.setFont(new java.awt.Font("SansSerif", 1,
14));
- visualPropertyLabel.setForeground(java.awt.Color.darkGray);
-
GroupLayout rangeSettingPanelLayout = new
GroupLayout(rangeSettingPanel);
rangeSettingPanel.setLayout(rangeSettingPanelLayout);
rangeSettingPanelLayout.setHorizontalGroup(rangeSettingPanelLayout.createParallelGroup(
GroupLayout.Alignment.LEADING).addGroup(
-
rangeSettingPanelLayout.createSequentialGroup().addContainerGap().addComponent(valueSpinner)
-
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(propertyLabel)
-
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(propertyComponent)
-
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 200, Short.MAX_VALUE)
+
rangeSettingPanelLayout.createSequentialGroup().addContainerGap()
+
.addComponent(handlePositionSpinnerLabel)
+
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED).addComponent(valueSpinner)
+
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED, 50, Short.MAX_VALUE)
.addComponent(minMaxButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addComponent(addButton).addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
.addComponent(deleteButton).addGap(10, 10, 10)));
rangeSettingPanelLayout.setVerticalGroup(rangeSettingPanelLayout.createParallelGroup(
GroupLayout.Alignment.LEADING).addGroup(
-
rangeSettingPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE).addComponent(valueSpinner)
-
.addComponent(propertyLabel).addComponent(propertyComponent).addComponent(minMaxButton)
+
rangeSettingPanelLayout.createParallelGroup(GroupLayout.Alignment.BASELINE)
+
.addComponent(handlePositionSpinnerLabel).addComponent(valueSpinner)
+ .addComponent(minMaxButton)
.addComponent(deleteButton).addComponent(addButton)));
+ editorPanel.add(rangeSettingPanel, BorderLayout.CENTER);
+ editorPanel.add(propValuePanel, BorderLayout.SOUTH);
+
GroupLayout layout = new GroupLayout(mainPanel);
mainPanel.setLayout(layout);
layout.setHorizontalGroup(layout
.createParallelGroup(GroupLayout.Alignment.LEADING)
- .addComponent(rangeSettingPanel,
GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(editorPanel,
GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(
layout.createSequentialGroup()
.addComponent(iconPanel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
@@ -392,7 +398,7 @@
.addComponent(abovePanel, GroupLayout.Alignment.TRAILING,
GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
.addPreferredGap(LayoutStyle.ComponentPlacement.RELATED)
-
.addComponent(rangeSettingPanel, GroupLayout.PREFERRED_SIZE,
GroupLayout.DEFAULT_SIZE,
+ .addComponent(editorPanel,
GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
GroupLayout.PREFERRED_SIZE)));
// add the main panel to the dialog.
@@ -453,6 +459,7 @@
// Variables declaration - do not modify
private JLabel attrNameLabel;
+ private JLabel handlePositionSpinnerLabel;
protected JButton addButton;
protected JButton colorButton;
@@ -463,13 +470,9 @@
protected JButton okButton;
protected javax.swing.JPanel iconPanel;
- private javax.swing.JLabel pivotLabel;
- private javax.swing.JPanel rangeEditorPanel;
private javax.swing.JPanel rangeSettingPanel;
protected JXMultiThumbSlider<V> slider;
protected JSpinner valueSpinner;
- private JLabel visualPropertyLabel;
- protected JXMultiThumbSlider<V> rotaryEncoder;
protected JSpinner propertySpinner;
private JLabel propertyLabel;
@@ -561,7 +564,7 @@
if (Number.class.isAssignableFrom(vpValueType)) {
propertySpinner.setEnabled(true);
- final BoundaryRangeValues<V> rg =
mapping.getPoint(selectedIndex - 1).getRange();
+ final BoundaryRangeValues<V> rg =
mapping.getPoint(selectedIndex).getRange();
propertySpinner.setValue(rg.equalValue);
} else if (Paint.class.isAssignableFrom(vpValueType)) {
colorButton.setEnabled(true);
@@ -624,8 +627,11 @@
}
}
- class SpinnerChangeListener implements ChangeListener {
+ private final class SpinnerChangeListener implements ChangeListener {
+
+ @Override
public void stateChanged(ChangeEvent e) {
+
Number newVal = spinnerModel.getNumber();
int selectedIndex = slider.getSelectedIndex();
@@ -636,11 +642,10 @@
} else {
spinnerModel.setValue(0);
}
-
return;
}
- Double newPosition = ((newVal.floatValue() -
tracer.getMin(type)) / tracer.getRange(type));
+ final Double newPosition =
((newVal.floatValue() - tracer.getMin(type)) / tracer.getRange(type));
slider.getModel().getThumbAt(selectedIndex).setPosition(newPosition.floatValue()
* 100);
slider.getSelectedThumb().setLocation((int)
((slider.getSize().width - 12) * newPosition), 0);
@@ -650,6 +655,9 @@
slider.getParent().repaint();
slider.repaint();
lastSpinnerNumber = newVal.doubleValue();
+
+ final CyNetworkView curView =
appManager.getCurrentNetworkView();
+ curView.updateView();
}
}
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/GradientEditorPanel.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -43,7 +43,6 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.List;
-import java.util.SortedSet;
import javax.swing.ImageIcon;
import javax.swing.JComponent;
@@ -134,7 +133,6 @@
protected void addButtonActionPerformed(ActionEvent evt) {
final BoundaryRangeValues<Color> lowerRange;
-
double maxValue = tracer.getMax(type);
// Currently, there is no mapping.
@@ -165,7 +163,7 @@
}
// Add a new white thumb in the min.
- slider.getModel().addThumb(100f, Color.white);
+ slider.getModel().addThumb(70f, Color.white);
// Pick Up first point.
final ContinuousMappingPoint<Double, Color> previousPoint =
mapping.getPoint(mapping.getPointCount() - 1);
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/YValueLegendPanel.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/YValueLegendPanel.java
2012-01-19 01:00:49 UTC (rev 28048)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/mappingeditor/YValueLegendPanel.java
2012-01-19 20:18:03 UTC (rev 28049)
@@ -71,11 +71,7 @@
this.setPreferredSize(new Dimension());
}
- /**
- * DOCUMENT ME!
- *
- * @param g DOCUMENT ME!
- */
+ @Override
public void paintComponent(Graphics g) {
clear(g);
--
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.
