X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=81e55644b6b34e941aa0fc24f6970fd085d1dc30;hb=966e2e639242c252f4ed9e5f0e3e91b0389bd2de;hp=22c0a1d0d9895f7e2d7f7ca225a797bf3833fc06;hpb=e3dc89750ea111f15f168ea7f5965649921884f3;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 22c0a1d..81e5564 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -13,37 +13,28 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program; if not, write to the Free Softwarechang * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ package jalview.gui; -import jalview.analysis.*; - -import jalview.datamodel.*; - -import jalview.io.*; - -import jalview.jbgui.*; - -import jalview.schemes.*; - -import jalview.ws.*; +import java.beans.*; +import java.io.*; +import java.util.*; import java.awt.*; import java.awt.datatransfer.*; import java.awt.event.*; import java.awt.print.*; - -import java.io.*; - -import java.beans.*; - -import java.util.*; - import javax.swing.*; -import javax.swing.event.*; +import jalview.analysis.*; +import jalview.datamodel.*; +import jalview.io.*; +import jalview.jbgui.*; +import jalview.schemes.*; +import jalview.ws.*; +import javax.swing.event.AncestorEvent; /** * DOCUMENT ME! @@ -51,2164 +42,2590 @@ import javax.swing.event.*; * @author $author$ * @version $Revision$ */ -public class AlignFrame extends GAlignFrame +public class AlignFrame + extends GAlignFrame implements ClipboardOwner { - /** DOCUMENT ME!! */ - public static final int NEW_WINDOW_WIDTH = 700; - - /** DOCUMENT ME!! */ - public static final int NEW_WINDOW_HEIGHT = 500; - final AlignmentPanel alignPanel; - final AlignViewport viewport; - - /** DOCUMENT ME!! */ - public String currentFileFormat = null; - Stack historyList = new Stack(); - Stack redoList = new Stack(); - private int treeCount = 0; - - /** - * Creates a new AlignFrame object. - * - * @param al DOCUMENT ME! - */ - public AlignFrame(AlignmentI al) - { - viewport = new AlignViewport(al); - - alignPanel = new AlignmentPanel(this, viewport); - alignPanel.annotationPanel.adjustPanelHeight(); - alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.annotationPanel.getPreferredSize()); - alignPanel.annotationScroller.setPreferredSize(alignPanel.annotationPanel.getPreferredSize()); - alignPanel.setAnnotationVisible(viewport.getShowAnnotation()); - - getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER); - - addInternalFrameListener(new InternalFrameAdapter() - { - public void internalFrameActivated(InternalFrameEvent evt) - { - javax.swing.SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - alignPanel.requestFocus(); - } - }); - } - }); - } + /** DOCUMENT ME!! */ + public static final int NEW_WINDOW_WIDTH = 700; + /** DOCUMENT ME!! */ + public static final int NEW_WINDOW_HEIGHT = 500; + AlignmentPanel alignPanel; + AlignViewport viewport; - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void parseGroupsFile(String file) - { - try{ - BufferedReader in = new BufferedReader(new FileReader(file)); - SequenceI seq=null; - String line, text, token; - UserColourScheme ucs; - int index, start, end; - StringTokenizer st; - SequenceGroup sg; - while( (line = in.readLine())!=null) - { - st = new StringTokenizer(line, "\t"); - if(st.countTokens()!=6) - { - System.out.println("Groups file "+file+" is invalid. Read help file."); - System.exit(1); - } - - while(st.hasMoreElements()) - { - text = st.nextToken(); - token = st.nextToken(); - if(!token.equals("ID_NOT_SPECIFIED")) - { - index = viewport.alignment.findIndex(viewport.alignment.findName( - token)); - st.nextToken(); - } - else - index = Integer.parseInt( st.nextToken() ); + Vector viewports = new Vector(); + Vector alignPanels = new Vector(); - start=Integer.parseInt( st.nextToken() ); - end = Integer.parseInt( st.nextToken() ); - ucs = new UserColourScheme(st.nextToken()); + /** DOCUMENT ME!! */ + public String currentFileFormat = null; + Stack historyList = new Stack(); + Stack redoList = new Stack(); + private int treeCount = 0; - seq = viewport.alignment.getSequenceAt(index); - start = seq.findIndex(start)-1; - end = seq.findIndex(end)-1; - sg = new SequenceGroup(text,ucs,true,true,false,start,end); - sg.addSequence( seq,true); + /** + * Creates a new AlignFrame object. + * + * @param al DOCUMENT ME! + */ + public AlignFrame(AlignmentI al) + { + viewport = new AlignViewport(al); + viewports.add(viewport); - viewport.alignment.addGroup(sg); - } - } - }catch(Exception ex){System.out.println("Error parsing groups file: "+ex);} + if(viewport.vconsensus==null) + { + //Out of memory calculating consensus. + BLOSUM62Colour.setEnabled(false); + PIDColour.setEnabled(false); + conservationMenuItem.setEnabled(false); + modifyConservation.setEnabled(false); + abovePIDThreshold.setEnabled(false); + modifyPID.setEnabled(false); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void saveAlignmentMenu_actionPerformed(ActionEvent e) - { - JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty( - "LAST_DIRECTORY"), - new String[] - { - "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", - "jar" - }, - new String[] - { - "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" - }, currentFileFormat); + alignPanel = new AlignmentPanel(this, viewport); + alignPanels.add(alignPanel); - chooser.setAcceptAllFileFilterUsed(false); - chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Save Alignment to file"); - chooser.setToolTipText("Save"); + String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort"); - int value = chooser.showSaveDialog(this); + if(sortby.equals("Id")) + sortIDMenuItem_actionPerformed(null); + else if(sortby.equals("Pairwise Identity")) + sortPairwiseMenuItem_actionPerformed(null); - if (value == JalviewFileChooser.APPROVE_OPTION) - { - currentFileFormat = chooser.getSelectedFormat(); - jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", - currentFileFormat); + // remove(tabbedPane); + getContentPane().add(alignPanel, BorderLayout.CENTER); - String choice = chooser.getSelectedFile().getPath(); - jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice); - saveAlignment(choice, currentFileFormat); - } + + // tabbedPane.add(al.isNucleotide() ? "DNA":"Protein", alignPanel); + + ///Dataset tab + ///////////////////////// + if(al.getDataset()==null) + { + al.setDataset(null); } + // AlignViewport ds = new AlignViewport(al.getDataset(), true); + // AlignmentPanel dap = new AlignmentPanel(this, ds); + // tabbedPane.add("Dataset", dap); + // viewports.add(ds); + // alignPanels.add(dap); + ///////////////////////// + - public boolean saveAlignment(String file, String format) + viewport.addPropertyChangeListener(new PropertyChangeListener() { - if (format.equalsIgnoreCase("Jalview")) - { - String shortName = title; + public void propertyChange(PropertyChangeEvent evt) + { + if (evt.getPropertyName().equals("alignment")) + { + alignmentChanged(); + } + } + }); - if (shortName.indexOf(java.io.File.separatorChar) > -1) - { - shortName = shortName.substring(shortName.lastIndexOf( - java.io.File.separatorChar) + 1); - } - Jalview2XML.SaveAlignment(this, file, shortName); + if (Desktop.desktop != null) + { + addServiceListeners(); + setGUINucleotide(al.isNucleotide()); + } + } - // USE Jalview2XML to save this file - return true; - } - else + /* Set up intrinsic listeners for dynamically generated GUI bits. */ + private void addServiceListeners() + { + final java.beans.PropertyChangeListener thisListener; + // Do this once to get current state + BuildWebServiceMenu(); + Desktop.discoverer.addPropertyChangeListener( + thisListener = new java.beans.PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - String output = FormatAdapter.formatSequences(format, - viewport.getAlignment(). - getSequences()); - if(output==null) - return false; - - try - { - java.io.PrintWriter out = new java.io.PrintWriter( - new java.io.FileWriter(file)); - out.println(output); - out.close(); - return true; - } - catch (Exception ex) + // System.out.println("Discoverer property change."); + if (evt.getPropertyName().equals("services")) { - ex.printStackTrace(); + // System.out.println("Rebuilding web service menu"); + BuildWebServiceMenu(); } } - return false; - } + }); + addInternalFrameListener(new javax.swing.event. + InternalFrameAdapter() + { + public void internalFrameClosed( + javax.swing.event.InternalFrameEvent evt) + { + // System.out.println("deregistering discoverer listener"); + Desktop.discoverer.removePropertyChangeListener(thisListener); + closeMenuItem_actionPerformed(null); + } + ; + }); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void outputText_actionPerformed(ActionEvent e) - { - CutAndPasteTransfer cap = new CutAndPasteTransfer(); - Desktop.addInternalFrame(cap, - "Alignment output - " + e.getActionCommand(), 600, 500); - cap.setText(FormatAdapter.formatSequences(e.getActionCommand(), - viewport.getAlignment().getSequences())); - } + public void setGUINucleotide(boolean nucleotide) + { + showTranslation.setVisible( nucleotide ); + sequenceFeatures.setVisible(!nucleotide ); + featureSettings.setVisible( !nucleotide ); + conservationMenuItem.setVisible( !nucleotide ); + modifyConservation.setVisible( !nucleotide ); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void htmlMenuItem_actionPerformed(ActionEvent e) + //Deal with separators + //Remember AlignFrame always starts as protein + if(nucleotide) { - new HTMLOutput(viewport); + viewMenu.remove(viewMenu.getItemCount()-2); } - - public void createImageMap(File file, String image) + else { - alignPanel.makePNGImageMap(file, image); + calculateMenu.remove(calculateMenu.getItemCount()-2); } + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void createPNG(File f) - { - alignPanel.makePNG(f); - } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void createEPS(File f) - { - alignPanel.makeEPS(f); - } + /* + Added so Castor Mapping file can obtain Jalview Version + */ + public String getVersion() + { + return jalview.bin.Cache.getProperty("VERSION"); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void printMenuItem_actionPerformed(ActionEvent e) - { - //Putting in a thread avoids Swing painting problems - PrintThread thread = new PrintThread(); - thread.start(); - } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void closeMenuItem_actionPerformed(ActionEvent e) - { - try - { - this.setClosed(true); - } - catch (Exception ex) - { - } - } + /** + * DOCUMENT ME! + * + * @param String DOCUMENT ME! + */ - /** - * DOCUMENT ME! - */ - void updateEditMenuBar() + public void parseGroupsFile(String file) + { + try { - if (historyList.size() > 0) - { - undoMenuItem.setEnabled(true); + BufferedReader in = new BufferedReader(new FileReader(file)); + SequenceI seq = null; + String line, type, desc, token; - HistoryItem hi = (HistoryItem) historyList.peek(); - undoMenuItem.setText("Undo " + hi.getDescription()); - } - else + int index, start, end; + StringTokenizer st; + SequenceFeature sf; + FeatureRenderer fr = alignPanel.seqPanel.seqCanvas.getFeatureRenderer(); + int lineNo = 0; + while ( (line = in.readLine()) != null) + { + lineNo++; + st = new StringTokenizer(line, "\t"); + if (st.countTokens() == 2) { - undoMenuItem.setEnabled(false); - undoMenuItem.setText("Undo"); + type = st.nextToken(); + UserColourScheme ucs = new UserColourScheme(st.nextToken()); + fr.setColour(type, ucs.findColour("A")); + continue; } - if (redoList.size() > 0) + while (st.hasMoreElements()) { - redoMenuItem.setEnabled(true); + desc = st.nextToken(); + token = st.nextToken(); + if (!token.equals("ID_NOT_SPECIFIED")) + { + index = viewport.alignment.findIndex(viewport.alignment.findName( + token)); + st.nextToken(); + } + else + { + index = Integer.parseInt(st.nextToken()); + } + + start = Integer.parseInt(st.nextToken()); + end = Integer.parseInt(st.nextToken()); + + seq = viewport.alignment.getSequenceAt(index); + start = seq.findIndex(start) - 1; + end = seq.findIndex(end) - 1; + + type = st.nextToken(); + + if (fr.getColour(type) == null) + { + // Probably the old style groups file + UserColourScheme ucs = new UserColourScheme(type); + fr.setColour(type, ucs.findColour("A")); + } + + + sf = new SequenceFeature(type, desc, "", start, end); + + seq.addSequenceFeature(sf); + + + // sg = new SequenceGroup(text, ucs, true, true, false, start, end); + // sg.addSequence(seq, false); + + // viewport.alignment.addGroup(sg); - HistoryItem hi = (HistoryItem) redoList.peek(); - redoMenuItem.setText("Redo " + hi.getDescription()); - } - else - { - redoMenuItem.setEnabled(false); - redoMenuItem.setText("Redo"); } - } + } - /** - * DOCUMENT ME! - * - * @param hi DOCUMENT ME! - */ - public void addHistoryItem(HistoryItem hi) - { - historyList.push(hi); - updateEditMenuBar(); - } + viewport.showSequenceFeatures = true; - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void undoMenuItem_actionPerformed(ActionEvent e) - { - HistoryItem hi = (HistoryItem) historyList.pop(); - redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment, - HistoryItem.HIDE)); - restoreHistoryItem(hi); - } + alignPanel.repaint(); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void redoMenuItem_actionPerformed(ActionEvent e) + } + catch (Exception ex) { - HistoryItem hi = (HistoryItem) redoList.pop(); - restoreHistoryItem(hi); - updateEditMenuBar(); - viewport.updateConsensus(); - alignPanel.repaint(); - alignPanel.repaint(); + System.out.println("Error parsing groups file: " + ex); } + } - // used by undo and redo - void restoreHistoryItem(HistoryItem hi) - { - if (hi.getType() == HistoryItem.SORT) + public void fetchSequence_actionPerformed(ActionEvent e) + { + new SequenceFetcher(this); + } + + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void saveAlignmentMenu_actionPerformed(ActionEvent e) + { + JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache. + getProperty( + "LAST_DIRECTORY"), + new String[] { - for (int i = 0; i < hi.getSequences().size(); i++) - { - viewport.alignment.getSequences().setElementAt(hi.getSequences() - .elementAt(i), - i); - } - } - else + "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc", + "jar" + }, + new String[] { - for (int i = 0; i < hi.getSequences().size(); i++) - { - SequenceI restore = (SequenceI) hi.getSequences().elementAt(i); + "Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview" + }, currentFileFormat); - if (restore.getLength() == 0) - { - restore.setSequence(hi.getHidden().elementAt(i).toString()); - viewport.alignment.getSequences().insertElementAt(restore, - hi.getAlignIndex(i)); - } - else - { - restore.setSequence(hi.getHidden().elementAt(i).toString()); - } - } + chooser.setAcceptAllFileFilterUsed(false); + chooser.setFileView(new JalviewFileView()); + chooser.setDialogTitle("Save Alignment to file"); + chooser.setToolTipText("Save"); - if (hi.getType() == HistoryItem.PASTE) - { - for (int i = viewport.alignment.getHeight() - 1; - i > (hi.getSequences().size() - 1); i--) - { - viewport.alignment.deleteSequence(i); - } - } + int value = chooser.showSaveDialog(this); + + if (value == JalviewFileChooser.APPROVE_OPTION) + { + currentFileFormat = chooser.getSelectedFormat(); + + if (currentFileFormat == null) + { + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "You must select a file format before saving!", + "File format not specified", + JOptionPane.WARNING_MESSAGE); + value = chooser.showSaveDialog(this); + return; } - updateEditMenuBar(); + jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", + currentFileFormat); - viewport.updateConsensus(); - viewport.updateConservation(); - alignPanel.repaint(); - viewport.firePropertyChange("alignment", null, - viewport.getAlignment().getSequences()); + String choice = chooser.getSelectedFile().getPath(); + jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice); + + saveAlignment(choice, currentFileFormat); } + } - /** - * DOCUMENT ME! - * - * @param up DOCUMENT ME! - */ - public void moveSelectedSequences(boolean up) + public boolean saveAlignment(String file, String format) + { + if (format.equalsIgnoreCase("Jalview")) { - SequenceGroup sg = viewport.getSelectionGroup(); + String shortName = title; - if (sg == null) - { - return; - } + if (shortName.indexOf(java.io.File.separatorChar) > -1) + { + shortName = shortName.substring(shortName.lastIndexOf( + java.io.File.separatorChar) + 1); + } - if (up) - { - for (int i = 1; i < viewport.alignment.getHeight(); i++) - { - SequenceI seq = viewport.alignment.getSequenceAt(i); + Jalview2XML.SaveAlignment(this, file, shortName); - if (!sg.sequences.contains(seq)) - { - continue; - } + // USE Jalview2XML to save this file + return true; + } + else + { + String output = new FormatAdapter().formatSequences(format, + viewport.getAlignment(). + getSequences()); + if (output == null) + { + return false; + } - SequenceI temp = viewport.alignment.getSequenceAt(i - 1); + try + { + java.io.PrintWriter out = new java.io.PrintWriter( + new java.io.FileWriter(file)); - if (sg.sequences.contains(temp)) - { - continue; - } + out.print(output); + out.close(); + return true; + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + return false; + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void outputText_actionPerformed(ActionEvent e) + { + CutAndPasteTransfer cap = new CutAndPasteTransfer(); + Desktop.addInternalFrame(cap, + "Alignment output - " + e.getActionCommand(), 600, + 500); + cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(), + viewport.getAlignment(). + getSequences())); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void htmlMenuItem_actionPerformed(ActionEvent e) + { + new HTMLOutput(viewport, + alignPanel.seqPanel.seqCanvas.getSequenceRenderer(), + alignPanel.seqPanel.seqCanvas.getFeatureRenderer()); + } + + public void createImageMap(File file, String image) + { + alignPanel.makePNGImageMap(file, image); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void createPNG(File f) + { + alignPanel.makePNG(f); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void createEPS(File f) + { + alignPanel.makeEPS(f); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void printMenuItem_actionPerformed(ActionEvent e) + { + //Putting in a thread avoids Swing painting problems + PrintThread thread = new PrintThread(); + thread.start(); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void closeMenuItem_actionPerformed(ActionEvent e) + { + try + { + PaintRefresher.components.remove(viewport.alignment); + this.setClosed(true); + } + catch (Exception ex) + { + } + } + + /** + * DOCUMENT ME! + */ + void updateEditMenuBar() + { + if (historyList.size() > 0) + { + undoMenuItem.setEnabled(true); + + HistoryItem hi = (HistoryItem) historyList.peek(); + undoMenuItem.setText("Undo " + hi.getDescription()); + } + else + { + undoMenuItem.setEnabled(false); + undoMenuItem.setText("Undo"); + } + + if (redoList.size() > 0) + { + redoMenuItem.setEnabled(true); + + HistoryItem hi = (HistoryItem) redoList.peek(); + redoMenuItem.setText("Redo " + hi.getDescription()); + } + else + { + redoMenuItem.setEnabled(false); + redoMenuItem.setText("Redo"); + } + } + + /** + * DOCUMENT ME! + * + * @param hi DOCUMENT ME! + */ + public void addHistoryItem(HistoryItem hi) + { + historyList.push(hi); + updateEditMenuBar(); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void undoMenuItem_actionPerformed(ActionEvent e) + { + HistoryItem hi = (HistoryItem) historyList.pop(); + redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment, + HistoryItem.HIDE)); + restoreHistoryItem(hi); + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void redoMenuItem_actionPerformed(ActionEvent e) + { + HistoryItem hi = (HistoryItem) redoList.pop(); + restoreHistoryItem(hi); + updateEditMenuBar(); + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + } + + // used by undo and redo + void restoreHistoryItem(HistoryItem hi) + { + if (hi.getType() == HistoryItem.SORT) + { + for (int i = 0; i < hi.getSequences().size(); i++) + { + viewport.alignment.getSequences().setElementAt(hi.getSequences() + .elementAt(i), + i); + } + } + else + { + for (int i = 0; i < hi.getSequences().size(); i++) + { + SequenceI restore = (SequenceI) hi.getSequences().elementAt(i); - viewport.alignment.getSequences().setElementAt(temp, i); - viewport.alignment.getSequences().setElementAt(seq, i - 1); - } + if (restore.getLength() == 0) + { + restore.setSequence(hi.getHidden().elementAt(i).toString()); + viewport.alignment.getSequences().insertElementAt(restore, + hi.getAlignIndex(i)); } else { - for (int i = viewport.alignment.getHeight() - 2; i > -1; i--) - { - SequenceI seq = viewport.alignment.getSequenceAt(i); + restore.setSequence(hi.getHidden().elementAt(i).toString()); + } + } - if (!sg.sequences.contains(seq)) - { - continue; - } + if (hi.getType() == HistoryItem.PASTE) + { + for (int i = viewport.alignment.getHeight() - 1; + i > (hi.getSequences().size() - 1); i--) + { + viewport.alignment.deleteSequence(i); + } + } + } - SequenceI temp = viewport.alignment.getSequenceAt(i + 1); + updateEditMenuBar(); - if (sg.sequences.contains(temp)) - { - continue; - } + viewport.firePropertyChange("alignment", null, + viewport.getAlignment().getSequences()); + } - viewport.alignment.getSequences().setElementAt(temp, i); - viewport.alignment.getSequences().setElementAt(seq, i + 1); - } - } + /** + * DOCUMENT ME! + * + * @param up DOCUMENT ME! + */ + public void moveSelectedSequences(boolean up) + { + SequenceGroup sg = viewport.getSelectionGroup(); - alignPanel.repaint(); + if (sg == null) + { + return; } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void copy_actionPerformed(ActionEvent e) + if (up) { - if (viewport.getSelectionGroup() == null) + for (int i = 1; i < viewport.alignment.getHeight(); i++) + { + SequenceI seq = viewport.alignment.getSequenceAt(i); + + if (!sg.sequences.contains(seq)) { - return; + continue; } - SequenceGroup sg = viewport.getSelectionGroup(); + SequenceI temp = viewport.alignment.getSequenceAt(i - 1); - Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); - StringBuffer buffer = new StringBuffer(); + if (sg.sequences.contains(temp)) + { + continue; + } - Hashtable orderedSeqs = new Hashtable(); + viewport.alignment.getSequences().setElementAt(temp, i); + viewport.alignment.getSequences().setElementAt(seq, i - 1); + } + } + else + { + for (int i = viewport.alignment.getHeight() - 2; i > -1; i--) + { + SequenceI seq = viewport.alignment.getSequenceAt(i); - for (int i = 0; i < sg.getSize(); i++) + if (!sg.sequences.contains(seq)) { - SequenceI seq = sg.getSequenceAt(i); - int index = viewport.alignment.findIndex(seq); - orderedSeqs.put(index + "", seq); + continue; } - int index = 0, startRes, endRes; - char ch; + SequenceI temp = viewport.alignment.getSequenceAt(i + 1); - for (int i = 0; i < sg.getSize(); i++) + if (sg.sequences.contains(temp)) { - SequenceI seq = null; + continue; + } - while (seq == null) - { - if (orderedSeqs.containsKey(index + "")) - { - seq = (SequenceI) orderedSeqs.get(index + ""); - index++; + viewport.alignment.getSequences().setElementAt(temp, i); + viewport.alignment.getSequences().setElementAt(seq, i + 1); + } + } - break; - } - else - { - index++; - } - } + alignPanel.repaint(); + } - //FIND START RES - //Returns residue following index if gap - startRes = seq.findPosition(sg.getStartRes()); + public void lostOwnership(Clipboard clipboard, Transferable contents) + { + Desktop.jalviewClipboard = null; + } - //FIND END RES - //Need to find the residue preceeding index if gap - endRes = 0; - for (int j = 0; j < sg.getEndRes()+1 && j < seq.getLength(); j++) - { - ch = seq.getCharAt(j); - if (!jalview.util.Comparison.isGap( (ch))) - { - endRes++; - } - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void copy_actionPerformed(ActionEvent e) + { + if (viewport.getSelectionGroup() == null) + { + return; + } - if(endRes>0) - { - endRes += seq.getStart() -1; - } + SequenceGroup sg = viewport.getSelectionGroup(); - buffer.append(seq.getName() + "\t" + - startRes + "\t" + - endRes + "\t" + - seq.getSequence(sg.getStartRes(), - sg.getEndRes() + 1) + "\n"); - } + Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); - c.setContents(new StringSelection(buffer.toString()), null); - } + Hashtable orderedSeqs = new Hashtable(); + SequenceI[] seqs = new SequenceI[sg.getSize()]; - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void pasteNew_actionPerformed(ActionEvent e) + for (int i = 0; i < sg.getSize(); i++) { - paste(true); + SequenceI seq = sg.getSequenceAt(i); + int index = viewport.alignment.findIndex(seq); + orderedSeqs.put(index + "", seq); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void pasteThis_actionPerformed(ActionEvent e) - { - addHistoryItem(new HistoryItem("Paste Sequences", viewport.alignment, - HistoryItem.PASTE)); - paste(false); - } + int index = 0, startRes, endRes; + char ch; - /** - * DOCUMENT ME! - * - * @param newAlignment DOCUMENT ME! - */ - void paste(boolean newAlignment) + for (int i = 0; i < sg.getSize(); i++) { - try - { - Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); - Transferable contents = c.getContents(this); - - if (contents == null) - { - return; - } - - String str = (String) contents.getTransferData(DataFlavor.stringFlavor); - StringTokenizer st = new StringTokenizer(str); - ArrayList seqs = new ArrayList(); - - while (st.hasMoreElements()) - { - String name = st.nextToken(); - int start = Integer.parseInt(st.nextToken()); - int end = Integer.parseInt(st.nextToken()); - Sequence sequence = new Sequence(name, st.nextToken(), start, - end); - - if (!newAlignment) - { - viewport.alignment.addSequence(sequence); - } - else - { - seqs.add(sequence); - } - } - - if (newAlignment) - { - SequenceI[] newSeqs = new SequenceI[seqs.size()]; - seqs.toArray(newSeqs); - - AlignFrame af = new AlignFrame(new Alignment(newSeqs)); - String newtitle = new String("Copied sequences"); + SequenceI seq = null; - if (title.startsWith("Copied sequences")) - { - newtitle = title; - } - else - { - newtitle = newtitle.concat("- from " + title); - } + while (seq == null) + { + if (orderedSeqs.containsKey(index + "")) + { + seq = (SequenceI) orderedSeqs.get(index + ""); + index++; - Desktop.addInternalFrame(af, newtitle, NEW_WINDOW_WIDTH, - NEW_WINDOW_HEIGHT); - } - else - { - viewport.firePropertyChange("alignment", null, - viewport.getAlignment().getSequences()); - viewport.setEndSeq(viewport.alignment.getHeight()); - viewport.alignment.getWidth(); - viewport.updateConservation(); - viewport.updateConsensus(); - alignPanel.repaint(); - } + break; } - catch (Exception ex) + else { + index++; } + } - // could be anything being pasted in here - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void cut_actionPerformed(ActionEvent e) - { - copy_actionPerformed(null); - delete_actionPerformed(null); - } + //FIND START RES + //Returns residue following index if gap + startRes = seq.findPosition(sg.getStartRes()); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void delete_actionPerformed(ActionEvent e) - { - boolean seqsdeleted = false; + //FIND END RES + //Need to find the residue preceeding index if gap + endRes = 0; - if (viewport.getSelectionGroup() == null) + for (int j = 0; j < sg.getEndRes() + 1 && j < seq.getLength(); j++) + { + ch = seq.getCharAt(j); + if (!jalview.util.Comparison.isGap( (ch))) { - return; + endRes++; } + } - addHistoryItem(new HistoryItem("Delete Sequences", viewport.alignment, - HistoryItem.HIDE)); + if (endRes > 0) + { + endRes += seq.getStart() - 1; + } - SequenceGroup sg = viewport.getSelectionGroup(); - boolean allSequences = false; - if(sg.sequences.size()==viewport.alignment.getHeight()) - allSequences = true; + seqs[i] = new Sequence(seq.getName(), + seq.getSequence(sg.getStartRes(), sg.getEndRes() + 1), + startRes, + endRes); + seqs[i].setDescription(seq.getDescription()); + seqs[i].setDBRef(seq.getDBRef()); + seqs[i].setSequenceFeatures(seq.getSequenceFeatures()); + seqs[i].setDatasetSequence(seq.getDatasetSequence()); + + } + + FastaFile ff = new FastaFile(); + ff.addJVSuffix( viewport.showJVSuffix ); + c.setContents(new StringSelection( ff.print(seqs)), this); + Desktop.jalviewClipboard = new Object[]{seqs, viewport.alignment.getDataset()}; + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void pasteNew_actionPerformed(ActionEvent e) + { + paste(true); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void pasteThis_actionPerformed(ActionEvent e) + { + addHistoryItem(new HistoryItem("Paste Sequences", viewport.alignment, + HistoryItem.PASTE)); + paste(false); + } + + /** + * DOCUMENT ME! + * + * @param newAlignment DOCUMENT ME! + */ + void paste(boolean newAlignment) + { + try + { + Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard(); + Transferable contents = c.getContents(this); + + if (contents == null) + { + return; + } - for (int i = 0; i < sg.sequences.size(); i++) - { - SequenceI seq = sg.getSequenceAt(i); - int index = viewport.getAlignment().findIndex(seq); - seq.deleteChars(sg.getStartRes(), sg.getEndRes() + 1); + String str = (String) contents.getTransferData(DataFlavor.stringFlavor); + if(str.length()<1) + return; + + String format = IdentifyFile.Identify(str, "Paste"); + SequenceI[] sequences; + + if(Desktop.jalviewClipboard!=null) + { + // The clipboard was filled from within Jalview, we must use the sequences + // And dataset from the copied alignment + sequences = (SequenceI[])Desktop.jalviewClipboard[0]; + } + else + { + sequences = new FormatAdapter().readFile(str, "Paste", format); + } + + if (newAlignment) + { - // If the cut affects all sequences, remove highlighted columns - if(allSequences) - { - viewport.getColumnSelection().removeElements(sg.getStartRes(), sg.getEndRes()+1); - } + Alignment alignment = new Alignment(sequences); + if(Desktop.jalviewClipboard!=null) + alignment.setDataset( (Alignment)Desktop.jalviewClipboard[1] ); + else + alignment.setDataset( null ); - if (seq.getSequence().length() < 1) - { - seqsdeleted = true; - viewport.getAlignment().deleteSequence(seq); - } - else - { - viewport.getAlignment().getSequences().setElementAt(seq, index); - } - } - viewport.setSelectionGroup(null); - viewport.alignment.deleteGroup(sg); + AlignFrame af = new AlignFrame(alignment); + String newtitle = new String("Copied sequences"); - if (seqsdeleted) + if (title.startsWith("Copied sequences")) { - viewport.firePropertyChange("alignment", null, - viewport.getAlignment().getSequences()); + newtitle = title; } - - viewport.resetSeqLimits(alignPanel.seqPanel.seqCanvas.getHeight()); - - if (viewport.getAlignment().getHeight() < 1) + else { - try - { - this.setClosed(true); - } - catch (Exception ex) - { - } + newtitle = newtitle.concat("- from " + title); } - viewport.updateConservation(); - viewport.updateConsensus(); - alignPanel.repaint(); - } + Desktop.addInternalFrame(af, newtitle, NEW_WINDOW_WIDTH, + NEW_WINDOW_HEIGHT); + } + else + { + //!newAlignment + for (int i = 0; i < sequences.length; i++) + { + Sequence newseq = new Sequence(sequences[i].getName(), + sequences[i].getSequence(), sequences[i].getStart(), + sequences[i].getEnd()); + viewport.alignment.addSequence(newseq); + if(sequences[i].getDatasetSequence()==null) + { + //////////////////////////// + //Datset needs extension; + ///////////////////////////// + Sequence ds = new Sequence(sequences[i].getName(), + AlignSeq.extractGaps("-. ", sequences[i].getSequence()), + sequences[i].getStart(), + sequences[i].getEnd()); + newseq.setDatasetSequence(ds); + viewport.alignment.getDataset().addSequence(ds); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void deleteGroups_actionPerformed(ActionEvent e) + } + viewport.setEndSeq(viewport.alignment.getHeight()); + viewport.alignment.getWidth(); + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + } + } + catch (Exception ex) { - viewport.alignment.deleteAllGroups(); - viewport.setSelectionGroup(null); - alignPanel.repaint(); + // could be anything being pasted in here } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void selectAllSequenceMenuItem_actionPerformed(ActionEvent e) - { - SequenceGroup sg = new SequenceGroup(); - for (int i = 0; i < viewport.getAlignment().getSequences().size(); - i++) - { - sg.addSequence(viewport.getAlignment().getSequenceAt(i), false); - } + } - sg.setEndRes(viewport.alignment.getWidth()-1); - viewport.setSelectionGroup(sg); - PaintRefresher.Refresh(null, viewport.alignment); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void cut_actionPerformed(ActionEvent e) + { + copy_actionPerformed(null); + delete_actionPerformed(null); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e) + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void delete_actionPerformed(ActionEvent e) + { + + if (viewport.getSelectionGroup() == null) { - viewport.setSelectionGroup(null); - viewport.getColumnSelection().clear(); - viewport.setSelectionGroup(null); - alignPanel.annotationPanel.activeRes = null; - PaintRefresher.Refresh(null, viewport.alignment); + return; } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void invertSequenceMenuItem_actionPerformed(ActionEvent e) - { - SequenceGroup sg = viewport.getSelectionGroup(); + addHistoryItem(new HistoryItem("Delete Sequences", viewport.alignment, + HistoryItem.HIDE)); - if (sg == null) - { - selectAllSequenceMenuItem_actionPerformed(null); + SequenceGroup sg = viewport.getSelectionGroup(); + boolean allSequences = false; + if (sg.sequences.size() == viewport.alignment.getHeight()) + { + allSequences = true; + } - return; - } + for (int i = 0; i < sg.sequences.size(); i++) + { + SequenceI seq = sg.getSequenceAt(i); + int index = viewport.getAlignment().findIndex(seq); + seq.deleteChars(sg.getStartRes(), sg.getEndRes() + 1); - for (int i = 0; i < viewport.getAlignment().getSequences().size(); - i++) - { - sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false); - } + // If the cut affects all sequences, remove highlighted columns + if (allSequences) + { + viewport.getColumnSelection().removeElements(sg.getStartRes(), + sg.getEndRes() + 1); + } - PaintRefresher.Refresh(null, viewport.alignment); + if (seq.getSequence().length() < 1) + { + viewport.getAlignment().deleteSequence(seq); + } + else + { + viewport.getAlignment().getSequences().setElementAt(seq, index); + } } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void remove2LeftMenuItem_actionPerformed(ActionEvent e) - { - ColumnSelection colSel = viewport.getColumnSelection(); + viewport.setSelectionGroup(null); + viewport.alignment.deleteGroup(sg); - if (colSel.size() > 0) - { - addHistoryItem(new HistoryItem("Remove Left", viewport.alignment, - HistoryItem.HIDE)); + viewport.firePropertyChange("alignment", null, + viewport.getAlignment().getSequences()); - int min = colSel.getMin(); - viewport.getAlignment().trimLeft(min); - colSel.compensateForEdit(0, min); - if (viewport.getSelectionGroup() != null) - { - viewport.getSelectionGroup().adjustForRemoveLeft(min); - } - Vector groups = viewport.alignment.getGroups(); + if (viewport.getAlignment().getHeight() < 1) + { + try + { + this.setClosed(true); + } + catch (Exception ex) + { + } + } + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void deleteGroups_actionPerformed(ActionEvent e) + { + viewport.alignment.deleteAllGroups(); + viewport.setSelectionGroup(null); + alignPanel.repaint(); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void selectAllSequenceMenuItem_actionPerformed(ActionEvent e) + { + SequenceGroup sg = new SequenceGroup(); + + for (int i = 0; i < viewport.getAlignment().getSequences().size(); + i++) + { + sg.addSequence(viewport.getAlignment().getSequenceAt(i), false); + } + + sg.setEndRes(viewport.alignment.getWidth() - 1); + viewport.setSelectionGroup(sg); + PaintRefresher.Refresh(null, viewport.alignment); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e) + { + viewport.setSelectionGroup(null); + viewport.getColumnSelection().clear(); + viewport.setSelectionGroup(null); + alignPanel.seqPanel.seqCanvas.highlightSearchResults(null); + alignPanel.annotationPanel.activeRes = null; + PaintRefresher.Refresh(null, viewport.alignment); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void invertSequenceMenuItem_actionPerformed(ActionEvent e) + { + SequenceGroup sg = viewport.getSelectionGroup(); + + if (sg == null) + { + selectAllSequenceMenuItem_actionPerformed(null); + + return; + } + + for (int i = 0; i < viewport.getAlignment().getSequences().size(); + i++) + { + sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false); + } + + PaintRefresher.Refresh(null, viewport.alignment); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void remove2LeftMenuItem_actionPerformed(ActionEvent e) + { + ColumnSelection colSel = viewport.getColumnSelection(); + + if (colSel.size() > 0) + { + addHistoryItem(new HistoryItem("Remove Left", viewport.alignment, + HistoryItem.HIDE)); + + int min = colSel.getMin(); + viewport.getAlignment().trimLeft(min); + colSel.compensateForEdit(0, min); + + if (viewport.getSelectionGroup() != null) + { + viewport.getSelectionGroup().adjustForRemoveLeft(min); + } - for (int i = 0; i < groups.size(); i++) - { - SequenceGroup sg = (SequenceGroup) groups.get(i); + Vector groups = viewport.alignment.getGroups(); - if (!sg.adjustForRemoveLeft(min)) - { - viewport.alignment.deleteGroup(sg); - } - } + for (int i = 0; i < groups.size(); i++) + { + SequenceGroup sg = (SequenceGroup) groups.get(i); - alignPanel.repaint(); + if (!sg.adjustForRemoveLeft(min)) + { + viewport.alignment.deleteGroup(sg); } - } + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void remove2RightMenuItem_actionPerformed(ActionEvent e) - { - ColumnSelection colSel = viewport.getColumnSelection(); + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + } + } - if (colSel.size() > 0) - { - addHistoryItem(new HistoryItem("Remove Right", viewport.alignment, - HistoryItem.HIDE)); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void remove2RightMenuItem_actionPerformed(ActionEvent e) + { + ColumnSelection colSel = viewport.getColumnSelection(); - int max = colSel.getMax(); - viewport.getAlignment().trimRight(max); + if (colSel.size() > 0) + { + addHistoryItem(new HistoryItem("Remove Right", viewport.alignment, + HistoryItem.HIDE)); - if (viewport.getSelectionGroup() != null) - { - viewport.getSelectionGroup().adjustForRemoveRight(max); - } + int max = colSel.getMax(); + viewport.getAlignment().trimRight(max); - Vector groups = viewport.alignment.getGroups(); + if (viewport.getSelectionGroup() != null) + { + viewport.getSelectionGroup().adjustForRemoveRight(max); + } - for (int i = 0; i < groups.size(); i++) - { - SequenceGroup sg = (SequenceGroup) groups.get(i); + Vector groups = viewport.alignment.getGroups(); - if (!sg.adjustForRemoveRight(max)) - { - viewport.alignment.deleteGroup(sg); - } - } + for (int i = 0; i < groups.size(); i++) + { + SequenceGroup sg = (SequenceGroup) groups.get(i); - alignPanel.repaint(); + if (!sg.adjustForRemoveRight(max)) + { + viewport.alignment.deleteGroup(sg); } - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void removeGappedColumnMenuItem_actionPerformed(ActionEvent e) - { - addHistoryItem(new HistoryItem("Remove Gapped Columns", - viewport.alignment, HistoryItem.HIDE)); + } - viewport.getAlignment().removeGaps(); - viewport.updateConservation(); - viewport.updateConsensus(); - alignPanel.repaint(); + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); } + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void removeAllGapsMenuItem_actionPerformed(ActionEvent e) - { - addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment, - HistoryItem.HIDE)); + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void removeGappedColumnMenuItem_actionPerformed(ActionEvent e) + { + addHistoryItem(new HistoryItem("Remove Gapped Columns", + viewport.alignment, HistoryItem.HIDE)); - SequenceI current; - int jSize; + //This is to maintain viewport position on first residue + //of first sequence + SequenceI seq = viewport.alignment.getSequenceAt(0); + int startRes = seq.findPosition(viewport.startRes); - Vector seqs = null; + viewport.getAlignment().removeGaps(); - int start = 0; - int end = viewport.alignment.getWidth(); + viewport.setStartRes(seq.findIndex(startRes)-1); + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + } - if (viewport.getSelectionGroup() != null - && viewport.getSelectionGroup().sequences != null - && viewport.getSelectionGroup().sequences.size()>0) - { - seqs = viewport.getSelectionGroup().sequences; - start = viewport.getSelectionGroup().getStartRes(); - end = viewport.getSelectionGroup().getEndRes(); - } - else - { - seqs = viewport.alignment.getSequences(); - } + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void removeAllGapsMenuItem_actionPerformed(ActionEvent e) + { + addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment, + HistoryItem.HIDE)); - for (int i = 0; i < seqs.size(); i++) - { - current = (SequenceI) seqs.elementAt(i); - jSize = current.getLength(); + //This is to maintain viewport position on first residue + //of first sequence + SequenceI seq = viewport.alignment.getSequenceAt(0); + int startRes = seq.findPosition(viewport.startRes); - int j = start; - do - { - if (jalview.util.Comparison.isGap(current.getCharAt(j))) - { - current.deleteCharAt(j); - j--; - jSize--; - } + SequenceI current; + int jSize; - j++; - } - while (j < end && j < jSize); - } + Vector seqs = null; - viewport.updateConservation(); - viewport.updateConsensus(); - alignPanel.repaint(); + int start = 0; + int end = viewport.alignment.getWidth(); + + if (viewport.getSelectionGroup() != null + && viewport.getSelectionGroup().sequences != null + && viewport.getSelectionGroup().sequences.size() > 0) + { + seqs = viewport.getSelectionGroup().sequences; + start = viewport.getSelectionGroup().getStartRes(); + end = viewport.getSelectionGroup().getEndRes()+1; + } + else + { + seqs = viewport.alignment.getSequences(); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void padGapsMenuitem_actionPerformed(ActionEvent e) + for (int i = 0; i < seqs.size(); i++) { - addHistoryItem(new HistoryItem("Pad Gaps", viewport.alignment, - HistoryItem.HIDE)); + current = (SequenceI) seqs.elementAt(i); + jSize = current.getLength(); - SequenceI current; - int Width = viewport.getAlignment().getWidth(); + // Removing a range is much quicker than removing gaps + // one by one for long sequences + int j = start; + int rangeStart=-1, rangeEnd=-1; - for (int i = 0; i < viewport.getAlignment().getSequences().size(); - i++) + do + { + if (jalview.util.Comparison.isGap(current.getCharAt(j))) + { + if(rangeStart==-1) + { + rangeStart = j; + rangeEnd = j+1; + } + else + { + rangeEnd++; + } + j++; + } + else { - current = viewport.getAlignment().getSequenceAt(i); - - if (current.getLength() < Width) - { - current.insertCharAt(Width - 1, viewport.getGapCharacter()); - } + if(rangeStart>-1) + { + current.deleteChars(rangeStart, rangeEnd); + j-=rangeEnd-rangeStart; + jSize-=rangeEnd-rangeStart; + rangeStart = -1; + rangeEnd = -1; + } + else + j++; } - - viewport.updateConservation(); - viewport.updateConsensus(); - alignPanel.repaint(); + } + while (j < end && j < jSize); + if(rangeStart>-1) + { + current.deleteChars(rangeStart, rangeEnd); + } } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void findMenuItem_actionPerformed(ActionEvent e) - { - JInternalFrame frame = new JInternalFrame(); - Finder finder = new Finder(viewport, alignPanel, frame); - frame.setContentPane(finder); - Desktop.addInternalFrame(frame, "Find", 340, 110); - frame.setLayer(JLayeredPane.PALETTE_LAYER); - } + viewport.setStartRes(seq.findIndex(startRes)-1); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void font_actionPerformed(ActionEvent e) - { - FontChooser fc = new FontChooser(alignPanel); - } + viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void fullSeqId_actionPerformed(ActionEvent e) - { - viewport.setShowFullId(fullSeqId.isSelected()); + public void alignmentChanged() + { + if(viewport.vconsensus!=null) + { + viewport.updateConsensus(); + viewport.updateConservation(); + } + resetAllColourSchemes(); + if(alignPanel.overviewPanel!=null) + alignPanel.overviewPanel.updateOverviewImage(); - alignPanel.idPanel.idCanvas.setPreferredSize(alignPanel.calculateIdWidth()); - alignPanel.repaint(); - } + alignPanel.repaint(); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void colourTextMenuItem_actionPerformed(ActionEvent e) + void resetAllColourSchemes() + { + ColourSchemeI cs = viewport.globalColourScheme; + if(cs!=null) { - viewport.setColourText(colourTextMenuItem.isSelected()); - alignPanel.repaint(); - } + if (cs instanceof ClustalxColourScheme) + { + ( (ClustalxColourScheme) viewport.getGlobalColourScheme()). + resetClustalX(viewport.alignment.getSequences(), + viewport.alignment.getWidth()); + } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void wrapMenuItem_actionPerformed(ActionEvent e) - { - viewport.setWrapAlignment(wrapMenuItem.isSelected()); - alignPanel.setWrapAlignment(wrapMenuItem.isSelected()); - scaleAbove.setVisible(wrapMenuItem.isSelected()); - scaleLeft.setVisible(wrapMenuItem.isSelected()); - scaleRight.setVisible(wrapMenuItem.isSelected()); - alignPanel.repaint(); + cs.setConsensus(viewport.vconsensus); + if (cs.conservationApplied()) + { + Alignment al = (Alignment) viewport.alignment; + Conservation c = new Conservation("All", + ResidueProperties.propHash, 3, + al.getSequences(), 0, + al.getWidth() - 1); + c.calculate(); + c.verdict(false, viewport.ConsPercGaps); + + cs.setConservation(c); + } } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void scaleAbove_actionPerformed(ActionEvent e) + int s, sSize = viewport.alignment.getGroups().size(); + for(s=0; s 0)) || + (viewport.getAlignment().getHeight() < 4)) + { + JOptionPane.showInternalMessageDialog(this, + "Principal component analysis must take\n" + + "at least 4 input sequences.", + "Sequence selection insufficient", + JOptionPane.WARNING_MESSAGE); + + return; + } + + new PCAPanel(viewport); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e) + { + NewTreePanel("AV", "PID", "Average distance tree using PID"); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + public void neighbourTreeMenuItem_actionPerformed(ActionEvent e) + { + NewTreePanel("NJ", "PID", "Neighbour joining tree using PID"); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e) + { + NewTreePanel("NJ", "BL", "Neighbour joining tree using BLOSUM62"); + } + + /** + * DOCUMENT ME! + * + * @param e DOCUMENT ME! + */ + protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e) + { + NewTreePanel("AV", "BL", "Average distance tree using BLOSUM62"); + } + + /** + * DOCUMENT ME! + * + * @param type DOCUMENT ME! + * @param pwType DOCUMENT ME! + * @param title DOCUMENT ME! + */ + void NewTreePanel(String type, String pwType, String title) + { + final TreePanel tp; + + if ( (viewport.getSelectionGroup() != null) && + (viewport.getSelectionGroup().getSize() > 3)) + { + int s = 0; + SequenceGroup sg = viewport.getSelectionGroup(); + + /* Decide if the selection is a column region */ + while (s < sg.sequences.size()) + { + if ( ( (SequenceI) sg.sequences.elementAt(s++)).getLength() < + sg.getEndRes()) { - ConservationColourScheme ccs = null; + JOptionPane.showMessageDialog(Desktop.desktop, + "The selected region to create a tree may\nonly contain residues or gaps.\n" + + "Try using the Pad function in the edit menu,\n" + + "or one of the multiple sequence alignment web services.", + "Sequences in selection are not aligned", + JOptionPane.WARNING_MESSAGE); - Alignment al = (Alignment) viewport.alignment; - Conservation c = new Conservation("All", - ResidueProperties.propHash, 3, al.getSequences(), 0, - al.getWidth() - 1); + return; + } + } - c.calculate(); - c.verdict(false, viewport.ConsPercGaps); + title = title + " on region"; + tp = new TreePanel(viewport, + viewport.getSelectionGroup().sequences, type, pwType, + sg.getStartRes(), sg.getEndRes()); + } + else + { + //are the sequences aligned? + if (!viewport.alignment.isAligned()) + { + JOptionPane.showMessageDialog(Desktop.desktop, + "The sequences must be aligned before creating a tree.\n" + + "Try using the Pad function in the edit menu,\n" + + "or one of the multiple sequence alignment web services.", + "Sequences not aligned", + JOptionPane.WARNING_MESSAGE); + + return; + } - ccs = new ConservationColourScheme(c, cs); + tp = new TreePanel(viewport, + viewport.getAlignment().getSequences(), type, pwType, + 0, + viewport.alignment.getWidth()); + } + addTreeMenuItem(tp, title); + viewport.setCurrentTree(tp.getTree()); - viewport.setGlobalColourScheme(ccs); + Desktop.addInternalFrame(tp, title + " from " + this.title, 600, 500); + } - ccs.inc = SliderPanel.setConservationSlider(alignPanel, ccs, - "Background"); - } - else - { - // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS! - if (cs != null) - { - cs.setConsensus(viewport.vconsensus); - } + /** + * DOCUMENT ME! + * + * @param title DOCUMENT ME! + * @param order DOCUMENT ME! + */ + public void addSortByOrderMenuItem(String title, final AlignmentOrder order) + { + final JMenuItem item = new JMenuItem("by " + title); + sort.add(item); + item.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + addHistoryItem(new HistoryItem("Sort", viewport.alignment, + HistoryItem.SORT)); - viewport.setGlobalColourScheme(cs); - } + // TODO: JBPNote - have to map order entries to curent SequenceI pointers + AlignmentSorter.sortBy(viewport.getAlignment(), order); + alignPanel.repaint(); + } + }); + } - if (viewport.getColourAppliesToAllGroups()) - { - Vector groups = viewport.alignment.getGroups(); + /** + * Maintain the Order by->Displayed Tree menu. + * Creates a new menu item for a TreePanel with an appropriate + * jalview.analysis.AlignmentSorter call. Listeners are added + * to remove the menu item when the treePanel is closed, and adjust + * the tree leaf to sequence mapping when the alignment is modified. + * @param treePanel Displayed tree window. + * @param title SortBy menu item title. + */ + void addTreeMenuItem(final TreePanel treePanel, String title) + { + final JMenuItem item = new JMenuItem(title); - for (int i = 0; i < groups.size(); i++) - { - SequenceGroup sg = (SequenceGroup) groups.elementAt(i); + treeCount++; - if (cs == null) - { - sg.cs = null; - } - else if (cs instanceof ClustalxColourScheme) - { - sg.cs = new ClustalxColourScheme(sg.sequences, sg.getWidth()); - } - else if (cs instanceof UserColourScheme) - { - sg.cs = new UserColourScheme(((UserColourScheme) cs).getColours()); - } - else - { - try - { - sg.cs = (ColourSchemeI) cs.getClass().newInstance(); - } - catch (Exception ex) - { - } - } - - if (viewport.getAbovePIDThreshold()) - { - if (sg.cs instanceof ResidueColourScheme) - { - ((ResidueColourScheme) sg.cs).setThreshold(threshold, viewport.getIgnoreGapsConsensus()); - } - else if (sg.cs instanceof ScoreColourScheme) - { - ((ScoreColourScheme) sg.cs).setThreshold(threshold, viewport.getIgnoreGapsConsensus()); - } - - sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, - sg.getWidth())); - } - - if (viewport.getConservationSelected()) - { - Conservation c = new Conservation("Group", - ResidueProperties.propHash, 3, sg.sequences, 0, - viewport.alignment.getWidth() - 1); - c.calculate(); - c.verdict(false, viewport.ConsPercGaps); - - ConservationColourScheme ccs = new ConservationColourScheme(c, - sg.cs); - - // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS! - ccs.setConsensus(AAFrequency.calculate(sg.sequences, 0, - sg.getWidth())); - sg.cs = ccs; - } - else if (cs != null) - { - // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS! - sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, - sg.getWidth())); - } - } - } - - if (alignPanel.getOverviewPanel() != null) - { - alignPanel.getOverviewPanel().updateOverviewImage(); - } - - alignPanel.repaint(); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void modifyPID_actionPerformed(ActionEvent e) + if (treeCount == 1) { - if (viewport.getAbovePIDThreshold()) - { - SliderPanel.setPIDSliderSource(alignPanel, - viewport.getGlobalColourScheme(), "Background"); - SliderPanel.showPIDSlider(); - } + sort.add(sortByTreeMenu); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void modifyConservation_actionPerformed(ActionEvent e) + sortByTreeMenu.add(item); + item.addActionListener(new java.awt.event.ActionListener() { - if (viewport.getConservationSelected()) - { - SliderPanel.setConservationSlider(alignPanel, - viewport.globalColourScheme, "Background"); - SliderPanel.showConservationSlider(); - } - } + public void actionPerformed(ActionEvent e) + { + addHistoryItem(new HistoryItem("Tree Sort", + viewport.alignment, HistoryItem.SORT)); + AlignmentSorter.sortByTree(viewport.getAlignment(), + treePanel.getTree()); + alignPanel.repaint(); + } + }); - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void conservationMenuItem_actionPerformed(ActionEvent e) + treePanel.addInternalFrameListener(new javax.swing.event. + InternalFrameAdapter() { - viewport.setConservationSelected(conservationMenuItem.isSelected()); - - viewport.setAbovePIDThreshold(false); - abovePIDThreshold.setSelected(false); - - ColourSchemeI cs = viewport.getGlobalColourScheme(); + public void internalFrameClosed( + javax.swing.event.InternalFrameEvent evt) + { + treeCount--; + sortByTreeMenu.remove(item); - if (cs instanceof ConservationColourScheme) - { - changeColour(((ConservationColourScheme) cs).cs); - } - else + if (treeCount == 0) { - changeColour(cs); + sort.remove(sortByTreeMenu); } - - modifyConservation_actionPerformed(null); + } + ; + }); + } + + /** + * Work out whether the whole set of sequences + * or just the selected set will be submitted for multiple alignment. + * + */ + private SequenceI[] gatherSequencesForAlignment() + { + // Now, check we have enough sequences + SequenceI[] msa = null; + + if ( (viewport.getSelectionGroup() != null) && + (viewport.getSelectionGroup().getSize() > 1)) + { + // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! + SequenceGroup seqs = viewport.getSelectionGroup(); + int sz; + msa = new SequenceI[sz = seqs.getSize()]; + + for (int i = 0; i < sz; i++) + { + msa[i] = (SequenceI) seqs.getSequenceAt(i); + } } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void abovePIDThreshold_actionPerformed(ActionEvent e) + else { - viewport.setAbovePIDThreshold(abovePIDThreshold.isSelected()); + Vector seqs = viewport.getAlignment().getSequences(); - conservationMenuItem.setSelected(false); - viewport.setConservationSelected(false); - - ColourSchemeI cs = viewport.getGlobalColourScheme(); + if (seqs.size() > 1) + { + msa = new SequenceI[seqs.size()]; - if (cs instanceof ConservationColourScheme) - { - changeColour(((ConservationColourScheme) cs).cs); - } - else + for (int i = 0; i < seqs.size(); i++) { - changeColour(cs); + msa[i] = (SequenceI) seqs.elementAt(i); } - - modifyPID_actionPerformed(null); + } } + return msa; + } + + /** + * Decides what is submitted to a secondary structure prediction service, + * the currently selected sequence, or the currently selected alignment + * (where the first sequence in the set is the one that the prediction + * will be for). + */ + SequenceI[] gatherSeqOrMsaForSecStrPrediction() + { + SequenceI seq = null; + SequenceI[] msa = null; +/* + if (predictindex==-1) { - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void userDefinedColour_actionPerformed(ActionEvent e) + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "The alignment contains no columns or residues usable for prediction!", + "Invalid Alignment Selection", JOptionPane.WARNING_MESSAGE); + this. + return; + } +*/ + if ( (viewport.getSelectionGroup() != null) && + (viewport.getSelectionGroup().getSize() > 0)) { - if(e.getActionCommand().equals("User Defined...")) - new UserDefinedColours(alignPanel, null); + // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! + SequenceGroup seqs = viewport.getSelectionGroup(); + + if ( (seqs.getSize() == 1) || !viewport.alignment.isAligned()) + { + seq = (SequenceI) seqs.getSequenceAt(0); + } else { - UserColourScheme udc = (UserColourScheme)UserDefinedColours. - getUserColourSchemes().get(e.getActionCommand()); + int sz; + msa = new SequenceI[sz = seqs.getSize()]; - changeColour(udc); + for (int i = 0; i < sz; i++) + { + msa[i] = (SequenceI) seqs.getSequenceAt(i); + } } } - - public void updateUserColourMenu() + else { + Vector seqs = viewport.getAlignment().getSequences(); - Component [] menuItems = colourMenu.getMenuComponents(); - int i, iSize = menuItems.length; - for(i=0; i 0)) || - (viewport.getAlignment().getHeight() < 4)) - { - JOptionPane.showInternalMessageDialog(this, - "Principal component analysis must take\n" + - "at least 4 input sequences.", - "Sequence selection insufficient", JOptionPane.WARNING_MESSAGE); + tp.setSize(w,h); - return; - } + if(x>0 && y>0) + tp.setLocation(x,y); - try - { - PCAPanel pcaPanel = new PCAPanel(viewport, null); - JInternalFrame frame = new JInternalFrame(); - frame.setContentPane(pcaPanel); - Desktop.addInternalFrame(frame, "Principal component analysis", - 400, 400); - } - catch (java.lang.OutOfMemoryError ex) - { - JOptionPane.showInternalMessageDialog(this, - "Too many sequences selected\nfor Principal Component Analysis!!", - "Out of memory", JOptionPane.WARNING_MESSAGE); - } - } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e) - { - NewTreePanel("AV", "PID", "Average distance tree using PID"); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void neighbourTreeMenuItem_actionPerformed(ActionEvent e) - { - NewTreePanel("NJ", "PID", "Neighbour joining tree using PID"); + Desktop.addInternalFrame(tp, title, w, h); + addTreeMenuItem(tp, title); + } } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e) + catch (Exception ex) { - NewTreePanel("NJ", "BL", "Neighbour joining tree using BLOSUM62"); + ex.printStackTrace(); } - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e) - { - NewTreePanel("AV", "BL", "Average distance tree using BLOSUM62"); - } + return tp; + } - /** - * DOCUMENT ME! - * - * @param type DOCUMENT ME! - * @param pwType DOCUMENT ME! - * @param title DOCUMENT ME! - */ - void NewTreePanel(String type, String pwType, String title) + class PrintThread + extends Thread + { + public void run() { - final TreePanel tp; + PrinterJob printJob = PrinterJob.getPrinterJob(); + PageFormat pf = printJob.pageDialog(printJob.defaultPage()); + printJob.setPrintable(alignPanel, pf); - if ((viewport.getSelectionGroup() != null) && - (viewport.getSelectionGroup().getSize() > 3)) + if (printJob.printDialog()) + { + try { - int s = 0; - SequenceGroup sg = viewport.getSelectionGroup(); - - /* Decide if the selection is a column region */ - while (s < sg.sequences.size()) - { - if (((SequenceI) sg.sequences.elementAt(s++)).getLength() < sg.getEndRes()) - { - JOptionPane.showMessageDialog(Desktop.desktop, - "The selected region to create a tree may\nonly contain residues or gaps.\n" + - "Try using the Pad function in the edit menu,\n" + - "or one of the multiple sequence alignment web services.", - "Sequences in selection are not aligned", - JOptionPane.WARNING_MESSAGE); - - return; - } - } - - title = title + " on region"; - tp = new TreePanel(viewport, - viewport.getSelectionGroup().sequences, type, pwType, - sg.getStartRes(), sg.getEndRes()); + printJob.print(); } - else + catch (Exception PrintException) { - //are the sequences aligned? - if (!viewport.alignment.isAligned()) - { - JOptionPane.showMessageDialog(Desktop.desktop, - "The sequences must be aligned before creating a tree.\n" + - "Try using the Pad function in the edit menu,\n" + - "or one of the multiple sequence alignment web services.", - "Sequences not aligned", JOptionPane.WARNING_MESSAGE); - - return; - } - - tp = new TreePanel(viewport, - viewport.getAlignment().getSequences(), type, pwType, 0, - viewport.alignment.getWidth()); + PrintException.printStackTrace(); } - - addTreeMenuItem(tp, title); - viewport.setCurrentTree(tp.getTree()); - - Desktop.addInternalFrame(tp, title + " from " + this.title, 600, 500); + } } - - /** - * DOCUMENT ME! - * - * @param title DOCUMENT ME! - * @param order DOCUMENT ME! - */ - public void addSortByOrderMenuItem(String title, final AlignmentOrder order) - { - final JMenuItem item = new JMenuItem("by " + title); - sort.add(item); - item.addActionListener(new java.awt.event.ActionListener() + } + + /** + * Generates menu items and listener event actions for web service clients + * + */ + public void BuildWebServiceMenu() + { + if ( (Discoverer.services != null) + && (Discoverer.services.size() > 0)) + { + Vector msaws = (Vector) Discoverer.services.get("MsaWS"); + Vector secstrpr = (Vector) Discoverer.services.get("SecStrPred"); + Vector wsmenu = new Vector(); + if (msaws != null) + { + // Add any Multiple Sequence Alignment Services + final JMenu msawsmenu = new JMenu("Alignment"); + for (int i = 0, j = msaws.size(); i < j; i++) + { + final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) msaws. + get(i); + final JMenuItem method = new JMenuItem(sh.getName()); + method.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) { - public void actionPerformed(ActionEvent e) - { - addHistoryItem(new HistoryItem("Sort", viewport.alignment, - HistoryItem.SORT)); + SequenceI[] msa = gatherSequencesForAlignment(); + new jalview.ws.MsaWSClient(sh, title, msa, + false, true, viewport.getAlignment().getDataset()); - // TODO: JBPNote - have to map order entries to curent SequenceI pointers - AlignmentSorter.sortBy(viewport.getAlignment(), order); - alignPanel.repaint(); - } - }); - } - - /** - * DOCUMENT ME! - * - * @param treePanel DOCUMENT ME! - * @param title DOCUMENT ME! - */ - void addTreeMenuItem(final TreePanel treePanel, String title) - { - final JMenuItem item = new JMenuItem(title); - - treeCount++; - - if (treeCount == 1) - { - sort.add(sortByTreeMenu); - } + } - sortByTreeMenu.add(item); - item.addActionListener(new java.awt.event.ActionListener() + }); + msawsmenu.add(method); + // Deal with services that we know accept partial alignments. + if (sh.getName().indexOf("lustal") > -1) + { + // We know that ClustalWS can accept partial alignments for refinement. + final JMenuItem methodR = new JMenuItem(sh.getName()+" Realign"); + methodR.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) - { - addHistoryItem(new HistoryItem("Tree Sort", - viewport.alignment, HistoryItem.SORT)); - AlignmentSorter.sortByTree(viewport.getAlignment(), - treePanel.getTree()); - alignPanel.repaint(); - } - }); + public void actionPerformed(ActionEvent e) + { + SequenceI[] msa = gatherSequencesForAlignment(); + new jalview.ws.MsaWSClient(sh, title, msa, + true, true, viewport.getAlignment().getDataset()); - treePanel.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() - { - public void internalFrameClosed( - javax.swing.event.InternalFrameEvent evt) - { - treeCount--; - sortByTreeMenu.remove(item); + } - if (treeCount == 0) - { - sort.remove(sortByTreeMenu); - } - } - ; }); - viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener() - { - public void propertyChange(PropertyChangeEvent evt) - { - if (evt.getPropertyName().equals("alignment")) - { - treePanel.getTree().UpdatePlaceHolders((Vector) evt.getNewValue()); - treePanel.repaint(); - } - } - }); - } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void clustalAlignMenuItem_actionPerformed(ActionEvent e) - { - // TODO:resolve which menu item was actually selected - // Now, check we have enough sequences - SequenceI[] msa = null; - - if ((viewport.getSelectionGroup() != null) && - (viewport.getSelectionGroup().getSize() > 1)) - { - // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! - SequenceGroup seqs = viewport.getSelectionGroup(); - int sz; - msa = new SequenceI[sz = seqs.getSize()]; + msawsmenu.add(methodR); - for (int i = 0; i < sz; i++) - { - msa[i] = (SequenceI) seqs.getSequenceAt(i); - } + } } - else - { - Vector seqs = viewport.getAlignment().getSequences(); - - if (seqs.size() > 1) + wsmenu.add(msawsmenu); + } + if (secstrpr != null) + { + // Add any secondary structure prediction services + final JMenu secstrmenu = new JMenu("Secondary Structure Prediction"); + for (int i = 0, j = secstrpr.size(); i < j; i++) + { + final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) + secstrpr.get(i); + final JMenuItem method = new JMenuItem(sh.getName()); + method.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) { - msa = new SequenceI[seqs.size()]; + SequenceI[] msa = SeqsetUtils.getNonEmptySequenceSet(gatherSeqOrMsaForSecStrPrediction()); + if (msa==null) { + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "There are no columns or residues usable for prediction!\n" + +"There must be valid residues in at least one\n" + +"of the sequences in the alignment,\n" + +"or in the currently selected region.", + "Invalid Input for Secondary Structure Prediction", + JOptionPane.WARNING_MESSAGE); + return; + } - for (int i = 0; i < seqs.size(); i++) + if (msa.length == 1) + { + // Single Sequence prediction + new jalview.ws.JPredClient(sh,title, msa[0]); + } + else + { + if (msa.length > 1) { - msa[i] = (SequenceI) seqs.elementAt(i); + // Aligned Sequences prediction + jalview.ws.JPredClient ct = new jalview.ws.JPredClient(sh, + title, msa); } + } } + }); + secstrmenu.add(method); } - - if (msa != null) - { - jalview.ws.MsaWSClient ct = new jalview.ws.MsaWSClient("ClustalWS", - title, msa, false, true); - } + wsmenu.add(secstrmenu); + } + this.webService.removeAll(); + for (int i = 0, j = wsmenu.size(); i < j; i++) + { + webService.add( (JMenu) wsmenu.get(i)); + } } - - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - public void ClustalRealign_actionPerformed(ActionEvent e) + else { - // TODO:resolve which menu item was actually selected - // Now, check we have enough sequences - SequenceI[] msa = null; + this.webService.removeAll(); + this.webService.add(this.webServiceNoServices); + } + // TODO: add in rediscovery function + // TODO: reduce code redundancy. + // TODO: group services by location as well as function. + } - if ((viewport.getSelectionGroup() != null) && - (viewport.getSelectionGroup().getSize() > 1)) - { - // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! - SequenceGroup seqs = viewport.getSelectionGroup(); - int sz; - msa = new SequenceI[sz = seqs.getSize()]; + /* public void vamsasStore_actionPerformed(ActionEvent e) + { + JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache. + getProperty("LAST_DIRECTORY")); - for (int i = 0; i < sz; i++) - { - msa[i] = (SequenceI) seqs.getSequenceAt(i); - } - } - else - { - Vector seqs = viewport.getAlignment().getSequences(); - - if (seqs.size() > 1) - { - msa = new SequenceI[seqs.size()]; + chooser.setFileView(new JalviewFileView()); + chooser.setDialogTitle("Export to Vamsas file"); + chooser.setToolTipText("Export"); - for (int i = 0; i < seqs.size(); i++) - { - msa[i] = (SequenceI) seqs.elementAt(i); - } - } - } + int value = chooser.showSaveDialog(this); - if (msa != null) - { - jalview.ws.MsaWSClient ct = new jalview.ws.MsaWSClient("ClustalWS", - title, msa, true, true); - } + if (value == JalviewFileChooser.APPROVE_OPTION) + { + jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport); + //vs.store(chooser.getSelectedFile().getAbsolutePath() ); + vs.storeJalview( chooser.getSelectedFile().getAbsolutePath(), this); } + }*/ - /** - * DOCUMENT ME! - * - * @param e DOCUMENT ME! - */ - protected void jpred_actionPerformed(ActionEvent e) - { - SequenceI seq = null; - SequenceI[] msa = null; + public void featureSettings_actionPerformed(ActionEvent e) + { + new FeatureSettings(viewport, alignPanel); + } - if ((viewport.getSelectionGroup() != null) && - (viewport.getSelectionGroup().getSize() > 0)) - { - // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! - SequenceGroup seqs = viewport.getSelectionGroup(); - if ((seqs.getSize() == 1) || !viewport.alignment.isAligned()) - { - seq = (SequenceI) seqs.getSequenceAt(0); - } - else - { - int sz; - msa = new SequenceI[sz = seqs.getSize()]; - for (int i = 0; i < sz; i++) - { - msa[i] = (SequenceI) seqs.getSequenceAt(i); - } - } - } - else - { - Vector seqs = viewport.getAlignment().getSequences(); +public void showTranslation_actionPerformed(ActionEvent e) +{ + int s, sSize = viewport.alignment.getHeight(); + SequenceI [] newSeq = new SequenceI[sSize]; + + int res, resSize; + StringBuffer protein; + String seq; + for(s=0; s 1)) - { - // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface! - SequenceGroup seqs = viewport.getSelectionGroup(); - int sz; - msa = new SequenceI[sz = seqs.getSize()]; + if (annotations[i].label.equals("Quality") || + annotations[i].label.equals("Conservation") || + annotations[i].label.equals("Consensus")) + { + continue; + } - for (int i = 0; i < sz; i++) - { - msa[i] = (SequenceI) seqs.getSequenceAt(i); - } - } - else - { - Vector seqs = viewport.getAlignment().getSequences(); - if (seqs.size() > 1) - { - msa = new SequenceI[seqs.size()]; + aSize = viewport.alignment.getWidth()/3; + jalview.datamodel.Annotation [] anots = + new jalview.datamodel.Annotation[aSize]; - for (int i = 0; i < seqs.size(); i++) - { - msa[i] = (SequenceI) seqs.elementAt(i); - } - } - } + for(a=0; a