X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureRenderer.java;h=ed6a3c545378e15aa0364f3ffda94c59d3566178;hb=7c19c72efd3433b14f845c265747010d9dc596cc;hp=89e94c8ebfb2ae53588086470d7be50ab5c6a2c7;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java index 89e94c8..ed6a3c5 100644 --- a/src/jalview/gui/FeatureRenderer.java +++ b/src/jalview/gui/FeatureRenderer.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,10 +20,13 @@ */ package jalview.gui; +import jalview.api.FeatureColourI; import jalview.datamodel.SearchResults; +import jalview.datamodel.SearchResultsI; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; -import jalview.schemes.GraduatedColor; +import jalview.schemes.FeatureColour; +import jalview.util.ColorUtils; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -37,6 +40,8 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.util.Arrays; +import java.util.Comparator; import javax.swing.JColorChooser; import javax.swing.JComboBox; @@ -71,9 +76,8 @@ public class FeatureRenderer extends */ public FeatureRenderer(AlignmentPanel ap) { - super(); + super(ap.av); this.ap = ap; - this.av = ap.av; if (ap != null && ap.getSeqPanel() != null && ap.getSeqPanel().seqCanvas != null && ap.getSeqPanel().seqCanvas.fr != null) @@ -92,7 +96,7 @@ public class FeatureRenderer extends static String lastDescriptionAdded; - Object oldcol, fcol; + FeatureColourI oldcol, fcol; int featureIndex = 0; @@ -121,22 +125,22 @@ public class FeatureRenderer extends { FeatureColourChooser fcc = null; + @Override public void mousePressed(MouseEvent evt) { - if (fcol instanceof Color) + if (fcol.isSimpleColour()) { Color col = JColorChooser.showDialog(Desktop.desktop, MessageManager.getString("label.select_feature_colour"), - ((Color) fcol)); + fcol.getColour()); if (col != null) { - fcol = col; - updateColourButton(bigPanel, colour, col); + fcol = new FeatureColour(col); + updateColourButton(bigPanel, colour, new FeatureColour(col)); } } else { - if (fcc == null) { final String type = features[featureIndex].getType(); @@ -147,6 +151,7 @@ public class FeatureRenderer extends fcc.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { fcol = fcc.getLastColour(); @@ -169,7 +174,8 @@ public class FeatureRenderer extends { panel = new JPanel(new GridLayout(4, 1)); tmp = new JPanel(); - tmp.add(new JLabel(MessageManager.getString("label.select_feature"))); + tmp.add(new JLabel(MessageManager.getString("label.select_feature") + + ":")); overlaps = new JComboBox(); for (int i = 0; i < features.length; i++) { @@ -182,6 +188,7 @@ public class FeatureRenderer extends overlaps.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { int index = overlaps.getSelectedIndex(); @@ -194,18 +201,18 @@ public class FeatureRenderer extends start.setValue(new Integer(features[index].getBegin())); end.setValue(new Integer(features[index].getEnd())); - SearchResults highlight = new SearchResults(); + SearchResultsI highlight = new SearchResults(); highlight.addResult(sequences[0], features[index].getBegin(), features[index].getEnd()); ap.getSeqPanel().seqCanvas.highlightSearchResults(highlight); } - Object col = getFeatureStyle(name.getText()); + FeatureColourI col = getFeatureStyle(name.getText()); if (col == null) { - col = new jalview.schemes.UserColourScheme() - .createColourFromName(name.getText()); + col = new FeatureColour(ColorUtils + .createColourFromName(name.getText())); } oldcol = fcol = col; updateColourButton(bigPanel, colour, col); @@ -219,12 +226,13 @@ public class FeatureRenderer extends tmp = new JPanel(); panel.add(tmp); - tmp.add(new JLabel(MessageManager.getString("label.name"), JLabel.RIGHT)); + tmp.add(new JLabel(MessageManager.getString("label.name:"), + JLabel.RIGHT)); tmp.add(name); tmp = new JPanel(); panel.add(tmp); - tmp.add(new JLabel(MessageManager.getString("label.group") + ":", + tmp.add(new JLabel(MessageManager.getString("label.group:"), JLabel.RIGHT)); tmp.add(source); @@ -243,7 +251,7 @@ public class FeatureRenderer extends bigPanel.add(panel, BorderLayout.NORTH); panel = new JPanel(); - panel.add(new JLabel(MessageManager.getString("label.description"), + panel.add(new JLabel(MessageManager.getString("label.description:"), JLabel.RIGHT)); description.setFont(JvSwingUtils.getTextAreaFont()); description.setLineWrap(true); @@ -322,14 +330,14 @@ public class FeatureRenderer extends : MessageManager.formatMessage("label.amend_delete_features", new String[] { sequences[0].getName() }); - int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop, - bigPanel, title, JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, null, options, + int reply = JvOptionPane.showInternalOptionDialog(Desktop.desktop, + bigPanel, title, JvOptionPane.YES_NO_CANCEL_OPTION, + JvOptionPane.QUESTION_MESSAGE, null, options, MessageManager.getString("action.ok")); jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile(); - if (reply == JOptionPane.OK_OPTION && name.getText().length() > 0) + if (reply == JvOptionPane.OK_OPTION && name.getText().length() > 0) { // This ensures that the last sequence // is refreshed and new features are rendered @@ -348,11 +356,11 @@ public class FeatureRenderer extends { SequenceFeature sf = features[featureIndex]; - if (reply == JOptionPane.NO_OPTION) + if (reply == JvOptionPane.NO_OPTION) { sequences[0].getDatasetSequence().deleteFeature(sf); } - else if (reply == JOptionPane.YES_OPTION) + else if (reply == JvOptionPane.YES_OPTION) { sf.type = lastFeatureAdded; sf.featureGroup = lastFeatureGroupAdded; @@ -375,7 +383,7 @@ public class FeatureRenderer extends else // NEW FEATURES ADDED { - if (reply == JOptionPane.OK_OPTION && lastFeatureAdded.length() > 0) + if (reply == JvOptionPane.OK_OPTION && lastFeatureAdded.length() > 0) { for (int i = 0; i < sequences.length; i++) { @@ -416,26 +424,36 @@ public class FeatureRenderer extends * * @param bigPanel * @param col - * @param col2 + * @param col */ protected void updateColourButton(JPanel bigPanel, JLabel colour, - Object col2) + FeatureColourI col) { colour.removeAll(); colour.setIcon(null); colour.setToolTipText(null); colour.setText(""); - if (col2 instanceof Color) + if (col.isSimpleColour()) { - colour.setBackground((Color) col2); + colour.setBackground(col.getColour()); } else { colour.setBackground(bigPanel.getBackground()); colour.setForeground(Color.black); - FeatureSettings.renderGraduatedColor(colour, (GraduatedColor) col2); - // colour.setForeground(colour.getBackground()); + FeatureSettings.renderGraduatedColor(colour, col); } } + + /** + * Orders features in render precedence (last in order is last to render, so + * displayed on top of other features) + * + * @param order + */ + public void orderFeatures(Comparator order) + { + Arrays.sort(renderOrder, order); + } }