From 50ea78c7b98de7614cd386956e9aa0ee73dd7936 Mon Sep 17 00:00:00 2001 From: jprocter Date: Tue, 26 Aug 2008 09:14:11 +0000 Subject: [PATCH 1/1] tooltip for fetch db refs and more generic regex for 'Extract scores...' --- src/jalview/gui/AlignFrame.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 10a9c95..442a417 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -3546,7 +3546,7 @@ public class AlignFrame webService.removeAll(); // Temporary hack - DBRef Fetcher always top level ws entry. JMenuItem rfetch = new JMenuItem("Fetch DB References"); - rfetch.setToolTipText("Retrieve and parse uniprot records for the alignment or the currently selected sequences"); + rfetch.setToolTipText("Retrieve and parse sequence database records for the alignment or the currently selected sequences"); webService.add(rfetch); rfetch.addActionListener(new ActionListener() { @@ -3981,8 +3981,9 @@ public void drop(DropTargetDropEvent evt) protected void extractScores_actionPerformed(ActionEvent e) { ParseProperties pp = new jalview.analysis.ParseProperties(viewport.alignment); - if (pp.getScoresFromDescription("col", "score column ", "\\W*([-+]?\\d*\\.?\\d*e?-?\\d*)\\W+([-+]?\\d*\\.?\\d*e?-?\\d*)", true)>0) - { + // TODO: verify regex and introduce GUI dialog for version 2.5 + //if (pp.getScoresFromDescription("col", "score column ", "\\W*([-+]?\\d*\\.?\\d*e?-?\\d*)\\W+([-+]?\\d*\\.?\\d*e?-?\\d*)", true)>0) + if (pp.getScoresFromDescription("description column", "score in description column ", "\\W*([-+eE0-9.]+)", true)>0) { buildSortByAnnotationScoresMenu(); } } -- 1.7.10.2