X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FUserDefinedColours.java;h=7819ff36bc44e016a2671499d1df299ed2efec67;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=825cfd39b3741d1b2de25491aad5cc7bd9f674a6;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java index 825cfd3..7819ff3 100755 --- a/src/jalview/appletgui/UserDefinedColours.java +++ b/src/jalview/appletgui/UserDefinedColours.java @@ -1,20 +1,19 @@ /* - * 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.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, 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; @@ -52,7 +51,7 @@ public class UserDefinedColours extends Panel implements ActionListener, String originalLabel; - Color originalColour; + Object originalColour; int R = 0, G = 0, B = 0; @@ -103,18 +102,62 @@ public class UserDefinedColours extends Panel implements ActionListener, 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 + */ + public UserDefinedColours(Component caller, Color col1, Frame alignframe, + String title) + { this.caller = caller; originalColour = col1; - originalLabel = "Select Colour"; - setForDialog("Select Colour", alignframe); + originalLabel = title; + setForDialog(title, alignframe); setTargetColour(col1); 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); @@ -126,12 +169,23 @@ public class UserDefinedColours extends Panel implements ActionListener, frame.setSize(420, 200); } - void setForDialog(String title, Frame alignframe) + void setForDialog(String title, Container alignframe) { init(); frame.setVisible(false); remove(buttonPanel); - dialog = new Dialog(alignframe, title, true); + if (alignframe instanceof Frame) + { + 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."); + } dialog.add(this); this.setSize(400, 123); @@ -320,14 +374,15 @@ public class UserDefinedColours extends Panel implements ActionListener, { final Button button = new Button(); Color col = Color.white; - - try - { - col = oldColourScheme.findColour(aa.charAt(0), -1); - } catch (Exception ex) + if (oldColourScheme != null) { + try + { + col = oldColourScheme.findColour(aa.charAt(0), -1); + } catch (Exception ex) + { + } } - button.setBackground(col); oldColours.addElement(col); button.setLabel(label); @@ -381,15 +436,19 @@ public class UserDefinedColours extends Panel implements ActionListener, } else if (caller instanceof FeatureRenderer) { - ((FeatureRenderer) caller).colourPanel.setBackground(getColor()); + ((FeatureRenderer) caller).colourPanel.updateColor(getColor()); } else if (caller instanceof FeatureColourChooser) { - if (originalLabel.indexOf("inimum")>-1) + if (originalLabel.indexOf("inimum") > -1) { - ((FeatureColourChooser) caller).minColour_actionPerformed(getColor()); - } else { - ((FeatureColourChooser) caller).maxColour_actionPerformed(getColor()); + ((FeatureColourChooser) caller) + .minColour_actionPerformed(getColor()); + } + else + { + ((FeatureColourChooser) caller) + .maxColour_actionPerformed(getColor()); } } @@ -446,21 +505,33 @@ 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) { - ((FeatureRenderer) caller).colourPanel - .setBackground(originalColour); + ((FeatureRenderer) caller).colourPanel.updateColor(originalColour); } + else if (caller instanceof FeatureColourChooser) + { + if (originalLabel.indexOf("inimum") > -1) + { + ((FeatureColourChooser) caller) + .minColour_actionPerformed((Color) originalColour); + } + else + { + ((FeatureColourChooser) caller) + .maxColour_actionPerformed((Color) originalColour); + } + } if (dialog != null) dialog.setVisible(false);