X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=79812aeedf353b99c68e4a6e76ec129f01cd6f75;hb=refs%2Fheads%2Ffeatures%2FJAL-2094_colourInterface;hp=bef64377c792386b5e71237735e115a28854f554;hpb=303e2fff7dd24d9e17a603512702a087a9cc3337;p=jalview.git diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java index bef6437..79812ae 100755 --- a/src/jalview/appletgui/FeatureSettings.java +++ b/src/jalview/appletgui/FeatureSettings.java @@ -20,11 +20,11 @@ */ package jalview.appletgui; +import jalview.api.FeatureColourI; import jalview.api.FeatureSettingsControllerI; import jalview.datamodel.AlignmentI; import jalview.datamodel.SequenceFeature; -import jalview.schemes.AnnotationColourGradient; -import jalview.schemes.GraduatedColor; +import jalview.util.ColorUtils; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -190,10 +190,10 @@ public class FeatureSettings extends Panel implements ItemListener, int x, int y) { final String type = check.type; - final Object typeCol = fr.getFeatureStyle(type); - java.awt.PopupMenu men = new PopupMenu(MessageManager.formatMessage( + final FeatureColourI typeCol = fr.getFeatureStyle(type); + PopupMenu men = new PopupMenu(MessageManager.formatMessage( "label.settings_for_type", new String[] { type })); - java.awt.MenuItem scr = new MenuItem( + MenuItem scr = new MenuItem( MessageManager.getString("label.sort_by_score")); men.add(scr); final FeatureSettings me = this; @@ -222,6 +222,7 @@ public class FeatureSettings extends Panel implements ItemListener, }); men.add(dens); + if (minmax != null) { final float[][] typeMinMax = minmax.get(type); @@ -242,7 +243,7 @@ public class FeatureSettings extends Panel implements ItemListener, // graduated colourschemes for those where minmax exists for the // positional features MenuItem mxcol = new MenuItem( - (typeCol instanceof Color) ? "Graduated Colour" + (typeCol.isSimpleColour()) ? "Graduated Colour" : "Single Colour"); men.add(mxcol); mxcol.addActionListener(new ActionListener() @@ -251,7 +252,7 @@ public class FeatureSettings extends Panel implements ItemListener, @Override public void actionPerformed(ActionEvent e) { - if (typeCol instanceof Color) + if (typeCol.isSimpleColour()) { new FeatureColourChooser(me, type); // write back the current colour object to update the table @@ -259,14 +260,64 @@ public class FeatureSettings extends Panel implements ItemListener, } else { - new UserDefinedColours(me, check.type, - ((GraduatedColor) typeCol)); + new UserDefinedColours(me, check.type, typeCol); } } }); } } + + MenuItem selectContaining = new MenuItem( + MessageManager.getString("label.select_columns_containing")); + selectContaining.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + me.ap.alignFrame.avc.markColumnsContainingFeatures(false, false, + false, type); + } + }); + men.add(selectContaining); + + MenuItem selectNotContaining = new MenuItem( + MessageManager.getString("label.select_columns_not_containing")); + selectNotContaining.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + me.ap.alignFrame.avc.markColumnsContainingFeatures(true, false, + false, type); + } + }); + men.add(selectNotContaining); + + MenuItem hideContaining = new MenuItem( + MessageManager.getString("label.hide_columns_containing")); + hideContaining.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + hideFeatureColumns(type, true); + } + }); + men.add(hideContaining); + + MenuItem hideNotContaining = new MenuItem( + MessageManager.getString("label.hide_columns_not_containing")); + hideNotContaining.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + hideFeatureColumns(type, false); + } + }); + men.add(hideNotContaining); + this.featurePanel.add(men); men.show(this.featurePanel, x, y); } @@ -585,19 +636,9 @@ public class FeatureSettings extends Panel implements ItemListener, } } - public void setUserColour(String feature, Object originalColour) + public void setUserColour(String feature, FeatureColourI originalColour) { - if (originalColour instanceof Color - || originalColour instanceof GraduatedColor) - { - fr.setColour(feature, originalColour); - } - else - { - throw new Error( - MessageManager - .getString("error.implementation_error_unsupported_feature_colour_object")); - } + fr.setColour(feature, originalColour); refreshTable(); } @@ -634,10 +675,11 @@ public class FeatureSettings extends Panel implements ItemListener, if (evt.getClickCount() > 1) { - Object fcol = fr.getFeatureStyle(check.type); - if (fcol instanceof Color) + FeatureColourI fcol = fr.getFeatureStyle(check.type); + if (fcol.isSimpleColour()) { - new UserDefinedColours(this, check.type, (Color) fcol); + new UserDefinedColours(this, check.type, ColorUtils.getColor(fcol + .getColour())); } else { @@ -669,49 +711,34 @@ public class FeatureSettings extends Panel implements ItemListener, boolean hasLink; - GraduatedColor gcol; + FeatureColourI col; - Color col; - - public void updateColor(Object newcol) + public void updateColor(FeatureColourI newcol) { - if (newcol instanceof Color) - { - col = (Color) newcol; - gcol = null; - } - else if (newcol instanceof GraduatedColor) - { - gcol = (GraduatedColor) newcol; - col = null; - } - else - { - throw new Error( - MessageManager - .getString("error.invalid_colour_for_mycheckbox")); - } - if (col != null) + col = newcol; + if (col.isSimpleColour()) { - setBackground(col); + setBackground(ColorUtils.getColor(col.getColour())); } else { String vlabel = type; - if (gcol.getThreshType() != AnnotationColourGradient.NO_THRESHOLD) + if (col.isAboveThreshold()) + { + vlabel += " (>)"; + } + else if (col.isBelowThreshold()) { - vlabel += " " - + ((gcol.getThreshType() == AnnotationColourGradient.ABOVE_THRESHOLD) ? "(>)" - : "(<)"); + vlabel += " (<)"; } - if (gcol.isColourByLabel()) + if (col.isColourByLabel()) { setBackground(Color.white); vlabel += " (by Label)"; } else { - setBackground(gcol.getMinColor()); + setBackground(ColorUtils.getColor(col.getMinColour())); } this.setLabel(vlabel); } @@ -728,7 +755,7 @@ public class FeatureSettings extends Panel implements ItemListener, } public MyCheckbox(String type, boolean selected, boolean b, - Object featureStyle) + FeatureColourI featureStyle) { this(type, selected, b); updateColor(featureStyle); @@ -738,9 +765,9 @@ public class FeatureSettings extends Panel implements ItemListener, public void paint(Graphics g) { Dimension d = getSize(); - if (gcol != null) + if (col != null) { - if (gcol.isColourByLabel()) + if (col.isColourByLabel()) { g.setColor(Color.white); g.fillRect(d.width / 2, 0, d.width / 2, d.height); @@ -754,14 +781,12 @@ public class FeatureSettings extends Panel implements ItemListener, * height/g.getFontMetrics().getHeight()))); g.drawString("Label", * width/2, 0); */ - } - else + else if (col.isGraduatedColour()) { - Color maxCol = gcol.getMaxColor(); + Color maxCol = ColorUtils.getColor(col.getMaxColour()); g.setColor(maxCol); g.fillRect(d.width / 2, 0, d.width / 2, d.height); - } } @@ -773,9 +798,31 @@ public class FeatureSettings extends Panel implements ItemListener, } } + /** + * Hide columns containing (or not containing) a given feature type + * + * @param type + * @param columnsContaining + */ + void hideFeatureColumns(final String type, + boolean columnsContaining) + { + if (ap.alignFrame.avc.markColumnsContainingFeatures( + columnsContaining, false, false, type)) + { + if (ap.alignFrame.avc.markColumnsContainingFeatures( + !columnsContaining, false, false, type)) + { + ap.alignFrame.viewport.hideSelectedColumns(); + } + } + } + @Override public void mousePressed(MouseEvent e) { + // TODO Auto-generated method stub + } }