X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureSettings.java;h=1c156dc43f934ad415c6de77981372787894885d;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=cd998b1e61bebf1bd80bb2335d85fcec5d3eb94c;hpb=25aaaa87042b3f507ad4348120df7dd073182759;p=jalview.git diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java index cd998b1..1c156dc 100755 --- a/src/jalview/appletgui/FeatureSettings.java +++ b/src/jalview/appletgui/FeatureSettings.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 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,21 +20,51 @@ */ package jalview.appletgui; -import java.util.*; -import java.util.List; -import java.awt.*; -import java.awt.event.*; - -import jalview.analysis.AlignmentSorter; -import jalview.commands.OrderCommand; -import jalview.datamodel.*; +import jalview.api.FeatureSettingsControllerI; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.SequenceFeature; import jalview.schemes.AnnotationColourGradient; import jalview.schemes.GraduatedColor; import jalview.util.MessageManager; +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.Checkbox; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.GridLayout; +import java.awt.Image; +import java.awt.Label; +import java.awt.MenuItem; +import java.awt.Panel; +import java.awt.PopupMenu; +import java.awt.ScrollPane; +import java.awt.Scrollbar; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; +import java.awt.event.InputEvent; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.awt.event.MouseMotionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.List; +import java.util.Vector; + public class FeatureSettings extends Panel implements ItemListener, MouseListener, MouseMotionListener, ActionListener, - AdjustmentListener + AdjustmentListener, FeatureSettingsControllerI { FeatureRenderer fr; @@ -84,12 +114,13 @@ public class FeatureSettings extends Panel implements ItemListener, fr.findAllFeatures(true); // was default - now true to make all visible } - setTableData(); + discoverAllFeatureData(); this.setLayout(new BorderLayout()); scrollPane = new ScrollPane(); scrollPane.add(featurePanel); - if (fr.getAllFeatureColours()!=null && fr.getAllFeatureColours().size()>0) + if (fr.getAllFeatureColours() != null + && fr.getAllFeatureColours().size() > 0) { add(scrollPane, BorderLayout.CENTER); } @@ -120,10 +151,11 @@ public class FeatureSettings extends Panel implements ItemListener, if (groupPanel != null) { - groupPanel - .setLayout(new GridLayout( - (fr.getFeatureGroupsSize()) / 4 + 1, - 4)); // JBPNote - this was scaled on number of visible groups. seems broken + groupPanel.setLayout(new GridLayout( + (fr.getFeatureGroupsSize()) / 4 + 1, 4)); // JBPNote - this was + // scaled on number of + // visible groups. seems + // broken groupPanel.validate(); add(groupPanel, BorderLayout.NORTH); @@ -149,8 +181,8 @@ public class FeatureSettings extends Panel implements ItemListener, height = Math.min(400, height); int width = 300; jalview.bin.JalviewLite.addFrame(frame, - MessageManager.getString("label.feature_settings"), width, - height); + MessageManager.getString("label.sequence_feature_settings"), + width, height); } public void paint(Graphics g) @@ -172,8 +204,7 @@ public class FeatureSettings extends Panel implements ItemListener, final String type = check.type; final Object typeCol = fr.getFeatureStyle(type); java.awt.PopupMenu men = new PopupMenu(MessageManager.formatMessage( - "label.settings_for_type", new String[] - { type })); + "label.settings_for_type", new String[] { type })); java.awt.MenuItem scr = new MenuItem( MessageManager.getString("label.sort_by_score")); men.add(scr); @@ -183,8 +214,8 @@ public class FeatureSettings extends Panel implements ItemListener, public void actionPerformed(ActionEvent e) { - me.ap.alignFrame.avc.sortAlignmentByFeatureScore(new String[] - { type }); + me.ap.alignFrame.avc + .sortAlignmentByFeatureScore(new String[] { type }); } }); @@ -195,8 +226,8 @@ public class FeatureSettings extends Panel implements ItemListener, public void actionPerformed(ActionEvent e) { - me.ap.alignFrame.avc.sortAlignmentByFeatureDensity(new String[] - { type }); + me.ap.alignFrame.avc + .sortAlignmentByFeatureDensity(new String[] { type }); } }); @@ -249,9 +280,11 @@ public class FeatureSettings extends Panel implements ItemListener, men.show(this.featurePanel, x, y); } - public void setTableData() + @Override + public void discoverAllFeatureData() { - if (fr.getAllFeatureColours()!=null && fr.getAllFeatureColours().size()>0) + if (fr.getAllFeatureColours() != null + && fr.getAllFeatureColours().size() > 0) { rebuildGroups(); @@ -276,7 +309,7 @@ public class FeatureSettings extends Panel implements ItemListener, } // TODO: JAL-964 - smoothly incorporate new group entries if panel already // displayed and new groups present - for (String group:(List)fr.getFeatureGroups()) + for (String group : fr.getFeatureGroups()) { boolean vis = fr.checkGroupVisibility(group, false); Checkbox check = new MyCheckbox(group, vis, @@ -294,6 +327,7 @@ public class FeatureSettings extends Panel implements ItemListener, groupPanel.validate(); } } + // This routine adds and removes checkboxes depending on // Group selection states void resetTable(boolean groupsChanged) @@ -450,11 +484,12 @@ public class FeatureSettings extends Panel implements ItemListener, selectionChanged(); } - private ItemListener groupItemListener = new ItemListener() { - public void itemStateChanged(ItemEvent evt) { + private ItemListener groupItemListener = new ItemListener() + { + public void itemStateChanged(ItemEvent evt) + { Checkbox source = (Checkbox) evt.getSource(); - fr.setGroupVisibility(source.getLabel(), - source.getState()); + fr.setGroupVisibility(source.getLabel(), source.getState()); ap.seqPanel.seqCanvas.repaint(); if (ap.overviewPanel != null) { @@ -464,6 +499,7 @@ public class FeatureSettings extends Panel implements ItemListener, return; }; }; + public void itemStateChanged(ItemEvent evt) { selectionChanged(); @@ -583,7 +619,9 @@ public class FeatureSettings extends Panel implements ItemListener, } else { - throw new Error(MessageManager.getString("error.implementation_error_unsupported_feature_colour_object")); + throw new Error( + MessageManager + .getString("error.implementation_error_unsupported_feature_colour_object")); } refreshTable(); } @@ -648,7 +686,7 @@ public class FeatureSettings extends Panel implements ItemListener, public void adjustmentValueChanged(AdjustmentEvent evt) { - fr.setTransparency((float) (100 - transparency.getValue()) / 100f); + fr.setTransparency((100 - transparency.getValue()) / 100f); ap.seqPanel.seqCanvas.repaint(); } @@ -679,7 +717,9 @@ public class FeatureSettings extends Panel implements ItemListener, } else { - throw new Error(MessageManager.getString("error.invalid_colour_for_mycheckbox")); + throw new Error( + MessageManager + .getString("error.invalid_colour_for_mycheckbox")); } if (col != null) {