X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=9733c864b3be9c396a6c5df6b1c15d789c2af05d;hb=3ed5c0f91614bb7a3620ec3a968a54bafdbd74ad;hp=203605b209ecd76345f2924b729d4502243b8f7a;hpb=0b1c761dfaa8242f122cf868e8897a06ec6eb727;p=jalview.git diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java index 203605b..9733c86 100755 --- a/src/jalview/appletgui/FeatureSettings.java +++ b/src/jalview/appletgui/FeatureSettings.java @@ -56,6 +56,7 @@ import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.Arrays; import java.util.Enumeration; import java.util.List; import java.util.Map; @@ -93,14 +94,7 @@ public class FeatureSettings extends Panel implements ItemListener, transparency = new Scrollbar(Scrollbar.HORIZONTAL, 100 - (int) (fr.getTransparency() * 100), 1, 1, 100); - if (fr.isTransparencyAvailable()) - { - transparency.addAdjustmentListener(this); - } - else - { - transparency.setEnabled(false); - } + transparency.addAdjustmentListener(this); java.net.URL url = getClass().getResource("/images/link.gif"); if (url != null) @@ -132,17 +126,8 @@ public class FeatureSettings extends Panel implements ItemListener, Panel tPanel = new Panel(new BorderLayout()); - if (fr.isTransparencyAvailable()) - { - tPanel.add(transparency, BorderLayout.CENTER); - tPanel.add(new Label("Transparency"), BorderLayout.EAST); - } - else - { - tPanel.add( - new Label("Transparency not available in this web browser"), - BorderLayout.CENTER); - } + tPanel.add(transparency, BorderLayout.CENTER); + tPanel.add(new Label("Transparency"), BorderLayout.EAST); lowerPanel.add(tPanel, BorderLayout.SOUTH); @@ -207,7 +192,7 @@ public class FeatureSettings extends Panel implements ItemListener, final FeatureColourI typeCol = fr.getFeatureStyle(type); PopupMenu men = new PopupMenu(MessageManager.formatMessage( "label.settings_for_type", new String[] { type })); - MenuItem scr = new MenuItem( + java.awt.MenuItem scr = new MenuItem( MessageManager.getString("label.sort_by_score")); men.add(scr); final FeatureSettings me = this; @@ -217,8 +202,8 @@ public class FeatureSettings extends Panel implements ItemListener, @Override public void actionPerformed(ActionEvent e) { - me.ap.alignFrame.avc - .sortAlignmentByFeatureScore(new String[] { type }); + me.ap.alignFrame.avc.sortAlignmentByFeatureScore(Arrays + .asList(new String[] { type })); } }); @@ -230,12 +215,13 @@ public class FeatureSettings extends Panel implements ItemListener, @Override public void actionPerformed(ActionEvent e) { - me.ap.alignFrame.avc - .sortAlignmentByFeatureDensity(new String[] { type }); + me.ap.alignFrame.avc.sortAlignmentByFeatureDensity(Arrays + .asList(new String[] { type })); } }); men.add(dens); + if (minmax != null) { final float[][] typeMinMax = minmax.get(type); @@ -280,6 +266,57 @@ public class FeatureSettings extends Panel implements ItemListener, }); } } + + 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); } @@ -316,9 +353,7 @@ public class FeatureSettings extends Panel implements ItemListener, for (String group : fr.getFeatureGroups()) { boolean vis = fr.checkGroupVisibility(group, false); - Checkbox check = new MyCheckbox(group, vis, - (fr.featureLinks != null && fr.featureLinks - .containsKey(group))); + Checkbox check = new MyCheckbox(group, vis, false); check.addMouseListener(this); check.setFont(new Font("Serif", Font.BOLD, 12)); check.addItemListener(groupItemListener); @@ -456,10 +491,7 @@ public class FeatureSettings extends Panel implements ItemListener, selected = true; } - check = new MyCheckbox( - type, - selected, - (fr.featureLinks != null && fr.featureLinks.containsKey(type)), + check = new MyCheckbox(type, selected, false, fr.getFeatureStyle(type)); check.addMouseListener(this); @@ -541,23 +573,6 @@ public class FeatureSettings extends Panel implements ItemListener, boolean dragging = false; @Override - public void mousePressed(MouseEvent evt) - { - - selectedCheck = (MyCheckbox) evt.getSource(); - - if (fr.featureLinks != null - && fr.featureLinks.containsKey(selectedCheck.type)) - { - if (evt.getX() > selectedCheck.stringWidth + 20) - { - evt.consume(); - } - } - - } - - @Override public void mouseDragged(MouseEvent evt) { if (((Component) evt.getSource()).getParent() != featurePanel) @@ -651,16 +666,6 @@ public class FeatureSettings extends Panel implements ItemListener, { this.popupSort(check, fr.getMinMax(), evt.getX(), evt.getY()); } - if (fr.featureLinks != null && fr.featureLinks.containsKey(check.type)) - { - if (evt.getX() > check.stringWidth + 20) - { - evt.consume(); - String link = fr.featureLinks.get(check.type).toString(); - ap.alignFrame.showURL(link.substring(link.indexOf("|") + 1), - link.substring(0, link.indexOf("|"))); - } - } if (check.getParent() != featurePanel) { @@ -758,28 +763,31 @@ public class FeatureSettings extends Panel implements ItemListener, public void paint(Graphics g) { Dimension d = getSize(); - if (col.isColourByLabel()) + if (col != null) { - g.setColor(Color.white); - g.fillRect(d.width / 2, 0, d.width / 2, d.height); - /* - * g.setColor(Color.black); Font f=g.getFont().deriveFont(9); - * g.setFont(f); - * - * // g.setFont(g.getFont().deriveFont( // - * AffineTransform.getScaleInstance( // - * width/g.getFontMetrics().stringWidth("Label"), // - * height/g.getFontMetrics().getHeight()))); g.drawString("Label", - * width/2, 0); - */ + if (col.isColourByLabel()) + { + g.setColor(Color.white); + g.fillRect(d.width / 2, 0, d.width / 2, d.height); + /* + * g.setColor(Color.black); Font f=g.getFont().deriveFont(9); + * g.setFont(f); + * + * // g.setFont(g.getFont().deriveFont( // + * AffineTransform.getScaleInstance( // + * width/g.getFontMetrics().stringWidth("Label"), // + * height/g.getFontMetrics().getHeight()))); g.drawString("Label", + * width/2, 0); + */ - } - else if (col.isGraduatedColour()) - { - Color maxCol = col.getMaxColour(); - g.setColor(maxCol); - g.fillRect(d.width / 2, 0, d.width / 2, d.height); + } + else if (col.isGraduatedColour()) + { + Color maxCol = col.getMaxColour(); + g.setColor(maxCol); + g.fillRect(d.width / 2, 0, d.width / 2, d.height); + } } if (hasLink) @@ -790,4 +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 + + } + }