Highlight feature to edit
authoramwaterhouse <Andrew Waterhouse>
Tue, 21 Nov 2006 12:48:29 +0000 (12:48 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 21 Nov 2006 12:48:29 +0000 (12:48 +0000)
src/jalview/gui/FeatureRenderer.java
src/jalview/gui/SeqPanel.java

index eb09af6..b584d89 100755 (executable)
@@ -423,13 +423,14 @@ public class FeatureRenderer
     public boolean createNewFeatures(SequenceI[] sequences,\r
                                   SequenceFeature [] features)\r
     {\r
-      return amendFeatures(sequences, features, true);\r
+      return amendFeatures(sequences, features, true, null);\r
     }\r
 \r
     int featureIndex = 0;\r
-    boolean amendFeatures(SequenceI[] sequences,\r
-                           final SequenceFeature [] features,\r
-                           boolean newFeatures)\r
+    boolean amendFeatures(final SequenceI[] sequences,\r
+                          final SequenceFeature[] features,\r
+                          boolean newFeatures,\r
+                          final AlignmentPanel ap)\r
     {\r
       JPanel bigPanel = new JPanel(new BorderLayout());\r
       final JComboBox name = new JComboBox();\r
@@ -567,6 +568,14 @@ public class FeatureRenderer
                   getColour(name.getSelectedItem().toString()));\r
               colour.setForeground(\r
                   getColour(name.getSelectedItem().toString()));\r
+\r
+              SearchResults highlight = new SearchResults();\r
+              highlight.addResult(sequences[0],\r
+                                  features[index].getBegin(),\r
+                                  features[index].getEnd());\r
+\r
+              ap.seqPanel.seqCanvas.highlightSearchResults(highlight);\r
+\r
             }\r
           }\r
         });\r
@@ -581,7 +590,8 @@ public class FeatureRenderer
         options = new Object[]{"OK", "Cancel"};\r
 \r
       String title = newFeatures ?  "Create New Sequence Feature(s)" :\r
-                                    "Amend/Delete Features";\r
+                                    "Amend/Delete Features for "\r
+                                    +sequences[0].getName();\r
 \r
       int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop,\r
                                                    bigPanel,\r
index 3349825..06aa087 100755 (executable)
@@ -1232,7 +1232,7 @@ public class SeqPanel extends JPanel implements MouseListener,
             sequence.findPosition( findRes(evt) )\r
             );\r
 \r
-        if(features!=null && features.length==1)\r
+        if(features!=null && features.length>0)\r
         {\r
           SearchResults highlight = new SearchResults();\r
           highlight.addResult(sequence,\r
@@ -1244,7 +1244,7 @@ public class SeqPanel extends JPanel implements MouseListener,
         {\r
           seqCanvas.getFeatureRenderer().amendFeatures(\r
               new SequenceI[]\r
-              {sequence}, features, false);\r
+              {sequence}, features, false, ap);\r
 \r
           seqCanvas.highlightSearchResults(null);\r
         }\r