X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=88098a9f17fdfe840dd87320d4d190107d40c65a;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=4f1ac38937587f954412aa42f89a36ecdb19a288;hpb=fa831484132498a5c7f9092a2066a730cbbd16ec;p=jalview.git
diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java
old mode 100755
new mode 100644
index 4f1ac38..88098a9
--- a/src/jalview/appletgui/UserDefinedColours.java
+++ b/src/jalview/appletgui/UserDefinedColours.java
@@ -1,33 +1,57 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
-import jalview.schemes.*;
+import jalview.api.FeatureColourI;
+import jalview.datamodel.SequenceGroup;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.FeatureColour;
+import jalview.schemes.ResidueProperties;
+import jalview.schemes.UserColourScheme;
+import jalview.util.MessageManager;
+
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dialog;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Rectangle;
+import java.awt.Scrollbar;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseEvent;
+import java.util.Vector;
public class UserDefinedColours extends Panel implements ActionListener,
- AdjustmentListener
+ AdjustmentListener, FocusListener
{
AlignmentPanel ap;
@@ -36,7 +60,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
Button selectedButton;
- Vector oldColours = new Vector();
+ Vector oldColours = new Vector();
ColourSchemeI oldColourScheme;
@@ -52,7 +76,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
String originalLabel;
- Color originalColour;
+ FeatureColourI originalColour;
int R = 0, G = 0, B = 0;
@@ -94,37 +118,71 @@ public class UserDefinedColours extends Panel implements ActionListener,
public UserDefinedColours(FeatureRenderer fr, Frame alignframe)
{
caller = fr;
- originalColour = fr.colourPanel.getBackground();
+ originalColour = new FeatureColour(fr.colourPanel.getBackground());
originalLabel = "Feature Colour";
setForDialog("Select Feature Colour", alignframe);
setTargetColour(fr.colourPanel.getBackground());
dialog.setVisible(true);
}
+
public UserDefinedColours(Component caller, Color col1, Frame alignframe)
{
this(caller, col1, alignframe, "Select Colour");
}
+
/**
* Makes a dialog to choose the colour
- * @param caller - handles events
- * @param col1 - original colour
- * @param alignframe - the parent Frame for the dialog
- * @param title - window title
+ *
+ * @param caller
+ * - handles events
+ * @param col
+ * - original colour
+ * @param alignframe
+ * - the parent Frame for the dialog
+ * @param title
+ * - window title
*/
- public UserDefinedColours(Component caller, Color col1, Frame alignframe, String title)
+ public UserDefinedColours(Component caller, Color col, Frame alignframe,
+ String title)
{
this.caller = caller;
- originalColour = col1;
+ originalColour = new FeatureColour(col);
originalLabel = title;
setForDialog(title, alignframe);
- setTargetColour(col1);
+ setTargetColour(col);
dialog.setVisible(true);
}
+ /**
+ * feature colour chooser
+ *
+ * @param caller
+ * @param label
+ * @param colour
+ */
public UserDefinedColours(Object caller, String label, Color colour)
{
+ this(caller, label, new FeatureColour(colour), colour);
+ }
+
+ /**
+ * feature colour chooser when changing style to single color
+ *
+ * @param me
+ * @param type
+ * @param graduatedColor
+ */
+ public UserDefinedColours(FeatureSettings me, String type,
+ FeatureColourI graduatedColor)
+ {
+ this(me, type, graduatedColor, graduatedColor.getMaxColour());
+ }
+
+ private UserDefinedColours(Object caller, String label,
+ FeatureColourI ocolour, Color colour)
+ {
this.caller = caller;
- originalColour = colour;
+ originalColour = ocolour;
originalLabel = label;
init();
remove(buttonPanel);
@@ -132,10 +190,11 @@ public class UserDefinedColours extends Panel implements ActionListener,
setTargetColour(colour);
okcancelPanel.setBounds(new Rectangle(0, 113, 400, 35));
- frame.setTitle("User Defined Colours - " + label);
+ frame.setTitle(MessageManager.getString("label.user_defined_colours")
+ + " - " + label);
frame.setSize(420, 200);
- }
-
+ }
+
void setForDialog(String title, Container alignframe)
{
init();
@@ -143,14 +202,17 @@ public class UserDefinedColours extends Panel implements ActionListener,
remove(buttonPanel);
if (alignframe instanceof Frame)
{
- dialog = new Dialog((Frame)alignframe, title, true);
+ dialog = new Dialog((Frame) alignframe, title, true);
}
- else {
-// if (alignframe instanceof JVDialog){
-// // not 1.1 compatible!
-// dialog = new Dialog(((JVDialog)alignframe), title, true);
-// } else {
- throw new Error("Unsupported owner for User Colour scheme dialog.");
+ else
+ {
+ // if (alignframe instanceof JVDialog){
+ // // not 1.1 compatible!
+ // dialog = new Dialog(((JVDialog)alignframe), title, true);
+ // } else {
+ throw new Error(
+ MessageManager
+ .getString("label.error_unsupported_owwner_user_colour_scheme"));
}
dialog.add(this);
@@ -160,40 +222,44 @@ public class UserDefinedColours extends Panel implements ActionListener,
int width = 400;
dialog.setBounds(alignframe.getBounds().x
- + (alignframe.getSize().width - width) / 2, alignframe
- .getBounds().y
- + (alignframe.getSize().height - height) / 2, width, height);
+ + (alignframe.getSize().width - width) / 2,
+ alignframe.getBounds().y
+ + (alignframe.getSize().height - height) / 2, width,
+ height);
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
- if (evt.getSource() == okButton)
+ final Object source = evt.getSource();
+ if (source == okButton)
{
okButton_actionPerformed();
}
- else if (evt.getSource() == applyButton)
+ else if (source == applyButton)
{
applyButton_actionPerformed();
}
- else if (evt.getSource() == cancelButton)
+ else if (source == cancelButton)
{
cancelButton_actionPerformed();
}
- else if (evt.getSource() == rText)
+ else if (source == rText)
{
rText_actionPerformed();
}
- else if (evt.getSource() == gText)
+ else if (source == gText)
{
gText_actionPerformed();
}
- else if (evt.getSource() == bText)
+ else if (source == bText)
{
bText_actionPerformed();
}
}
+ @Override
public void adjustmentValueChanged(AdjustmentEvent evt)
{
if (evt.getSource() == rScroller)
@@ -221,7 +287,8 @@ public class UserDefinedColours extends Panel implements ActionListener,
}
frame = new Frame();
frame.add(this);
- jalview.bin.JalviewLite.addFrame(frame, "User defined colours", 420,
+ jalview.bin.JalviewLite.addFrame(frame,
+ MessageManager.getString("label.user_defined_colours"), 420,
345);
if (seqGroup != null)
@@ -340,14 +407,14 @@ public class UserDefinedColours extends Panel implements ActionListener,
{
final Button button = new Button();
Color col = Color.white;
- if (oldColourScheme!=null)
+ if (oldColourScheme != null)
{
- try
- {
- col = oldColourScheme.findColour(aa.charAt(0), -1);
- } catch (Exception ex)
- {
- }
+ try
+ {
+ col = oldColourScheme.findColour(aa.charAt(0), -1, null);
+ } catch (Exception ex)
+ {
+ }
}
button.setBackground(col);
oldColours.addElement(col);
@@ -356,6 +423,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
button.setFont(new java.awt.Font("Verdana", 1, 10));
button.addMouseListener(new java.awt.event.MouseAdapter()
{
+ @Override
public void mousePressed(MouseEvent e)
{
colourButtonPressed(e);
@@ -369,7 +437,9 @@ public class UserDefinedColours extends Panel implements ActionListener,
{
applyButton_actionPerformed();
if (dialog != null)
+ {
dialog.setVisible(false);
+ }
frame.setVisible(false);
}
@@ -385,7 +455,8 @@ public class UserDefinedColours extends Panel implements ActionListener,
{
if (caller instanceof FeatureSettings)
{
- ((FeatureSettings) caller).setUserColour(originalLabel, getColor());
+ ((FeatureSettings) caller).setUserColour(originalLabel,
+ new FeatureColour(getColor()));
}
else if (caller instanceof AnnotationColourChooser)
{
@@ -402,15 +473,20 @@ public class UserDefinedColours extends Panel implements ActionListener,
}
else if (caller instanceof FeatureRenderer)
{
- ((FeatureRenderer) caller).colourPanel.updateColor(getColor());
+ ((FeatureRenderer) caller).colourPanel
+ .updateColor(new FeatureColour(getColor()));
}
else if (caller instanceof FeatureColourChooser)
{
- if (originalLabel.indexOf("inimum")>-1)
+ if (originalLabel.indexOf("inimum") > -1)
+ {
+ ((FeatureColourChooser) caller)
+ .minColour_actionPerformed(getColor());
+ }
+ else
{
- ((FeatureColourChooser) caller).minColour_actionPerformed(getColor());
- } else {
- ((FeatureColourChooser) caller).maxColour_actionPerformed(getColor());
+ ((FeatureColourChooser) caller)
+ .maxColour_actionPerformed(getColor());
}
}
@@ -427,7 +503,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
UserColourScheme ucs = new UserColourScheme(newColours);
if (ap != null)
{
- ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
+ ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus());
}
if (ap != null)
@@ -467,12 +543,12 @@ public class UserDefinedColours extends Panel implements ActionListener,
if (originalLabel.equals("Min Colour"))
{
((AnnotationColourChooser) caller)
- .minColour_actionPerformed(originalColour);
+ .minColour_actionPerformed(originalColour.getColour());
}
else
{
((AnnotationColourChooser) caller)
- .maxColour_actionPerformed(originalColour);
+ .maxColour_actionPerformed(originalColour.getColour());
}
}
else if (caller instanceof FeatureRenderer)
@@ -483,15 +559,21 @@ public class UserDefinedColours extends Panel implements ActionListener,
else if (caller instanceof FeatureColourChooser)
{
- if (originalLabel.indexOf("inimum")>-1)
+ if (originalLabel.indexOf("inimum") > -1)
+ {
+ ((FeatureColourChooser) caller)
+ .minColour_actionPerformed(originalColour.getColour());
+ }
+ else
{
- ((FeatureColourChooser) caller).minColour_actionPerformed(originalColour);
- } else {
- ((FeatureColourChooser) caller).maxColour_actionPerformed(originalColour);
+ ((FeatureColourChooser) caller)
+ .maxColour_actionPerformed(originalColour.getColour());
}
}
if (dialog != null)
+ {
dialog.setVisible(false);
+ }
frame.setVisible(false);
return;
@@ -500,7 +582,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
Color[] newColours = new Color[24];
for (int i = 0; i < 24; i++)
{
- newColours[i] = (Color) oldColours.elementAt(i);
+ newColours[i] = oldColours.elementAt(i);
buttonPanel.getComponent(i).setBackground(newColours[i]);
}
@@ -569,13 +651,13 @@ public class UserDefinedColours extends Panel implements ActionListener,
gridLayout.setColumns(6);
gridLayout.setRows(4);
okButton.setFont(new java.awt.Font("Verdana", 0, 11));
- okButton.setLabel("OK");
+ okButton.setLabel(MessageManager.getString("action.ok"));
okButton.addActionListener(this);
applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
- applyButton.setLabel("Apply");
+ applyButton.setLabel(MessageManager.getString("action.apply"));
applyButton.addActionListener(this);
cancelButton.setFont(new java.awt.Font("Verdana", 0, 11));
- cancelButton.setLabel("Cancel");
+ cancelButton.setLabel(MessageManager.getString("action.cancel"));
cancelButton.addActionListener(this);
this.setBackground(new Color(212, 208, 223));
okcancelPanel.setBounds(new Rectangle(0, 265, 400, 35));
@@ -594,6 +676,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
rText.setText("0 ");
rText.setBounds(new Rectangle(156, 27, 53, 19));
rText.addActionListener(this);
+ rText.addFocusListener(this);
label4.setAlignment(Label.RIGHT);
label4.setText("G");
label4.setBounds(new Rectangle(15, 56, 20, 15));
@@ -608,6 +691,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
gText.setText("0 ");
gText.setBounds(new Rectangle(156, 52, 53, 20));
gText.addActionListener(this);
+ gText.addFocusListener(this);
label5.setAlignment(Label.RIGHT);
label5.setText("B");
label5.setBounds(new Rectangle(14, 82, 20, 15));
@@ -622,12 +706,16 @@ public class UserDefinedColours extends Panel implements ActionListener,
bText.setText("0 ");
bText.setBounds(new Rectangle(157, 78, 52, 20));
bText.addActionListener(this);
+ bText.addFocusListener(this);
target.setBackground(Color.black);
target.setBounds(new Rectangle(229, 26, 134, 79));
this.add(okcancelPanel, null);
okcancelPanel.add(okButton, null);
okcancelPanel.add(applyButton, null);
okcancelPanel.add(cancelButton, null);
+ this.add(rText);
+ this.add(gText);
+ this.add(bText);
this.add(buttonPanel, null);
this.add(target, null);
this.add(gScroller);
@@ -636,9 +724,40 @@ public class UserDefinedColours extends Panel implements ActionListener,
this.add(label5);
this.add(label4);
this.add(label1);
- this.add(gText);
- this.add(rText);
- this.add(bText);
+ }
+
+ @Override
+ public void focusGained(FocusEvent e)
+ {
+ // noop
+ }
+
+ /**
+ * This method applies any change to an RGB value if the user tabs out of the
+ * field instead of pressing Enter
+ */
+ @Override
+ public void focusLost(FocusEvent e)
+ {
+ Component c = e.getComponent();
+ if (c == rText)
+ {
+ rText_actionPerformed();
+ }
+ else
+ {
+ if (c == gText)
+ {
+ gText_actionPerformed();
+ }
+ else
+ {
+ if (c == bText)
+ {
+ bText_actionPerformed();
+ }
+ }
+ }
}
}