From 87358521afabb1f5382a1fff5f991149c838b1e2 Mon Sep 17 00:00:00 2001 From: jprocter Date: Wed, 14 Sep 2011 15:08:28 +0100 Subject: [PATCH] JAL-234 - default button to reset min/max colours and debugged dialog layout --- src/jalview/appletgui/AnnotationColourChooser.java | 90 ++++++++++++++------ 1 file changed, 65 insertions(+), 25 deletions(-) diff --git a/src/jalview/appletgui/AnnotationColourChooser.java b/src/jalview/appletgui/AnnotationColourChooser.java index 25e08b0..1e9668a 100755 --- a/src/jalview/appletgui/AnnotationColourChooser.java +++ b/src/jalview/appletgui/AnnotationColourChooser.java @@ -26,6 +26,8 @@ import jalview.datamodel.*; import jalview.schemes.*; import java.awt.Rectangle; +import javax.swing.BoxLayout; + public class AnnotationColourChooser extends Panel implements ActionListener, AdjustmentListener, ItemListener, MouseListener { @@ -82,9 +84,8 @@ public class AnnotationColourChooser extends Panel implements return; } - minColour.setBackground(av.applet.getDefaultColourParameter("ANNOTATIONCOLOUR_MIN",Color.orange)); - maxColour.setBackground(av.applet.getDefaultColourParameter("ANNOTATIONCOLOUR_MAX",Color.red)); - + setDefaultMinMax(); + if (oldcs instanceof AnnotationColourGradient) { AnnotationColourGradient acg = (AnnotationColourGradient) oldcs; @@ -144,11 +145,17 @@ public class AnnotationColourChooser extends Panel implements frame = new Frame(); frame.add(this); - jalview.bin.JalviewLite.addFrame(frame, "Colour by Annotation", 480, - 145); + jalview.bin.JalviewLite.addFrame(frame, "Colour by Annotation", 560, + 175); validate(); } + private void setDefaultMinMax() + { + minColour.setBackground(av.applet.getDefaultColourParameter("ANNOTATIONCOLOUR_MIN",Color.orange)); + maxColour.setBackground(av.applet.getDefaultColourParameter("ANNOTATIONCOLOUR_MAX",Color.red)); + + } public AnnotationColourChooser() { try @@ -177,44 +184,64 @@ public class AnnotationColourChooser extends Panel implements cancel.setLabel("Cancel"); cancel.addActionListener(this); - this.setLayout(borderLayout1); - jPanel2.setLayout(flowLayout1); + defColours.setLabel("Defaults"); + defColours.addActionListener(this); + annotations.addItemListener(this); - jPanel1.setBackground(Color.white); - jPanel2.setBackground(Color.white); - threshold.addItemListener(this); - jPanel3.setLayout(null); thresholdValue.addActionListener(this); - slider.setBackground(Color.white); + slider.setPreferredSize(new Dimension(193,21)); slider.setEnabled(false); - slider.setBounds(new Rectangle(153, 3, 93, 21)); + thresholdValue.setPreferredSize(new Dimension(79,22)); thresholdValue.setEnabled(false); - thresholdValue.setBounds(new Rectangle(248, 2, 79, 22)); thresholdValue.setColumns(5); - jPanel3.setBackground(Color.white); currentColours.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11)); currentColours.setLabel("Use Original Colours"); currentColours.addItemListener(this); - threshold.setBounds(new Rectangle(11, 3, 139, 22)); thresholdIsMin.setBackground(Color.white); thresholdIsMin.setLabel("Threshold is min/max"); - thresholdIsMin.setBounds(new Rectangle(328, 3, 135, 23)); + + this.setLayout(borderLayout1); + + jPanel1.setBackground(Color.white); + + jPanel2.setLayout(new FlowLayout()); + jPanel2.setBackground(Color.white); + threshold.addItemListener(this); + jPanel3.setLayout(new FlowLayout()); + jPanel3.setBackground(Color.white); + Panel jPanel4 = new Panel(); + jPanel4.setLayout(new BorderLayout()); + jPanel4.setBackground(Color.white); + + jPanel1.add(ok); jPanel1.add(cancel); + jPanel2.add(annotations); jPanel2.add(currentColours); jPanel2.add(minColour); jPanel2.add(maxColour); - jPanel3.add(threshold); - jPanel3.add(slider); - jPanel3.add(thresholdValue); - jPanel3.add(thresholdIsMin); - this.add(jPanel2, java.awt.BorderLayout.NORTH); - this.add(jPanel3, java.awt.BorderLayout.CENTER); + + + jPanel4.add(thresholdIsMin, BorderLayout.WEST); + jPanel4.add(slider, BorderLayout.CENTER); + jPanel4.add(thresholdValue, BorderLayout.EAST); + + Panel jPanel34 = new Panel(); + jPanel34.setLayout(new BorderLayout()); + jPanel34.setBackground(Color.white); + jPanel34.add(jPanel2, BorderLayout.NORTH); + jPanel34.add(threshold, BorderLayout.WEST); + jPanel3.add(defColours); + jPanel34.add(jPanel3, BorderLayout.EAST); + jPanel34.add(jPanel4, BorderLayout.SOUTH); + + this.add(jPanel34, java.awt.BorderLayout.CENTER); this.add(jPanel1, java.awt.BorderLayout.SOUTH); + } Choice annotations = new Choice(); @@ -226,6 +253,8 @@ public class AnnotationColourChooser extends Panel implements Button ok = new Button(); Button cancel = new Button(); + + Button defColours = new Button(); Panel jPanel1 = new Panel(); @@ -268,7 +297,10 @@ public class AnnotationColourChooser extends Panel implements { maxColour_actionPerformed(null); } - + else if (evt.getSource() == defColours) + { + defColour_actionPerformed(); + } else if (evt.getSource() == ok) { changeColour(); @@ -348,7 +380,13 @@ public class AnnotationColourChooser extends Panel implements new UserDefinedColours(this, "Max Colour", maxColour.getBackground()); } } - + public void defColour_actionPerformed() + { + setDefaultMinMax(); + minColour.repaint(); + maxColour.repaint(); + changeColour(); + } void changeColour() { // Check if combobox is still adjusting @@ -372,11 +410,13 @@ public class AnnotationColourChooser extends Panel implements slider.setEnabled(true); thresholdValue.setEnabled(true); + thresholdIsMin.setEnabled(true); if (aboveThreshold == AnnotationColourGradient.NO_THRESHOLD) { slider.setEnabled(false); thresholdValue.setEnabled(false); + thresholdIsMin.setEnabled(false); thresholdValue.setText(""); } else if (aboveThreshold != AnnotationColourGradient.NO_THRESHOLD -- 1.7.10.2