X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=73df35f87be67cd73eee873507c31561a7735d78;hb=0899f9541714086b75987a4ba3d35037a6d6224b;hp=5da1fbf33e14afff50138147126b1c56bccfae59;hpb=262352d44a49e6102a9e80b0c006ea9331ed0c67;p=jalview.git diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index 5da1fbf..73df35f 100755 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -1,30 +1,47 @@ /* - * 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 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * - * 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. * - * 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 + * 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 Jalview. If not, see . */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; -import java.awt.event.*; - -import jalview.datamodel.*; -import jalview.schemes.*; +import jalview.datamodel.SequenceGroup; +import jalview.schemes.ColourSchemeI; +import jalview.schemes.GraduatedColor; +import jalview.schemes.ResidueProperties; +import jalview.schemes.UserColourScheme; + +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.MouseEvent; +import java.util.Vector; public class UserDefinedColours extends Panel implements ActionListener, AdjustmentListener @@ -52,7 +69,7 @@ public class UserDefinedColours extends Panel implements ActionListener, String originalLabel; - Color originalColour; + Object originalColour; int R = 0, G = 0, B = 0; @@ -100,11 +117,26 @@ public class UserDefinedColours extends Panel implements ActionListener, setTargetColour(fr.colourPanel.getBackground()); dialog.setVisible(true); } + public UserDefinedColours(Component caller, Color col1, Frame alignframe) { this(caller, col1, alignframe, "Select Colour"); } - public UserDefinedColours(Component caller, Color col1, Container alignframe, String title) + + /** + * 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 + */ + public UserDefinedColours(Component caller, Color col1, Frame alignframe, + String title) { this.caller = caller; originalColour = col1; @@ -114,10 +146,36 @@ public class UserDefinedColours extends Panel implements ActionListener, dialog.setVisible(true); } + /** + * feature colour chooser + * + * @param caller + * @param label + * @param colour + */ public UserDefinedColours(Object caller, String label, Color colour) { + this(caller, label, colour, colour); + } + + /** + * feature colour chooser when changing style to single color + * + * @param me + * @param type + * @param graduatedColor + */ + public UserDefinedColours(FeatureSettings me, String type, + GraduatedColor graduatedColor) + { + this(me, type, graduatedColor, graduatedColor.getMaxColor()); + } + + private UserDefinedColours(Object caller, String label, Object ocolour, + Color colour) + { this.caller = caller; - originalColour = colour; + originalColour = ocolour; originalLabel = label; init(); remove(buttonPanel); @@ -136,12 +194,14 @@ 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){ - dialog = new Dialog(((JVDialog)alignframe), title, true); - } else { + 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."); } @@ -152,9 +212,10 @@ 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); } @@ -332,14 +393,14 @@ public class UserDefinedColours extends Panel implements ActionListener, { final Button button = new Button(); Color col = Color.white; - if (oldColourScheme!=null) - { - try - { - col = oldColourScheme.findColour(aa.charAt(0), -1); - } catch (Exception ex) + if (oldColourScheme != null) { - } + try + { + col = oldColourScheme.findColour(aa.charAt(0), -1, null); + } catch (Exception ex) + { + } } button.setBackground(col); oldColours.addElement(col); @@ -398,11 +459,15 @@ 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(getColor()); + } + else { - ((FeatureColourChooser) caller).minColour_actionPerformed(getColor()); - } else { - ((FeatureColourChooser) caller).maxColour_actionPerformed(getColor()); + ((FeatureColourChooser) caller) + .maxColour_actionPerformed(getColor()); } } @@ -459,12 +524,12 @@ public class UserDefinedColours extends Panel implements ActionListener, if (originalLabel.equals("Min Colour")) { ((AnnotationColourChooser) caller) - .minColour_actionPerformed(originalColour); + .minColour_actionPerformed((Color) originalColour); } else { ((AnnotationColourChooser) caller) - .maxColour_actionPerformed(originalColour); + .maxColour_actionPerformed((Color) originalColour); } } else if (caller instanceof FeatureRenderer) @@ -475,11 +540,15 @@ 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((Color) originalColour); + } + else { - ((FeatureColourChooser) caller).minColour_actionPerformed(originalColour); - } else { - ((FeatureColourChooser) caller).maxColour_actionPerformed(originalColour); + ((FeatureColourChooser) caller) + .maxColour_actionPerformed((Color) originalColour); } } if (dialog != null)