Author: kono
Date: 2010-02-01 13:41:06 -0800 (Mon, 01 Feb 2010)
New Revision: 19097
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/EditorDisplayer.java
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2DMappingEditor.java
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/GradientEditorPanel.java
Log:
Fixed bug 2027: on the Mac, Vizmapper Gradient Editor does not show labels on
"Min/Max" and "Add" buttons. Also, tweaked panel sizes.
Modified: cytoscape/trunk/src/cytoscape/visual/ui/EditorDisplayer.java
===================================================================
--- cytoscape/trunk/src/cytoscape/visual/ui/EditorDisplayer.java
2010-02-01 20:17:58 UTC (rev 19096)
+++ cytoscape/trunk/src/cytoscape/visual/ui/EditorDisplayer.java
2010-02-01 21:41:06 UTC (rev 19097)
@@ -101,14 +101,14 @@
new Object[] { Cytoscape.getDesktop(), null },
LabelPosition.class),
CONTINUOUS_COLOR(GradientEditorPanel.class, "showDialog",
new Class[] { int.class, int.class, String.class,
VisualPropertyType.class },
- new Object[] { 450, 180, "Gradient Editor", null },
Color.class),
+ new Object[] { 420, 250, "Gradient Editor", null },
Color.class),
CONTINUOUS_CONTINUOUS(C2CMappingEditor.class, "showDialog",
new Class[] { int.class, int.class, String.class,
VisualPropertyType.class },
- new Object[] { 450, 250, "Continuous-Continuous
Editor", null },
+ new Object[] { 420, 250, "Continuous-Continuous
Editor", null },
Number.class),
CONTINUOUS_DISCRETE(C2DMappingEditor.class, "showDialog",
new Class[] { int.class, int.class, String.class,
VisualPropertyType.class },
- new Object[] { 450, 200, "Continuous-Discrete
Editor", null }, Object.class);
+ new Object[] { 420, 250, "Continuous-Discrete
Editor", null }, Object.class);
private Class chooserClass;
private String command;
private Class[] paramTypes;
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
2010-02-01 20:17:58 UTC (rev 19096)
+++
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2CMappingEditor.java
2010-02-01 21:41:06 UTC (rev 19097)
@@ -65,6 +65,9 @@
*
*/
public class C2CMappingEditor extends ContinuousMappingEditorPanel {
+
+ private static final long serialVersionUID = -3555354576428996187L;
+
// Default value for below and above.
private static final Float DEF_BELOW_AND_ABOVE = 1f;
@@ -96,9 +99,12 @@
* @param type DOCUMENT ME!
*/
public static Object showDialog(final int width, final int height,
final String title,
- VisualPropertyType type) {
+ final VisualPropertyType type) {
editor = new C2CMappingEditor(type);
- editor.setSize(new Dimension(width, height));
+ final Dimension size = new Dimension(width, height);
+ editor.setPreferredSize(size);
+ editor.setSize(size);
+
editor.setTitle(title);
editor.setAlwaysOnTop(true);
editor.setLocationRelativeTo(Cytoscape.getDesktop());
@@ -219,10 +225,6 @@
}
private void setSlider() {
- Dimension dim = new Dimension(600, 100);
- setPreferredSize(dim);
- setSize(dim);
- setMinimumSize(new Dimension(300, 80));
slider.updateUI();
final double minValue =
EditorValueRangeTracer.getTracer().getMin(type);
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2DMappingEditor.java
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2DMappingEditor.java
2010-02-01 20:17:58 UTC (rev 19096)
+++
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/C2DMappingEditor.java
2010-02-01 21:41:06 UTC (rev 19097)
@@ -66,6 +66,11 @@
*/
public class C2DMappingEditor extends ContinuousMappingEditorPanel {
/**
+ *
+ */
+ private static final long serialVersionUID = 2146889489175240626L;
+
+ /**
* Creates a new C2DMappingEditor object.
*
* @param type DOCUMENT ME!
@@ -91,7 +96,11 @@
public static Object showDialog(final int width, final int height,
final String title,
VisualPropertyType type) {
editor = new C2DMappingEditor(type);
- editor.setSize(new Dimension(width, height));
+
+ final Dimension size = new Dimension(width, height);
+ editor.setPreferredSize(size);
+ editor.setSize(size);
+
editor.setTitle(title);
editor.setAlwaysOnTop(true);
editor.setLocationRelativeTo(Cytoscape.getDesktop());
@@ -249,10 +258,6 @@
}
private void setSlider() {
- Dimension dim = new Dimension(600, 100);
- setPreferredSize(dim);
- setSize(dim);
- setMinimumSize(new Dimension(300, 80));
slider.updateUI();
final double minValue =
EditorValueRangeTracer.getTracer().getMin(type);
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
2010-02-01 20:17:58 UTC (rev 19096)
+++
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/ContinuousMappingEditorPanel.java
2010-02-01 21:41:06 UTC (rev 19097)
@@ -86,6 +86,9 @@
* @author kono
*/
public abstract class ContinuousMappingEditorPanel extends JDialog implements
PropertyChangeListener {
+
+ private static final long serialVersionUID = -2558647616344119220L;
+
// Tell vizMapper main whic editor is disabled/enabled.
/**
* DOCUMENT ME!
@@ -109,7 +112,9 @@
private SpinnerNumberModel spinnerModel;
protected Object below;
protected Object above;
+
protected static ContinuousMappingEditorPanel editor;
+
protected double lastSpinnerNumber = 0;
/** Creates new form ContinuousMapperEditorPanel */
@@ -231,6 +236,7 @@
pivotLabel.setText("Pivot:");
addButton.setText("Add");
+ addButton.setPreferredSize(new Dimension(100, 10));
addButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
addButton.addActionListener(new java.awt.event.ActionListener()
{
public void
actionPerformed(java.awt.event.ActionEvent evt) {
@@ -239,6 +245,7 @@
});
deleteButton.setText("Delete");
+ deleteButton.setPreferredSize(new Dimension(100, 10));
deleteButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
deleteButton.addActionListener(new
java.awt.event.ActionListener() {
public void
actionPerformed(java.awt.event.ActionEvent evt) {
@@ -248,6 +255,7 @@
// New in 2.6
minMaxButton.setText("Min/Max");
+ minMaxButton.setPreferredSize(new Dimension(100, 10));
minMaxButton.setMargin(new java.awt.Insets(2, 2, 2, 2));
minMaxButton.addActionListener(new
java.awt.event.ActionListener() {
public void
actionPerformed(java.awt.event.ActionEvent evt) {
@@ -305,12 +313,12 @@
Short.MAX_VALUE)
.add(minMaxButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
62,
+
100,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(addButton,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
55,
+
100,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(deleteButton)
@@ -325,10 +333,7 @@
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.add(minMaxButton)
.add(deleteButton)
-
.add(addButton,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)));
+
.add(addButton)));
org.jdesktop.layout.GroupLayout layout = new
org.jdesktop.layout.GroupLayout(mainPanel);
mainPanel.setLayout(layout);
@@ -494,8 +499,8 @@
protected BelowAndAbovePanel belowPanel;
protected int getSelectedPoint(int selectedIndex) {
- final List<Thumb> thumbs = slider.getModel().getSortedThumbs();
- Thumb selected = slider.getModel().getThumbAt(selectedIndex);
+ final List<Thumb<?>> thumbs =
slider.getModel().getSortedThumbs();
+ Thumb<?> selected = slider.getModel().getThumbAt(selectedIndex);
int i;
for (i = 0; i < thumbs.size(); i++) {
Modified:
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/GradientEditorPanel.java
===================================================================
---
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/GradientEditorPanel.java
2010-02-01 20:17:58 UTC (rev 19096)
+++
cytoscape/trunk/src/cytoscape/visual/ui/editors/continuous/GradientEditorPanel.java
2010-02-01 21:41:06 UTC (rev 19097)
@@ -69,6 +69,9 @@
*/
public class GradientEditorPanel extends ContinuousMappingEditorPanel
implements PropertyChangeListener {
+
+ private static final long serialVersionUID = -7645303507318540305L;
+
// For presets
private static final Color DEF_LOWER_COLOR = Color.BLACK;
private static final Color DEF_UPPER_COLOR = Color.WHITE;
@@ -101,13 +104,18 @@
public static Object showDialog(final int width, final int height,
final String title,
VisualPropertyType type) {
editor = new GradientEditorPanel(type);
- editor.setSize(new Dimension(width, height));
+
+ final Dimension size = new Dimension(width, height);
+ editor.slider.setPreferredSize(size);
+ editor.setPreferredSize(size);
+
editor.setTitle(title);
editor.setAlwaysOnTop(true);
editor.setLocationRelativeTo(Cytoscape.getDesktop());
+ editor.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
+
editor.setVisible(true);
- editor.repaint();
-
+
return editor;
}
@@ -253,14 +261,8 @@
/**
* DOCUMENT ME!
*/
- public void initSlider() {
- Dimension dim = new Dimension(600, 100);
- setPreferredSize(dim);
- setSize(dim);
- setMinimumSize(new Dimension(300, 80));
+ private void initSlider() {
slider.updateUI();
-
- // slider.setComponentPopupMenu(menu);
slider.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if
(SwingUtilities.isRightMouseButton(e)) {
--
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.
