+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
package jalview.gui;\r
\r
-import jalview.jbgui.GFinder;\r
-import jalview.datamodel.*;\r
+import java.util.*;\r
+\r
+import java.awt.*;\r
import java.awt.event.*;\r
import javax.swing.*;\r
import javax.swing.event.*;\r
-import java.util.*;\r
\r
+import jalview.datamodel.*;\r
+import jalview.jbgui.*;\r
\r
-public class Finder extends GFinder\r
+public class Finder\r
+ extends GFinder\r
{\r
AlignViewport av;\r
AlignmentPanel ap;\r
JInternalFrame frame;\r
- String searchString;\r
-\r
+ SuperGroup searchGroup;\r
+ Vector searchResults;\r
int seqIndex = 0;\r
int resIndex = 0;\r
+\r
public Finder(AlignViewport av, AlignmentPanel ap, JInternalFrame f)\r
{\r
this.av = av;\r
{\r
textfield.requestFocus();\r
}\r
- });\r
- }\r
-});\r
+ });\r
+ }\r
\r
+ public void internalFrameClosing(InternalFrameEvent evt)\r
+ {\r
+ cancel_actionPerformed(null);\r
+ }\r
+ });\r
}\r
\r
public void textfield_actionPerformed(ActionEvent e)\r
\r
public void findAll_actionPerformed(ActionEvent e)\r
{\r
- resIndex=0;\r
- seqIndex=0;\r
+ resIndex = 0;\r
+ seqIndex = 0;\r
doSearch(true);\r
}\r
\r
public void cancel_actionPerformed(ActionEvent e)\r
{\r
- try{\r
+ try\r
+ {\r
// if allResults is null, this effectively switches displaySearch flag in seqCanvas\r
- ap.highlightSearchResults( null );\r
- frame.setClosed(true);\r
- }catch(Exception ex){ }\r
+ ap.highlightSearchResults(null);\r
+ ap.idPanel.highlightSearchResults(null);\r
+\r
+ // frame.setClosed(true);\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ }\r
+ }\r
+\r
+ public void createNewGroup_actionPerformed(ActionEvent e)\r
+ {\r
+ Color[] newColors = new Color[24];\r
+\r
+ for (int i = 0; i < 24; i++)\r
+ {\r
+ newColors[i] = new Color(60, 160, 115);\r
+ }\r
+\r
+ jalview.schemes.UserColourScheme ucs = new jalview.schemes.UserColourScheme(\r
+ newColors);\r
+ String searchString = textfield.getText();\r
\r
+ searchGroup = new SuperGroup(searchString, ucs, true, true, false);\r
+\r
+ for (int i = 0; i < searchResults.size(); i += 3)\r
+ {\r
+ // its possible edits may have occurred since search was performed\r
+ // account for this here\r
+ SequenceI seq = av.alignment.getSequenceAt(Integer.parseInt(\r
+ searchResults.elementAt(i).toString()));\r
+ int startRes = seq.findIndex(Integer.parseInt(\r
+ searchResults.elementAt(i + 1).toString())) - 1;\r
+ int endRes = seq.findIndex(Integer.parseInt(\r
+ searchResults.elementAt(i + 2).toString())) - 1;\r
+\r
+ SequenceGroup sg = new SequenceGroup(searchString, ucs, true, true,\r
+ false, startRes, endRes);\r
+ sg.addSequence(seq);\r
+ av.alignment.addGroup(sg);\r
+ searchGroup.addGroup(sg);\r
+ }\r
+\r
+ ap.av.alignment.addSuperGroup(searchGroup);\r
+ ap.highlightSearchResults(null);\r
}\r
\r
void doSearch(boolean findAll)\r
{\r
- searchString = textfield.getText().toUpperCase();\r
+ createNewGroup.setEnabled(false);\r
+\r
+ String searchString = textfield.getText().toUpperCase();\r
\r
- ArrayList searchResults = new ArrayList();\r
- int [] allResults = null;\r
+ com.stevesoft.pat.Regex regex = new com.stevesoft.pat.Regex(searchString);\r
+\r
+ searchResults = new Vector();\r
+\r
+ int[] allResults = null;\r
\r
Sequence seq;\r
- String item;\r
+ String item = null;\r
boolean found = false;\r
\r
- /// is the searchString a residue number?\r
- try{\r
+ ////// is the searchString a residue number?\r
+ try\r
+ {\r
int res = Integer.parseInt(searchString);\r
found = true;\r
\r
- if(av.getSelection().size()>0)\r
- seq = (Sequence)(av.getSelection().sequenceAt(0));\r
+ if (av.getSelectionGroup().getSize() > 0)\r
+ {\r
+ seq = (Sequence) (av.getSelectionGroup().getSequenceAt(0));\r
+ }\r
else\r
- seq = (Sequence)av.getAlignment().getSequenceAt(0);\r
+ {\r
+ seq = (Sequence) av.getAlignment().getSequenceAt(0);\r
+ }\r
+\r
+ searchResults.add(Integer.toString(av.getAlignment().findIndex(seq)));\r
+ searchResults.add(Integer.toString(seq.findIndex(res) - 1));\r
+ searchResults.add(Integer.toString(seq.findIndex(res) - 1));\r
+ }\r
+ catch (NumberFormatException ex)\r
+ {\r
+ }\r
+\r
+ ///////////////////////////////////////////////\r
+ Color[] newColors = new Color[24];\r
+\r
+ for (int i = 0; i < 24; i++)\r
+ {\r
+ newColors[i] = new Color(60, 160, 115);\r
+ }\r
+\r
+ jalview.schemes.UserColourScheme ucs = new jalview.schemes.UserColourScheme(\r
+ newColors);\r
\r
- searchResults.add( Integer.toString( av.getAlignment().findIndex(seq) ) );\r
- searchResults.add( Integer.toString( seq.findIndex(res)-1 ) );\r
- searchResults.add( Integer.toString( seq.findIndex(res)-1 ) );\r
+ searchGroup = new SuperGroup(searchString, ucs, true, true, false);\r
\r
+ int end = av.alignment.getHeight();\r
\r
- //av.getAlignment().getSequenceAt(seq).findPosition(res)\r
- }catch(NumberFormatException ex){}\r
+ SequenceGroup selection = av.getSelectionGroup();\r
\r
+ if (selection != null)\r
+ {\r
+ if ( (selection.getSize() < 1) ||\r
+ ( (selection.getEndRes() - selection.getStartRes()) < 2))\r
+ {\r
+ selection = null;\r
+ }\r
+ }\r
\r
- while( !found && seqIndex<av.getAlignment().getHeight())\r
+ while (!found && (seqIndex < end))\r
{\r
- seq = (Sequence)av.getAlignment().getSequenceAt(seqIndex);\r
+ seq = (Sequence) av.alignment.getSequenceAt(seqIndex);\r
\r
- if(av.getSelection().size()>0 && !av.getSelection().contains(seq))\r
+ if ( (selection != null) && !selection.sequences.contains(seq))\r
{\r
- // if a selection has been made, only search within that selection\r
seqIndex++;\r
- resIndex=0;\r
+ resIndex = 0;\r
+\r
continue;\r
}\r
\r
- item = seq.getSequence();\r
+ item = seq.getSequence().toUpperCase();\r
+\r
+ if ( (selection != null) &&\r
+ (selection.getEndRes() < av.alignment.getWidth()))\r
+ {\r
+ item = item.substring(0, selection.getEndRes() + 1);\r
+ }\r
+\r
+ ///Shall we ignore gaps????\r
+ StringBuffer noGaps = new StringBuffer();\r
+ int insertCount = 0;\r
+ Vector spaces = new Vector();\r
+\r
+ for (int j = 0; j < item.length(); j++)\r
+ {\r
+ if (!jalview.util.Comparison.isGap(item.charAt(j)))\r
+ {\r
+ noGaps.append(item.charAt(j));\r
+ spaces.add(new Integer(insertCount));\r
+ }\r
+ else\r
+ {\r
+ insertCount++;\r
+ }\r
+ }\r
\r
- for(int r = resIndex; r<item.length(); r++)\r
+ for (int r = resIndex; r < noGaps.length(); r++)\r
{\r
- if(item.indexOf(searchString,r)>-1)\r
- {\r
- resIndex = item.indexOf(searchString,r);\r
- searchResults.add( Integer.toString(seqIndex) );\r
- searchResults.add( Integer.toString( resIndex) );\r
- searchResults.add( Integer.toString( (resIndex+searchString.length()-1) ) );\r
- if(!findAll)\r
- {\r
- // thats enough, break and display the result\r
- found = true;\r
- resIndex++;\r
- break;\r
- }\r
- }\r
+ if (regex.searchFrom(noGaps.toString(), r))\r
+ {\r
+ resIndex = regex.matchedFrom();\r
+\r
+ if ( (selection != null) &&\r
+ ( (resIndex +\r
+ Integer.parseInt(spaces.get(resIndex).toString())) <\r
+ selection.getStartRes()))\r
+ {\r
+ continue;\r
+ }\r
+\r
+ searchResults.add(Integer.toString(seqIndex));\r
+\r
+ int sres = seq.findPosition(resIndex +\r
+ Integer.parseInt(spaces.elementAt(\r
+ resIndex)\r
+ .toString()));\r
+ int eres = seq.findPosition(regex.matchedTo() - 1 +\r
+ Integer.parseInt(spaces.elementAt(regex.\r
+ matchedTo() -\r
+ 1).toString()));\r
+\r
+ searchResults.addElement(sres + "");\r
+ searchResults.addElement(eres + "");\r
+\r
+ if (!findAll)\r
+ {\r
+ // thats enough, break and display the result\r
+ found = true;\r
+ resIndex++;\r
+\r
+ break;\r
+ }\r
+\r
+ r = resIndex;\r
+ }\r
}\r
- if(!found)\r
+\r
+ if (!found)\r
{\r
seqIndex++;\r
resIndex = 0;\r
}\r
}\r
\r
- if(searchResults.size()>0)\r
+ Vector idMatch = new Vector();\r
+\r
+ for (int id = 0; id < av.alignment.getHeight(); id++)\r
+ {\r
+ if (regex.search(av.alignment.getSequenceAt(id).getName()))\r
+ {\r
+ idMatch.add(av.alignment.getSequenceAt(id));\r
+ }\r
+ }\r
+\r
+ if ( (searchResults.size() == 0) && (idMatch.size() > 0))\r
{\r
+ ap.idPanel.highlightSearchResults(idMatch);\r
+ }\r
\r
+ if (searchResults.size() > 0)\r
+ {\r
allResults = new int[searchResults.size()];\r
- for(int i=0; i<searchResults.size(); i++)\r
+\r
+ for (int i = 0; i < searchResults.size(); i++)\r
+ {\r
allResults[i] = Integer.parseInt(searchResults.get(i).toString());\r
+ }\r
\r
+ createNewGroup.setEnabled(true);\r
}\r
else\r
{\r
- JOptionPane.showInternalMessageDialog(this, "Finished searching", null,\r
+ JOptionPane.showInternalMessageDialog(this, "Finished searching",\r
+ null,\r
JOptionPane.INFORMATION_MESSAGE);\r
- resIndex=0;\r
- seqIndex=0;\r
+ resIndex = 0;\r
+ seqIndex = 0;\r
}\r
\r
// if allResults is null, this effectively switches displaySearch flag in seqCanvas\r
- ap.highlightSearchResults( allResults );\r
-\r
+ ap.highlightSearchResults(allResults);\r
\r
+ if (findAll)\r
+ {\r
+ String message = (searchResults.size() / 3) + " matches found.";\r
+ JOptionPane.showInternalMessageDialog(this, message, null,\r
+ JOptionPane.INFORMATION_MESSAGE);\r
+ }\r
}\r
-\r
}\r
git://source.jalview.org / jalview.git / blobdiff