X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;fp=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;h=a6d0d99da0f794778c529205dfe94d75b5371bd6;hb=37dc43b2c777c1bf999117252f01aaad1e6c276c;hp=be027ec1131f25f2a3d532f06683f773e7ee3e3d;hpb=f2779aae6cd89facf15b81e053179e15e0315546;p=jalview.git diff --git a/src/jalview/appletgui/FeatureRenderer.java b/src/jalview/appletgui/FeatureRenderer.java index be027ec..a6d0d99 100644 --- a/src/jalview/appletgui/FeatureRenderer.java +++ b/src/jalview/appletgui/FeatureRenderer.java @@ -36,7 +36,9 @@ import java.awt.Button; import java.awt.Choice; import java.awt.Color; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Font; +import java.awt.Frame; import java.awt.Graphics; import java.awt.GridLayout; import java.awt.Label; @@ -48,6 +50,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.TextEvent; +import java.awt.event.TextListener; import java.util.Hashtable; /** @@ -59,6 +63,13 @@ import java.util.Hashtable; public class FeatureRenderer extends jalview.renderer.seqfeatures.FeatureRenderer { + /* + * creating a new feature defaults to the type and group as + * the last one created + */ + static String lastFeatureAdded = "feature_1"; + + static String lastFeatureGroupAdded = "Jalview"; // Holds web links for feature groups and feature types // in the form label|link @@ -75,12 +86,6 @@ public class FeatureRenderer extends } - static String lastFeatureAdded; - - static String lastFeatureGroupAdded; - - static String lastDescriptionAdded; - int featureIndex = 0; boolean deleteFeature = false; @@ -167,22 +172,23 @@ public class FeatureRenderer extends /** * Shows a dialog allowing the user to create, or amend or delete, sequence - * features. + * features. If null in the supplied feature(s), feature type and group + * default to those for the last feature created (with initial defaults of + * "feature_1" and "Jalview"). * * @param sequences * @param features * @param create * @param ap - * @param featureType * @return */ boolean amendFeatures(final SequenceI[] sequences, final SequenceFeature[] features, boolean create, - final AlignmentPanel ap, String featureType) + final AlignmentPanel ap) { - Panel bigPanel = new Panel(new BorderLayout()); + final Panel bigPanel = new Panel(new BorderLayout()); final TextField name = new TextField(16); - final TextField source = new TextField(16); + final TextField group = new TextField(16); final TextArea description = new TextArea(3, 35); final TextField start = new TextField(8); final TextField end = new TextField(8); @@ -190,6 +196,22 @@ public class FeatureRenderer extends Button deleteButton = new Button("Delete"); deleteFeature = false; + name.addTextListener(new TextListener() + { + @Override + public void textValueChanged(TextEvent e) + { + warnIfTypeHidden(ap.alignFrame, name.getText()); + } + }); + group.addTextListener(new TextListener() + { + @Override + public void textValueChanged(TextEvent e) + { + warnIfGroupHidden(ap.alignFrame, group.getText()); + } + }); colourPanel = new FeatureColourPanel(); colourPanel.setSize(110, 15); final FeatureRenderer fr = this; @@ -233,7 +255,7 @@ public class FeatureRenderer extends featureIndex = index; name.setText(features[index].getType()); description.setText(features[index].getDescription()); - source.setText(features[index].getFeatureGroup()); + group.setText(features[index].getFeatureGroup()); start.setText(features[index].getBegin() + ""); end.setText(features[index].getEnd() + ""); @@ -269,7 +291,7 @@ public class FeatureRenderer extends tmp = new Panel(); panel.add(tmp); tmp.add(new Label(MessageManager.getString("label.group:"), Label.RIGHT)); - tmp.add(source); + tmp.add(group); tmp = new Panel(); panel.add(tmp); @@ -301,36 +323,16 @@ public class FeatureRenderer extends bigPanel.add(panel, BorderLayout.CENTER); } - if (featureType != null) - { - lastFeatureAdded = featureType; - } - else - { - if (lastFeatureAdded == null) - { - if (features[0].type != null) - { - lastFeatureAdded = features[0].type; - } - else - { - lastFeatureAdded = "feature_1"; - } - } - } - - if (lastFeatureGroupAdded == null) - { - if (features[0].featureGroup != null) - { - lastFeatureGroupAdded = features[0].featureGroup; - } - else - { - lastFeatureAdded = "Jalview"; - } - } + /* + * use defaults for type and group (and update them on Confirm) only + * if feature type has not been supplied by the caller + * (e.g. for Amend, or create features from Find) + */ + boolean useLastDefaults = features[0].getType() == null; + String featureType = useLastDefaults ? lastFeatureAdded : features[0] + .getType(); + String featureGroup = useLastDefaults ? lastFeatureGroupAdded + : features[0].getFeatureGroup(); String title = create ? MessageManager .getString("label.create_new_sequence_features") @@ -342,12 +344,10 @@ public class FeatureRenderer extends dialog.setMainPanel(bigPanel); - if (create) - { - name.setText(lastFeatureAdded); - source.setText(lastFeatureGroupAdded); - } - else + name.setText(featureType); + group.setText(featureGroup); + + if (!create) { dialog.ok.setLabel(MessageManager.getString("label.amend")); dialog.buttonPanel.add(deleteButton, 1); @@ -360,8 +360,6 @@ public class FeatureRenderer extends dialog.setVisible(false); } }); - name.setText(features[0].getType()); - source.setText(features[0].getFeatureGroup()); } start.setText(features[0].getBegin() + ""); @@ -393,27 +391,27 @@ public class FeatureRenderer extends FeaturesFile ffile = new FeaturesFile(); - if (dialog.accept) + /* + * only update default type and group if we used defaults + */ + if (dialog.accept && useLastDefaults) { lastFeatureAdded = name.getText().trim(); - lastFeatureGroupAdded = source.getText().trim(); - lastDescriptionAdded = description.getText().replace('\n', ' '); - } - - if (lastFeatureGroupAdded != null && lastFeatureGroupAdded.length() < 1) - { - lastFeatureGroupAdded = null; + lastFeatureGroupAdded = group.getText().trim(); } if (!create) { - SequenceFeature sf = features[featureIndex]; if (dialog.accept) { - sf.type = lastFeatureAdded; - sf.featureGroup = lastFeatureGroupAdded; - sf.description = lastDescriptionAdded; + sf.type = name.getText().trim(); + sf.featureGroup = group.getText().trim(); + if (sf.featureGroup != null && sf.featureGroup.length() < 1) + { + sf.featureGroup = null; + } + sf.description = description.getText().replace('\n', ' '); if (!colourPanel.isGcol) { // update colour - otherwise its already done. @@ -425,27 +423,37 @@ public class FeatureRenderer extends sf.end = Integer.parseInt(end.getText()); } catch (NumberFormatException ex) { + // } + boolean typeOrGroupChanged = (!featureType.equals(sf.type) || !featureGroup + .equals(sf.featureGroup)); ffile.parseDescriptionHTML(sf, false); - setVisible(lastFeatureAdded); // if user edited name then make sure new - // type is visible + if (typeOrGroupChanged) + { + featuresAdded(); + } } if (deleteFeature) { sequences[0].deleteFeature(sf); + // ensure Feature Settings reflects removal of feature / group + featuresAdded(); } - } else { + /* + * adding feature(s) + */ if (dialog.accept && name.getText().length() > 0) { for (int i = 0; i < sequences.length; i++) { - features[i].type = lastFeatureAdded; - features[i].featureGroup = lastFeatureGroupAdded; - features[i].description = lastDescriptionAdded; + features[i].type = name.getText().trim(); + features[i].featureGroup = group.getText().trim(); + features[i].description = description.getText() + .replace('\n', ' '); sequences[i].addSequenceFeature(features[i]); ffile.parseDescriptionHTML(features[i], false); } @@ -453,14 +461,8 @@ public class FeatureRenderer extends Color newColour = colourPanel.getBackground(); // setColour(lastFeatureAdded, fcol); - if (lastFeatureGroupAdded != null) - { - setGroupVisibility(lastFeatureGroupAdded, true); - } setColour(lastFeatureAdded, new FeatureColour(newColour)); // was fcol - setVisible(lastFeatureAdded); - findAllFeatures(false); // different to original applet behaviour ? - // findAllFeatures(); + featuresAdded(); } else { @@ -479,4 +481,43 @@ public class FeatureRenderer extends return true; } + + protected void warnIfGroupHidden(Frame frame, String group) + { + if (featureGroups.containsKey(group) && !featureGroups.get(group)) + { + String msg = MessageManager.formatMessage("label.warning_hidden", + MessageManager.getString("label.group"), group); + showWarning(frame, msg); + } + } + + protected void warnIfTypeHidden(Frame frame, String type) + { + if (getRenderOrder().contains(type)) + { + if (!showFeatureOfType(type)) + { + String msg = MessageManager.formatMessage("label.warning_hidden", + MessageManager.getString("label.feature_type"), type); + showWarning(frame, msg); + } + } + } + + /** + * @param frame + * @param msg + */ + protected void showWarning(Frame frame, String msg) + { + JVDialog d = new JVDialog(frame, "", true, 350, 200); + Panel mp = new Panel(); + d.ok.setLabel(MessageManager.getString("action.ok")); + d.cancel.setVisible(false); + mp.setLayout(new FlowLayout()); + mp.add(new Label(msg)); + d.setMainPanel(mp); + d.setVisible(true); + } }