X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=d11bd3109ebaa5452e92f78c658a1c660560ec6e;hb=260c50cca8fff9b7e15e311dfc9fd9dda685950b;hp=ef228dfd3f1841050edcc24bc0dace48835ce5e3;hpb=f4fd7b0e74572c8fddbfe9e3e55bc624f8ba0c6a;p=jalview.git
diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
old mode 100755
new mode 100644
index ef228df..d11bd31
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1,154 +1,618 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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 Softwarechang
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-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 javax.swing.*;
-
-import jalview.analysis.*;
-import jalview.datamodel.*;
-import jalview.io.*;
-import jalview.jbgui.*;
-import jalview.schemes.*;
-import jalview.util.ShiftList;
-import jalview.ws.*;
-import java.awt.dnd.*;
-import org.biojava.dasobert.eventmodel.*;
+import jalview.analysis.AAFrequency;
+import jalview.analysis.AlignmentSorter;
+import jalview.analysis.Conservation;
+import jalview.analysis.CrossRef;
+import jalview.analysis.NJTree;
+import jalview.analysis.ParseProperties;
+import jalview.analysis.SequenceIdMatcher;
+import jalview.api.AlignViewControllerGuiI;
+import jalview.api.AlignViewControllerI;
+import jalview.bin.Cache;
+import jalview.commands.CommandI;
+import jalview.commands.EditCommand;
+import jalview.commands.OrderCommand;
+import jalview.commands.RemoveGapColCommand;
+import jalview.commands.RemoveGapsCommand;
+import jalview.commands.SlideSequencesCommand;
+import jalview.commands.TrimRegionCommand;
+import jalview.datamodel.AlignedCodonFrame;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentAnnotation;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.AlignmentOrder;
+import jalview.datamodel.AlignmentView;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SeqCigar;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.io.AlignmentProperties;
+import jalview.io.AnnotationFile;
+import jalview.io.FeaturesFile;
+import jalview.io.FileLoader;
+import jalview.io.FormatAdapter;
+import jalview.io.HTMLOutput;
+import jalview.io.IdentifyFile;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.io.JnetAnnotationMaker;
+import jalview.io.NewickFile;
+import jalview.io.TCoffeeScoreFile;
+import jalview.jbgui.GAlignFrame;
+import jalview.schemes.Blosum62ColourScheme;
+import jalview.schemes.BuriedColourScheme;
+import jalview.schemes.ClustalxColourScheme;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.HelixColourScheme;
+import jalview.schemes.HydrophobicColourScheme;
+import jalview.schemes.NucleotideColourScheme;
+import jalview.schemes.PIDColourScheme;
+import jalview.schemes.PurinePyrimidineColourScheme;
+import jalview.schemes.RNAHelicesColourChooser;
+import jalview.schemes.ResidueProperties;
+import jalview.schemes.StrandColourScheme;
+import jalview.schemes.TCoffeeColourScheme;
+import jalview.schemes.TaylorColourScheme;
+import jalview.schemes.TurnColourScheme;
+import jalview.schemes.UserColourScheme;
+import jalview.schemes.ZappoColourScheme;
+import jalview.util.MessageManager;
+import jalview.ws.jws1.Discoverer;
+import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.seqfetcher.DbSourceProxy;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.GridLayout;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.dnd.DnDConstants;
+import java.awt.dnd.DropTargetDragEvent;
+import java.awt.dnd.DropTargetDropEvent;
+import java.awt.dnd.DropTargetEvent;
+import java.awt.dnd.DropTargetListener;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.print.PageFormat;
+import java.awt.print.PrinterJob;
+import java.beans.PropertyChangeEvent;
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Vector;
+
+import javax.swing.JButton;
+import javax.swing.JEditorPane;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JProgressBar;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
/**
* DOCUMENT ME!
- *
+ *
* @author $author$
* @version $Revision$
*/
-public class AlignFrame
- extends GAlignFrame implements DropTargetListener, FeatureListener
+public class AlignFrame extends GAlignFrame implements DropTargetListener,
+ IProgressIndicator, AlignViewControllerGuiI
{
+
/** DOCUMENT ME!! */
- public static final int NEW_WINDOW_WIDTH = 700;
+ public static final int DEFAULT_WIDTH = 700;
/** DOCUMENT ME!! */
- public static final int NEW_WINDOW_HEIGHT = 500;
- AlignmentPanel alignPanel;
+ public static final int DEFAULT_HEIGHT = 500;
+
+ public AlignmentPanel alignPanel;
+
AlignViewport viewport;
+
+ public AlignViewControllerI avc;
+
- /** DOCUMENT ME!! */
- public String currentFileFormat = null;
- Stack historyList = new Stack();
- Stack redoList = new Stack();
- private int treeCount = 0;
+ Vector alignPanels = new Vector();
+
+ /**
+ * Last format used to load or save alignments in this window
+ */
+ String currentFileFormat = null;
+
+ /**
+ * Current filename for this alignment
+ */
+ String fileName = null;
+
+ /**
+ * Creates a new AlignFrame object with specific width and height.
+ *
+ * @param al
+ * @param width
+ * @param height
+ */
+ public AlignFrame(AlignmentI al, int width, int height)
+ {
+ this(al, null, width, height);
+ }
+
+ /**
+ * Creates a new AlignFrame object with specific width, height and
+ * sequenceSetId
+ *
+ * @param al
+ * @param width
+ * @param height
+ * @param sequenceSetId
+ */
+ public AlignFrame(AlignmentI al, int width, int height,
+ String sequenceSetId)
+ {
+ this(al, null, width, height, sequenceSetId);
+ }
+
+ /**
+ * Creates a new AlignFrame object with specific width, height and
+ * sequenceSetId
+ *
+ * @param al
+ * @param width
+ * @param height
+ * @param sequenceSetId
+ * @param viewId
+ */
+ public AlignFrame(AlignmentI al, int width, int height,
+ String sequenceSetId, String viewId)
+ {
+ this(al, null, width, height, sequenceSetId, viewId);
+ }
/**
* new alignment window with hidden columns
- * @param al AlignmentI
- * @param hiddenColumns ColumnSelection or null
+ *
+ * @param al
+ * AlignmentI
+ * @param hiddenColumns
+ * ColumnSelection or null
+ * @param width
+ * Width of alignment frame
+ * @param height
+ * height of frame.
+ */
+ public AlignFrame(AlignmentI al, ColumnSelection hiddenColumns,
+ int width, int height)
+ {
+ this(al, hiddenColumns, width, height, null);
+ }
+
+ /**
+ * Create alignment frame for al with hiddenColumns, a specific width and
+ * height, and specific sequenceId
+ *
+ * @param al
+ * @param hiddenColumns
+ * @param width
+ * @param height
+ * @param sequenceSetId
+ * (may be null)
+ */
+ public AlignFrame(AlignmentI al, ColumnSelection hiddenColumns,
+ int width, int height, String sequenceSetId)
+ {
+ this(al, hiddenColumns, width, height, sequenceSetId, null);
+ }
+
+ /**
+ * Create alignment frame for al with hiddenColumns, a specific width and
+ * height, and specific sequenceId
+ *
+ * @param al
+ * @param hiddenColumns
+ * @param width
+ * @param height
+ * @param sequenceSetId
+ * (may be null)
+ * @param viewId
+ * (may be null)
*/
- public AlignFrame(AlignmentI al, ColumnSelection hiddenColumns) {
+ public AlignFrame(AlignmentI al, ColumnSelection hiddenColumns,
+ int width, int height, String sequenceSetId, String viewId)
+ {
+ setSize(width, height);
+ viewport = new AlignViewport(al, hiddenColumns, sequenceSetId, viewId);
+
+ alignPanel = new AlignmentPanel(this, viewport);
+
+ if (al.getDataset() == null)
+ {
+ al.setDataset(null);
+ }
- viewport = new AlignViewport(al, hiddenColumns);
+ addAlignmentPanel(alignPanel, true);
+ init();
+ }
- this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
+ /**
+ * Make a new AlignFrame from exisiting alignmentPanels
+ *
+ * @param ap
+ * AlignmentPanel
+ * @param av
+ * AlignViewport
+ */
+ public AlignFrame(AlignmentPanel ap)
+ {
+ viewport = ap.av;
+ alignPanel = ap;
+ addAlignmentPanel(ap, false);
+ init();
+ }
- if(viewport.vconsensus==null)
+ /**
+ * initalise the alignframe from the underlying viewport data and the
+ * configurations
+ */
+ void init()
+ {
+ avc = new jalview.controller.AlignViewController(this, viewport, alignPanel);
+ if (viewport.getAlignmentConservationAnnotation() == null)
{
- //Out of memory calculating consensus.
BLOSUM62Colour.setEnabled(false);
- PIDColour.setEnabled(false);
conservationMenuItem.setEnabled(false);
modifyConservation.setEnabled(false);
- abovePIDThreshold.setEnabled(false);
- modifyPID.setEnabled(false);
+ // PIDColour.setEnabled(false);
+ // abovePIDThreshold.setEnabled(false);
+ // modifyPID.setEnabled(false);
}
- alignPanel = new AlignmentPanel(this, viewport);
-
- String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort");
+ String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT",
+ "No sort");
- if(sortby.equals("Id"))
+ if (sortby.equals("Id"))
+ {
sortIDMenuItem_actionPerformed(null);
- else if(sortby.equals("Pairwise Identity"))
+ }
+ else if (sortby.equals("Pairwise Identity"))
+ {
sortPairwiseMenuItem_actionPerformed(null);
+ }
- // remove(tabbedPane);
- getContentPane().add(alignPanel, BorderLayout.CENTER);
-
-
+ if (Desktop.desktop != null)
+ {
+ this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
+ addServiceListeners();
+ setGUINucleotide(viewport.getAlignment().isNucleotide());
+ }
- // tabbedPane.add(al.isNucleotide() ? "DNA":"Protein", alignPanel);
+ setMenusFromViewport(viewport);
+ buildSortByAnnotationScoresMenu();
+ if (viewport.wrapAlignment)
+ {
+ wrapMenuItem_actionPerformed(null);
+ }
- ///Dataset tab
- /////////////////////////
- if(al.getDataset()==null)
+ if (jalview.bin.Cache.getDefault("SHOW_OVERVIEW", false))
{
- al.setDataset(null);
+ this.overviewMenuItem_actionPerformed(null);
}
- // AlignViewport ds = new AlignViewport(al.getDataset(), true);
- // AlignmentPanel dap = new AlignmentPanel(this, ds);
- // tabbedPane.add("Dataset", dap);
- // viewports.add(ds);
- // alignPanels.add(dap);
- /////////////////////////
+ addKeyListener();
+
+ }
+
+ /**
+ * Change the filename and format for the alignment, and enable the 'reload'
+ * button functionality.
+ *
+ * @param file
+ * valid filename
+ * @param format
+ * format of file
+ */
+ public void setFileName(String file, String format)
+ {
+ fileName = file;
+ currentFileFormat = format;
+ reload.setEnabled(true);
+ }
- viewport.addPropertyChangeListener(new PropertyChangeListener()
+ void addKeyListener()
+ {
+ addKeyListener(new KeyAdapter()
{
- public void propertyChange(PropertyChangeEvent evt)
- {
- if (evt.getPropertyName().equals("alignment"))
- {
- alignmentChanged();
- }
- }
- });
+ @Override
+ public void keyPressed(KeyEvent evt)
+ {
+ if (viewport.cursorMode
+ && ((evt.getKeyCode() >= KeyEvent.VK_0 && evt.getKeyCode() <= KeyEvent.VK_9) || (evt
+ .getKeyCode() >= KeyEvent.VK_NUMPAD0 && evt
+ .getKeyCode() <= KeyEvent.VK_NUMPAD9))
+ && Character.isDigit(evt.getKeyChar()))
+ alignPanel.seqPanel.numberPressed(evt.getKeyChar());
+
+ switch (evt.getKeyCode())
+ {
+ case 27: // escape key
+ deselectAllSequenceMenuItem_actionPerformed(null);
- if (Desktop.desktop != null)
+ break;
+
+ case KeyEvent.VK_DOWN:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ moveSelectedSequences(false);
+ if (viewport.cursorMode)
+ alignPanel.seqPanel.moveCursor(0, 1);
+ break;
+
+ case KeyEvent.VK_UP:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ moveSelectedSequences(true);
+ if (viewport.cursorMode)
+ alignPanel.seqPanel.moveCursor(0, -1);
+
+ break;
+
+ case KeyEvent.VK_LEFT:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ slideSequences(false, alignPanel.seqPanel.getKeyboardNo1());
+ else
+ alignPanel.seqPanel.moveCursor(-1, 0);
+
+ break;
+
+ case KeyEvent.VK_RIGHT:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ slideSequences(true, alignPanel.seqPanel.getKeyboardNo1());
+ else
+ alignPanel.seqPanel.moveCursor(1, 0);
+ break;
+
+ case KeyEvent.VK_SPACE:
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()
+ || evt.isShiftDown() || evt.isAltDown());
+ }
+ break;
+
+ // case KeyEvent.VK_A:
+ // if (viewport.cursorMode)
+ // {
+ // alignPanel.seqPanel.insertNucAtCursor(false,"A");
+ // //System.out.println("A");
+ // }
+ // break;
+ /*
+ * case KeyEvent.VK_CLOSE_BRACKET: if (viewport.cursorMode) {
+ * System.out.println("closing bracket"); } break;
+ */
+ case KeyEvent.VK_DELETE:
+ case KeyEvent.VK_BACK_SPACE:
+ if (!viewport.cursorMode)
+ {
+ cut_actionPerformed(null);
+ }
+ else
+ {
+ alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
+ || evt.isShiftDown() || evt.isAltDown());
+ }
+
+ break;
+
+ case KeyEvent.VK_S:
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.setCursorRow();
+ }
+ break;
+ case KeyEvent.VK_C:
+ if (viewport.cursorMode && !evt.isControlDown())
+ {
+ alignPanel.seqPanel.setCursorColumn();
+ }
+ break;
+ case KeyEvent.VK_P:
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.setCursorPosition();
+ }
+ break;
+
+ case KeyEvent.VK_ENTER:
+ case KeyEvent.VK_COMMA:
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.setCursorRowAndColumn();
+ }
+ break;
+
+ case KeyEvent.VK_Q:
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.setSelectionAreaAtCursor(true);
+ }
+ break;
+ case KeyEvent.VK_M:
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.setSelectionAreaAtCursor(false);
+ }
+ break;
+
+ case KeyEvent.VK_F2:
+ viewport.cursorMode = !viewport.cursorMode;
+ statusBar.setText(MessageManager.formatMessage("label.keyboard_editing_mode", new String[]{(viewport.cursorMode ? "on" : "off")}));
+ if (viewport.cursorMode)
+ {
+ alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes;
+ alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq;
+ }
+ alignPanel.seqPanel.seqCanvas.repaint();
+ break;
+
+ case KeyEvent.VK_F1:
+ try
+ {
+ ClassLoader cl = jalview.gui.Desktop.class.getClassLoader();
+ java.net.URL url = javax.help.HelpSet.findHelpSet(cl,
+ "help/help");
+ javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
+
+ javax.help.HelpBroker hb = hs.createHelpBroker();
+ hb.setCurrentID("home");
+ hb.setDisplayed(true);
+ } catch (Exception ex)
+ {
+ ex.printStackTrace();
+ }
+ break;
+ case KeyEvent.VK_H:
+ {
+ boolean toggleSeqs = !evt.isControlDown();
+ boolean toggleCols = !evt.isShiftDown();
+ toggleHiddenRegions(toggleSeqs, toggleCols);
+ break;
+ }
+ case KeyEvent.VK_PAGE_UP:
+ if (viewport.wrapAlignment)
+ {
+ alignPanel.scrollUp(true);
+ }
+ else
+ {
+ alignPanel.setScrollValues(viewport.startRes, viewport.startSeq
+ - viewport.endSeq + viewport.startSeq);
+ }
+ break;
+ case KeyEvent.VK_PAGE_DOWN:
+ if (viewport.wrapAlignment)
+ {
+ alignPanel.scrollUp(false);
+ }
+ else
+ {
+ alignPanel.setScrollValues(viewport.startRes, viewport.startSeq
+ + viewport.endSeq - viewport.startSeq);
+ }
+ break;
+ }
+ }
+
+ @Override
+ public void keyReleased(KeyEvent evt)
+ {
+ switch (evt.getKeyCode())
+ {
+ case KeyEvent.VK_LEFT:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ viewport.firePropertyChange("alignment", null, viewport
+ .getAlignment().getSequences());
+ break;
+
+ case KeyEvent.VK_RIGHT:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ viewport.firePropertyChange("alignment", null, viewport
+ .getAlignment().getSequences());
+ break;
+ }
+ }
+ });
+ }
+
+ public void addAlignmentPanel(final AlignmentPanel ap, boolean newPanel)
+ {
+ ap.alignFrame = this;
+ avc = new jalview.controller.AlignViewController(this, viewport, alignPanel);
+
+ alignPanels.addElement(ap);
+
+ PaintRefresher.Register(ap, ap.av.getSequenceSetId());
+
+ int aSize = alignPanels.size();
+
+ tabbedPane.setVisible(aSize > 1 || ap.av.viewName != null);
+
+ if (aSize == 1 && ap.av.viewName == null)
{
- addServiceListeners();
- setGUINucleotide(al.isNucleotide());
+ this.getContentPane().add(ap, BorderLayout.CENTER);
}
+ else
+ {
+ if (aSize == 2)
+ {
+ setInitialTabVisible();
+ }
+ expandViews.setEnabled(true);
+ gatherViews.setEnabled(true);
+ tabbedPane.addTab(ap.av.viewName, ap);
- if (jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false))
- {
- wrapMenuItem.setSelected(true);
- wrapMenuItem_actionPerformed(null);
+ ap.setVisible(false);
}
+ if (newPanel)
+ {
+ if (ap.av.isPadGaps())
+ {
+ ap.av.getAlignment().padGaps();
+ }
+ ap.av.updateConservation(ap);
+ ap.av.updateConsensus(ap);
+ ap.av.updateStrucConsensus(ap);
+ }
}
-
- /**
- * Creates a new AlignFrame object.
- *
- * @param al DOCUMENT ME!
- */
- public AlignFrame(AlignmentI al)
+ public void setInitialTabVisible()
{
- this(al, null);
+ expandViews.setEnabled(true);
+ gatherViews.setEnabled(true);
+ tabbedPane.setVisible(true);
+ AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
+ tabbedPane.addTab(first.av.viewName, first);
+ this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
}
public AlignViewport getViewport()
@@ -160,81 +624,165 @@ public class AlignFrame
private void addServiceListeners()
{
final java.beans.PropertyChangeListener thisListener;
- // Do this once to get current state
- BuildWebServiceMenu();
- Desktop.discoverer.addPropertyChangeListener(
- thisListener = new java.beans.PropertyChangeListener()
+ Desktop.instance.addJalviewPropertyChangeListener("services",
+ thisListener = new java.beans.PropertyChangeListener()
+ {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt)
+ {
+ // // System.out.println("Discoverer property change.");
+ // if (evt.getPropertyName().equals("services"))
+ {
+ SwingUtilities.invokeLater(new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ System.err
+ .println("Rebuild WS Menu for service change");
+ BuildWebServiceMenu();
+ }
+
+ });
+ }
+ }
+ });
+ addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
{
- public void propertyChange(PropertyChangeEvent evt)
+ @Override
+ public void internalFrameClosed(
+ javax.swing.event.InternalFrameEvent evt)
{
- // System.out.println("Discoverer property change.");
- if (evt.getPropertyName().equals("services"))
- {
- // System.out.println("Rebuilding web service menu");
- BuildWebServiceMenu();
- }
- }
+ System.out.println("deregistering discoverer listener");
+ Desktop.instance.removeJalviewPropertyChangeListener("services",
+ thisListener);
+ closeMenuItem_actionPerformed(true);
+ };
});
- addInternalFrameListener(new javax.swing.event.
- InternalFrameAdapter()
+ // Finally, build the menu once to get current service state
+ new Thread(new Runnable()
{
- public void internalFrameClosed(
- javax.swing.event.InternalFrameEvent evt)
+ @Override
+ public void run()
{
- // System.out.println("deregistering discoverer listener");
- Desktop.discoverer.removePropertyChangeListener(thisListener);
- closeMenuItem_actionPerformed(null);
+ BuildWebServiceMenu();
}
- ;
- });
+ }).start();
}
public void setGUINucleotide(boolean nucleotide)
{
- showTranslation.setVisible( nucleotide );
- //sequenceFeatures.setVisible(!nucleotide );
- //featureSettings.setVisible( !nucleotide );
- conservationMenuItem.setVisible( !nucleotide );
- modifyConservation.setVisible( !nucleotide );
-
- //Remember AlignFrame always starts as protein
- if(!nucleotide)
- {
- calculateMenu.remove(calculateMenu.getItemCount()-2);
- }
+ showTranslation.setVisible(nucleotide);
+ conservationMenuItem.setEnabled(!nucleotide);
+ modifyConservation.setEnabled(!nucleotide);
+ showGroupConservation.setEnabled(!nucleotide);
+ rnahelicesColour.setEnabled(nucleotide);
+ purinePyrimidineColour.setEnabled(nucleotide);
+ // Remember AlignFrame always starts as protein
+ // if (!nucleotide)
+ // {
+ // showTr
+ // calculateMenu.remove(calculateMenu.getItemCount() - 2);
+ // }
}
- public void comeBackLater(FeatureEvent evt)
- {}
+ /**
+ * set up menus for the currently viewport. This may be called after any
+ * operation that affects the data in the current view (selection changed,
+ * etc) to update the menus to reflect the new state.
+ */
+ public void setMenusForViewport()
+ {
+ setMenusFromViewport(viewport);
+ }
- public void newFeatures(FeatureEvent evt)
+ /**
+ * Need to call this method when tabs are selected for multiple views, or when
+ * loading from Jalview2XML.java
+ *
+ * @param av
+ * AlignViewport
+ */
+ void setMenusFromViewport(AlignViewport av)
{
- if (evt.getFeatures().length > 0)
- {
- alignPanel.seqPanel.seqCanvas.fr.featuresAdded();
- alignPanel.repaint();
- }
+ padGapsMenuitem.setSelected(av.isPadGaps());
+ colourTextMenuItem.setSelected(av.showColourText);
+ abovePIDThreshold.setSelected(av.getAbovePIDThreshold());
+ conservationMenuItem.setSelected(av.getConservationSelected());
+ seqLimits.setSelected(av.getShowJVSuffix());
+ idRightAlign.setSelected(av.rightAlignIds);
+ centreColumnLabelsMenuItem.setState(av.centreColumnLabels);
+ renderGapsMenuItem.setSelected(av.renderGaps);
+ wrapMenuItem.setSelected(av.wrapAlignment);
+ scaleAbove.setVisible(av.wrapAlignment);
+ scaleLeft.setVisible(av.wrapAlignment);
+ scaleRight.setVisible(av.wrapAlignment);
+ annotationPanelMenuItem.setState(av.showAnnotation);
+ viewBoxesMenuItem.setSelected(av.showBoxes);
+ viewTextMenuItem.setSelected(av.showText);
+ showNonconservedMenuItem.setSelected(av.getShowUnconserved());
+ showGroupConsensus.setSelected(av.isShowGroupConsensus());
+ showGroupConservation.setSelected(av.isShowGroupConservation());
+ showConsensusHistogram.setSelected(av.isShowConsensusHistogram());
+ showSequenceLogo.setSelected(av.isShowSequenceLogo());
+ normaliseSequenceLogo.setSelected(av.isNormaliseSequenceLogo());
+
+ setColourSelected(ColourSchemeProperty.getColourName(av
+ .getGlobalColourScheme()));
+
+ showSeqFeatures.setSelected(av.showSequenceFeatures);
+ hiddenMarkers.setState(av.showHiddenMarkers);
+ applyToAllGroups.setState(av.getColourAppliesToAllGroups());
+ showNpFeatsMenuitem.setSelected(av.isShowNpFeats());
+ showDbRefsMenuitem.setSelected(av.isShowDbRefs());
+ autoCalculate.setSelected(av.autoCalculateConsensus);
+ sortByTree.setSelected(av.sortByTree);
+ listenToViewSelections.setSelected(av.followSelection);
+ rnahelicesColour.setEnabled(av.getAlignment().hasRNAStructure());
+ rnahelicesColour
+ .setSelected(av.getGlobalColourScheme() instanceof jalview.schemes.RNAHelicesColour);
+ setShowProductsEnabled();
+ updateEditMenuBar();
}
- Hashtable progressBars;
+ // methods for implementing IProgressIndicator
+ // need to refactor to a reusable stub class
+ Hashtable progressBars, progressBarHandlers;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.gui.IProgressIndicator#setProgressBar(java.lang.String, long)
+ */
+ @Override
public void setProgressBar(String message, long id)
{
- if(progressBars == null)
+ if (progressBars == null)
+ {
progressBars = new Hashtable();
+ progressBarHandlers = new Hashtable();
+ }
JPanel progressPanel;
+ Long lId = new Long(id);
GridLayout layout = (GridLayout) statusPanel.getLayout();
- if(progressBars.get( new Long(id) )!=null)
- {
- progressPanel = (JPanel)progressBars.get( new Long(id) );
- statusPanel.remove(progressPanel);
- progressBars.remove( progressPanel );
- progressPanel = null;
- if(message!=null)
- statusBar.setText(message);
-
- layout.setRows(layout.getRows() - 1);
- }
+ if (progressBars.get(lId) != null)
+ {
+ progressPanel = (JPanel) progressBars.get(new Long(id));
+ statusPanel.remove(progressPanel);
+ progressBars.remove(lId);
+ progressPanel = null;
+ if (message != null)
+ {
+ statusBar.setText(message);
+ }
+ if (progressBarHandlers.contains(lId))
+ {
+ progressBarHandlers.remove(lId);
+ }
+ layout.setRows(layout.getRows() - 1);
+ }
else
{
progressPanel = new JPanel(new BorderLayout(10, 5));
@@ -248,19 +796,69 @@ public class AlignFrame
layout.setRows(layout.getRows() + 1);
statusPanel.add(progressPanel);
- progressBars.put(new Long(id), progressPanel);
+ progressBars.put(lId, progressPanel);
}
-
+ // update GUI
+ // setMenusForViewport();
validate();
}
+ @Override
+ public void registerHandler(final long id,
+ final IProgressIndicatorHandler handler)
+ {
+ if (progressBarHandlers == null || !progressBars.contains(new Long(id)))
+ {
+ throw new Error(
+ "call setProgressBar before registering the progress bar's handler.");
+ }
+ progressBarHandlers.put(new Long(id), handler);
+ final JPanel progressPanel = (JPanel) progressBars.get(new Long(id));
+ if (handler.canCancel())
+ {
+ JButton cancel = new JButton(MessageManager.getString("action.cancel"));
+ final IProgressIndicator us = this;
+ cancel.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ handler.cancelActivity(id);
+ us.setProgressBar(
+ "Cancelled "
+ + ((JLabel) progressPanel.getComponent(0))
+ .getText(), id);
+ }
+ });
+ progressPanel.add(cancel, BorderLayout.EAST);
+ }
+ }
+
+ /**
+ *
+ * @return true if any progress bars are still active
+ */
+ @Override
+ public boolean operationInProgress()
+ {
+ if (progressBars != null && progressBars.size() > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ @Override
+ public void setStatus(String text) {
+ statusBar.setText(text);
+ };
/*
- Added so Castor Mapping file can obtain Jalview Version
- */
+ * Added so Castor Mapping file can obtain Jalview Version
+ */
public String getVersion()
{
- return jalview.bin.Cache.getProperty("VERSION");
+ return jalview.bin.Cache.getProperty("VERSION");
}
public FeatureRenderer getFeatureRenderer()
@@ -268,181 +866,320 @@ public class AlignFrame
return alignPanel.seqPanel.seqCanvas.getFeatureRenderer();
}
-
+ @Override
public void fetchSequence_actionPerformed(ActionEvent e)
{
new SequenceFetcher(this);
}
+ @Override
public void addFromFile_actionPerformed(ActionEvent e)
{
Desktop.instance.inputLocalFileMenuItem_actionPerformed(viewport);
}
+ @Override
+ public void reload_actionPerformed(ActionEvent e)
+ {
+ if (fileName != null)
+ {
+ // TODO: JAL-1108 - ensure all associated frames are closed regardless of
+ // originating file's format
+ // TODO: work out how to recover feature settings for correct view(s) when
+ // file is reloaded.
+ if (currentFileFormat.equals("Jalview"))
+ {
+ JInternalFrame[] frames = Desktop.desktop.getAllFrames();
+ for (int i = 0; i < frames.length; i++)
+ {
+ if (frames[i] instanceof AlignFrame && frames[i] != this
+ && ((AlignFrame) frames[i]).fileName != null
+ && ((AlignFrame) frames[i]).fileName.equals(fileName))
+ {
+ try
+ {
+ frames[i].setSelected(true);
+ Desktop.instance.closeAssociatedWindows();
+ } catch (java.beans.PropertyVetoException ex)
+ {
+ }
+ }
+
+ }
+ Desktop.instance.closeAssociatedWindows();
+
+ FileLoader loader = new FileLoader();
+ String protocol = fileName.startsWith("http:") ? "URL" : "File";
+ loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
+ }
+ else
+ {
+ Rectangle bounds = this.getBounds();
+
+ FileLoader loader = new FileLoader();
+ String protocol = fileName.startsWith("http:") ? "URL" : "File";
+ AlignFrame newframe = loader.LoadFileWaitTillLoaded(fileName,
+ protocol, currentFileFormat);
+
+ newframe.setBounds(bounds);
+ if (featureSettings != null && featureSettings.isShowing())
+ {
+ final Rectangle fspos = featureSettings.frame.getBounds();
+ // TODO: need a 'show feature settings' function that takes bounds -
+ // need to refactor Desktop.addFrame
+ newframe.featureSettings_actionPerformed(null);
+ final FeatureSettings nfs = newframe.featureSettings;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ nfs.frame.setBounds(fspos);
+ }
+ });
+ this.featureSettings.close();
+ this.featureSettings = null;
+ }
+ this.closeMenuItem_actionPerformed(true);
+ }
+ }
+ }
+
+ @Override
public void addFromText_actionPerformed(ActionEvent e)
{
Desktop.instance.inputTextboxMenuItem_actionPerformed(viewport);
}
+ @Override
public void addFromURL_actionPerformed(ActionEvent e)
{
Desktop.instance.inputURLMenuItem_actionPerformed(viewport);
}
+ @Override
+ public void save_actionPerformed(ActionEvent e)
+ {
+ if (fileName == null
+ || (currentFileFormat == null || !jalview.io.FormatAdapter
+ .isValidIOFormat(currentFileFormat, true))
+ || fileName.startsWith("http"))
+ {
+ saveAs_actionPerformed(null);
+ }
+ else
+ {
+ saveAlignment(fileName, currentFileFormat);
+ }
+ }
+
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
- public void saveAlignmentMenu_actionPerformed(ActionEvent e)
+ @Override
+ public void saveAs_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,
- false);
-
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+ jalview.io.AppletFormatAdapter.WRITABLE_EXTENSIONS,
+ jalview.io.AppletFormatAdapter.WRITABLE_FNAMES,
+ currentFileFormat, false);
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle("Save Alignment to file");
- chooser.setToolTipText("Save");
+ chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
- currentFileFormat = chooser.getSelectedFormat();
+ currentFileFormat = chooser.getSelectedFormat();
+ if (currentFileFormat == null)
+ {
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
+ MessageManager.getString("label.select_file_format_before_saving"),
+ MessageManager.getString("label.file_format_not_specified"), JOptionPane.WARNING_MESSAGE);
+ value = chooser.showSaveDialog(this);
+ return;
+ }
- 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;
- }
+ fileName = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT",
- currentFileFormat);
-
- String choice = chooser.getSelectedFile().getPath();
- jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
+ currentFileFormat);
- saveAlignment(choice, currentFileFormat);
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY", fileName);
+ if (currentFileFormat.indexOf(" ") > -1)
+ {
+ currentFileFormat = currentFileFormat.substring(0,
+ currentFileFormat.indexOf(" "));
+ }
+ saveAlignment(fileName, currentFileFormat);
}
}
public boolean saveAlignment(String file, String format)
{
+ boolean success = true;
+
if (format.equalsIgnoreCase("Jalview"))
{
String shortName = title;
if (shortName.indexOf(java.io.File.separatorChar) > -1)
{
- shortName = shortName.substring(shortName.lastIndexOf(
- java.io.File.separatorChar) + 1);
+ shortName = shortName.substring(shortName
+ .lastIndexOf(java.io.File.separatorChar) + 1);
}
- new Jalview2XML().SaveAlignment(this, file, shortName);
+ success = new Jalview2XML().SaveAlignment(this, file, shortName);
+
+ statusBar.setText(MessageManager.formatMessage("label.successfully_saved_to_file_in_format",new String[]{fileName, format}));
+
- // USE Jalview2XML to save this file
- return true;
}
else
{
+ if (!jalview.io.AppletFormatAdapter.isValidFormat(format, true))
+ {
+ warningMessage("Cannot save file " + fileName + " using format "
+ + format, "Alignment output format not supported");
+ saveAs_actionPerformed(null);
+ // JBPNote need to have a raise_gui flag here
+ return false;
+ }
String[] omitHidden = null;
- if (viewport.hasHiddenColumns)
+ if (viewport.hasHiddenColumns())
{
- int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- "The Alignment contains hidden columns."
- + "\nDo you want to save only the visible alignment?",
- "Save / Omit Hidden Columns",
- JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+ int reply = JOptionPane
+ .showInternalConfirmDialog(
+ Desktop.desktop,
+ MessageManager.getString("label.alignment_contains_hidden_columns"),
+ MessageManager.getString("action.save_omit_hidden_columns"),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
if (reply == JOptionPane.YES_OPTION)
+ {
omitHidden = viewport.getViewAsString(false);
+ }
}
-
- String output = new FormatAdapter().formatSequences(
- format,
- viewport.alignment.getSequencesArray(),
- omitHidden);
+ FormatAdapter f = new FormatAdapter();
+ String output = f.formatSequences(format,
+ viewport.getAlignment(), // class cast exceptions will
+ // occur in the distant future
+ omitHidden, f.getCacheSuffixDefault(format),
+ viewport.getColumnSelection());
if (output == null)
{
- return false;
- }
-
- try
- {
- java.io.PrintWriter out = new java.io.PrintWriter(
- new java.io.FileWriter(file));
-
- out.print(output);
- out.close();
- this.setTitle(file);
- return true;
+ success = false;
}
- catch (Exception ex)
+ else
{
- ex.printStackTrace();
+ try
+ {
+ java.io.PrintWriter out = new java.io.PrintWriter(
+ new java.io.FileWriter(file));
+
+ out.print(output);
+ out.close();
+ this.setTitle(file);
+ statusBar.setText(MessageManager.formatMessage("label.successfully_saved_to_file_in_format",new String[]{fileName, format}));
+ } catch (Exception ex)
+ {
+ success = false;
+ ex.printStackTrace();
+ }
}
}
- return false;
+
+ if (!success)
+ {
+ JOptionPane.showInternalMessageDialog(this, MessageManager.formatMessage("label.couldnt_save_file", new String[]{fileName}),
+ MessageManager.getString("label.error_saving_file"), JOptionPane.WARNING_MESSAGE);
+ }
+
+ return success;
+ }
+
+ private void warningMessage(String warning, String title)
+ {
+ if (new jalview.util.Platform().isHeadless())
+ {
+ System.err.println("Warning: " + title + "\nWarning: " + warning);
+
+ }
+ else
+ {
+ JOptionPane.showInternalMessageDialog(this, warning, title,
+ JOptionPane.WARNING_MESSAGE);
+ }
+ return;
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void outputText_actionPerformed(ActionEvent e)
{
- String [] omitHidden = null;
+ String[] omitHidden = null;
- if(viewport.hasHiddenColumns)
+ if (viewport.hasHiddenColumns())
{
- int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,
- "The Alignment contains hidden columns."
- +"\nDo you want to output only the visible alignment?",
- "Save / Omit Hidden Columns",
- JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-
- if(reply==JOptionPane.YES_OPTION)
+ int reply = JOptionPane
+ .showInternalConfirmDialog(
+ Desktop.desktop,
+ MessageManager.getString("label.alignment_contains_hidden_columns"),
+ MessageManager.getString("action.save_omit_hidden_columns"),
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+
+ if (reply == JOptionPane.YES_OPTION)
{
omitHidden = viewport.getViewAsString(false);
}
}
CutAndPasteTransfer cap = new CutAndPasteTransfer();
- Desktop.addInternalFrame(cap,
- "Alignment output - " + e.getActionCommand(), 600,
- 500);
+ cap.setForInput(null);
+ try
+ {
+ cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
+ viewport.getAlignment(), omitHidden,
+ viewport.getColumnSelection()));
+ Desktop.addInternalFrame(cap,
+ MessageManager.formatMessage("label.alignment_output_command", new String[]{e.getActionCommand()}), 600, 500);
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("Outputting alignment as " + e.getActionCommand(), oom);
+ cap.dispose();
+ }
- cap.setText(new FormatAdapter().formatSequences(
- e.getActionCommand(),
- viewport.alignment.getSequencesArray(),
- omitHidden));
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void htmlMenuItem_actionPerformed(ActionEvent e)
{
- new HTMLOutput(viewport,
- alignPanel.seqPanel.seqCanvas.getSequenceRenderer(),
- alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
+ new HTMLOutput(alignPanel,
+ alignPanel.seqPanel.seqCanvas.getSequenceRenderer(),
+ alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
}
public void createImageMap(File file, String image)
@@ -452,9 +1189,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void createPNG(File f)
{
alignPanel.makePNG(f);
@@ -462,50 +1201,62 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void createEPS(File f)
{
alignPanel.makeEPS(f);
}
+ @Override
+ public void pageSetup_actionPerformed(ActionEvent e)
+ {
+ PrinterJob printJob = PrinterJob.getPrinterJob();
+ PrintThread.pf = printJob.pageDialog(printJob.defaultPage());
+ }
+
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void printMenuItem_actionPerformed(ActionEvent e)
{
- //Putting in a thread avoids Swing painting problems
- PrintThread thread = new PrintThread();
+ // Putting in a thread avoids Swing painting problems
+ PrintThread thread = new PrintThread(alignPanel);
thread.start();
}
+ @Override
public void exportFeatures_actionPerformed(ActionEvent e)
{
new AnnotationExporter().exportFeatures(alignPanel);
}
-
+ @Override
public void exportAnnotations_actionPerformed(ActionEvent e)
{
- new AnnotationExporter().exportAnnotations(
- alignPanel,
- viewport.alignment.getAlignmentAnnotation()
- );
+ new AnnotationExporter().exportAnnotations(alignPanel,
+ viewport.showAnnotation ? viewport.getAlignment()
+ .getAlignmentAnnotation() : null, viewport
+ .getAlignment().getGroups(), ((Alignment) viewport
+ .getAlignment()).alignmentProperties);
}
-
+ @Override
public void associatedData_actionPerformed(ActionEvent e)
{
// Pick the tree file
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
- getProperty(
- "LAST_DIRECTORY"));
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Load Jalview Annotations or Features File");
- chooser.setToolTipText("Load Jalview Annotations / Features file");
+ chooser.setDialogTitle(MessageManager.getString("label.load_jalview_annotations"));
+ chooser.setToolTipText(MessageManager.getString("label.load_jalview_annotations"));
int value = chooser.showOpenDialog(null);
@@ -513,26 +1264,86 @@ public class AlignFrame
{
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
- loadJalviewDataFile(choice);
+ loadJalviewDataFile(choice, null, null, null);
}
}
/**
- * DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ * Close the current view or all views in the alignment frame. If the frame
+ * only contains one view then the alignment will be removed from memory.
+ *
+ * @param closeAllTabs
*/
- public void closeMenuItem_actionPerformed(ActionEvent e)
+ @Override
+ public void closeMenuItem_actionPerformed(boolean closeAllTabs)
{
+ if (alignPanels != null && alignPanels.size() < 2)
+ {
+ closeAllTabs = true;
+ }
+
try
{
- PaintRefresher.components.remove(viewport.alignment);
- this.setClosed(true);
+ if (alignPanels != null)
+ {
+ if (closeAllTabs)
+ {
+ if (this.isClosed())
+ {
+ // really close all the windows - otherwise wait till
+ // setClosed(true) is called
+ for (int i = 0; i < alignPanels.size(); i++)
+ {
+ AlignmentPanel ap = (AlignmentPanel) alignPanels.elementAt(i);
+ ap.closePanel();
+ }
+ }
+ }
+ else
+ {
+ closeView(alignPanel);
+ }
+ }
+
+ if (closeAllTabs)
+ {
+ this.setClosed(true);
+ }
+ } catch (Exception ex)
+ {
+ ex.printStackTrace();
}
- catch (Exception ex)
+ }
+
+ /**
+ * close alignPanel2 and shuffle tabs appropriately.
+ *
+ * @param alignPanel2
+ */
+ public void closeView(AlignmentPanel alignPanel2)
+ {
+ int index = tabbedPane.getSelectedIndex();
+ int closedindex = tabbedPane.indexOfComponent(alignPanel2);
+ alignPanels.removeElement(alignPanel2);
+ // Unnecessary
+ // if (viewport == alignPanel2.av)
+ // {
+ // viewport = null;
+ // }
+ alignPanel2.closePanel();
+ alignPanel2 = null;
+
+ tabbedPane.removeTabAt(closedindex);
+ tabbedPane.validate();
+
+ if (index > closedindex || index == tabbedPane.getTabCount())
{
+ // modify currently selected tab index if necessary.
+ index--;
}
+
+ this.tabSelectionChanged(index);
}
/**
@@ -540,94 +1351,195 @@ public class AlignFrame
*/
void updateEditMenuBar()
{
- if (historyList.size() > 0)
+
+ if (viewport.historyList.size() > 0)
{
undoMenuItem.setEnabled(true);
-
- HistoryItem hi = (HistoryItem) historyList.peek();
- undoMenuItem.setText("Undo " + hi.getDescription());
+ CommandI command = (CommandI) viewport.historyList.peek();
+ undoMenuItem.setText(MessageManager.formatMessage("label.undo_command", new String[]{command.getDescription()}));
}
else
{
undoMenuItem.setEnabled(false);
- undoMenuItem.setText("Undo");
+ undoMenuItem.setText(MessageManager.getString("action.undo"));
}
- if (redoList.size() > 0)
+ if (viewport.redoList.size() > 0)
{
redoMenuItem.setEnabled(true);
- HistoryItem hi = (HistoryItem) redoList.peek();
- redoMenuItem.setText("Redo " + hi.getDescription());
+ CommandI command = (CommandI) viewport.redoList.peek();
+ redoMenuItem.setText(MessageManager.formatMessage("label.redo_command", new String[]{command.getDescription()}));
}
else
{
redoMenuItem.setEnabled(false);
- redoMenuItem.setText("Redo");
+ redoMenuItem.setText(MessageManager.getString("action.redo"));
+ }
+ }
+
+ public void addHistoryItem(CommandI command)
+ {
+ if (command.getSize() > 0)
+ {
+ viewport.historyList.push(command);
+ viewport.redoList.clear();
+ updateEditMenuBar();
+ viewport.updateHiddenColumns();
+ // viewport.hasHiddenColumns = (viewport.getColumnSelection() != null
+ // && viewport.getColumnSelection().getHiddenColumns() != null &&
+ // viewport.getColumnSelection()
+ // .getHiddenColumns().size() > 0);
}
}
/**
- * DOCUMENT ME!
- *
- * @param hi DOCUMENT ME!
+ *
+ * @return alignment objects for all views
*/
- public void addHistoryItem(HistoryItem hi)
+ AlignmentI[] getViewAlignments()
{
- historyList.push(hi);
- redoList.clear();
- updateEditMenuBar();
+ if (alignPanels != null)
+ {
+ Enumeration e = alignPanels.elements();
+ AlignmentI[] als = new AlignmentI[alignPanels.size()];
+ for (int i = 0; e.hasMoreElements(); i++)
+ {
+ als[i] = ((AlignmentPanel) e.nextElement()).av.getAlignment();
+ }
+ return als;
+ }
+ if (viewport != null)
+ {
+ return new AlignmentI[]
+ { viewport.getAlignment() };
+ }
+ return null;
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void undoMenuItem_actionPerformed(ActionEvent e)
{
- HistoryItem nh,hi = (HistoryItem) historyList.pop();
- redoList.push(nh=new HistoryItem(hi.getDescription(), viewport.alignment,
- HistoryItem.HIDE));
- if (hi.alColumnChanges!=null)
- nh.alColumnChanges = hi.alColumnChanges.getInverse();
- restoreHistoryItem(hi);
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+ if (viewport.historyList.empty())
+ return;
+ CommandI command = (CommandI) viewport.historyList.pop();
+ viewport.redoList.push(command);
+ command.undoCommand(getViewAlignments());
+
+ AlignViewport originalSource = getOriginatingSource(command);
+ updateEditMenuBar();
+
+ if (originalSource != null)
+ {
+ if (originalSource != viewport)
+ {
+ Cache.log
+ .warn("Implementation worry: mismatch of viewport origin for undo");
+ }
+ originalSource.updateHiddenColumns();
+ // originalSource.hasHiddenColumns = (viewport.getColumnSelection() !=
+ // null
+ // && viewport.getColumnSelection().getHiddenColumns() != null &&
+ // viewport.getColumnSelection()
+ // .getHiddenColumns().size() > 0);
+ originalSource.firePropertyChange("alignment", null, originalSource
+ .getAlignment().getSequences());
+ }
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void redoMenuItem_actionPerformed(ActionEvent e)
{
- HistoryItem nh,hi = (HistoryItem) redoList.pop();
- historyList.push(nh=new HistoryItem(hi.getDescription(), viewport.alignment,
- HistoryItem.HIDE));
- if (hi.alColumnChanges!=null)
- nh.alColumnChanges=hi.alColumnChanges.getInverse();
- restoreHistoryItem(hi);
+ if (viewport.redoList.size() < 1)
+ {
+ return;
+ }
+
+ CommandI command = (CommandI) viewport.redoList.pop();
+ viewport.historyList.push(command);
+ command.doCommand(getViewAlignments());
+
+ AlignViewport originalSource = getOriginatingSource(command);
updateEditMenuBar();
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+
+ if (originalSource != null)
+ {
+
+ if (originalSource != viewport)
+ {
+ Cache.log
+ .warn("Implementation worry: mismatch of viewport origin for redo");
+ }
+ originalSource.updateHiddenColumns();
+ // originalSource.hasHiddenColumns = (viewport.getColumnSelection() !=
+ // null
+ // && viewport.getColumnSelection().getHiddenColumns() != null &&
+ // viewport.getColumnSelection()
+ // .getHiddenColumns().size() > 0);
+ originalSource.firePropertyChange("alignment", null, originalSource
+ .getAlignment().getSequences());
+ }
}
- // used by undo and redo
- void restoreHistoryItem(HistoryItem hi)
+ AlignViewport getOriginatingSource(CommandI command)
{
+ AlignViewport originalSource = null;
+ // For sequence removal and addition, we need to fire
+ // the property change event FROM the viewport where the
+ // original alignment was altered
+ AlignmentI al = null;
+ if (command instanceof EditCommand)
+ {
+ EditCommand editCommand = (EditCommand) command;
+ al = editCommand.getAlignment();
+ Vector comps = (Vector) PaintRefresher.components.get(viewport
+ .getSequenceSetId());
+
+ for (int i = 0; i < comps.size(); i++)
+ {
+ if (comps.elementAt(i) instanceof AlignmentPanel)
+ {
+ if (al == ((AlignmentPanel) comps.elementAt(i)).av.getAlignment())
+ {
+ originalSource = ((AlignmentPanel) comps.elementAt(i)).av;
+ break;
+ }
+ }
+ }
+ }
- hi.restore(viewport.getColumnSelection());
+ if (originalSource == null)
+ {
+ // The original view is closed, we must validate
+ // the current view against the closed view first
+ if (al != null)
+ {
+ PaintRefresher.validateSequences(al, viewport.getAlignment());
+ }
- updateEditMenuBar();
+ originalSource = viewport;
+ }
- viewport.firePropertyChange("alignment", null,
- viewport.getAlignment().getSequences());
+ return originalSource;
}
/**
* DOCUMENT ME!
- *
- * @param up DOCUMENT ME!
+ *
+ * @param up
+ * DOCUMENT ME!
*/
public void moveSelectedSequences(boolean up)
{
@@ -637,111 +1549,169 @@ public class AlignFrame
{
return;
}
+ viewport.getAlignment().moveSelectedSequencesByOne(sg,
+ viewport.getHiddenRepSequences(), up);
+ alignPanel.paintAlignment(true);
+ }
- if (up)
+ synchronized void slideSequences(boolean right, int size)
+ {
+ List sg = new Vector();
+ if (viewport.cursorMode)
{
- for (int i = 1; i < viewport.alignment.getHeight(); i++)
- {
- SequenceI seq = viewport.alignment.getSequenceAt(i);
-
- if (!sg.getSequences(false).contains(seq))
- {
- continue;
- }
+ sg.add(viewport.getAlignment().getSequenceAt(
+ alignPanel.seqPanel.seqCanvas.cursorY));
+ }
+ else if (viewport.getSelectionGroup() != null
+ && viewport.getSelectionGroup().getSize() != viewport
+ .getAlignment().getHeight())
+ {
+ sg = viewport.getSelectionGroup().getSequences(
+ viewport.getHiddenRepSequences());
+ }
- SequenceI temp = viewport.alignment.getSequenceAt(i - 1);
+ if (sg.size() < 1)
+ {
+ return;
+ }
- if (sg.getSequences(false).contains(temp))
- {
- continue;
- }
+ Vector invertGroup = new Vector();
- viewport.alignment.getSequences().setElementAt(temp, i);
- viewport.alignment.getSequences().setElementAt(seq, i - 1);
- }
- }
- else
+ for (int i = 0; i < viewport.getAlignment().getHeight(); i++)
{
- for (int i = viewport.alignment.getHeight() - 2; i > -1; i--)
- {
- SequenceI seq = viewport.alignment.getSequenceAt(i);
+ if (!sg.contains(viewport.getAlignment().getSequenceAt(i)))
+ invertGroup.add(viewport.getAlignment().getSequenceAt(i));
+ }
- if (!sg.getSequences(false).contains(seq))
- {
- continue;
- }
+ SequenceI[] seqs1 = sg.toArray(new SequenceI[0]);
- SequenceI temp = viewport.alignment.getSequenceAt(i + 1);
+ SequenceI[] seqs2 = new SequenceI[invertGroup.size()];
+ for (int i = 0; i < invertGroup.size(); i++)
+ seqs2[i] = (SequenceI) invertGroup.elementAt(i);
- if (sg.getSequences(false).contains(temp))
- {
- continue;
- }
+ SlideSequencesCommand ssc;
+ if (right)
+ ssc = new SlideSequencesCommand("Slide Sequences", seqs2, seqs1,
+ size, viewport.getGapCharacter());
+ else
+ ssc = new SlideSequencesCommand("Slide Sequences", seqs1, seqs2,
+ size, viewport.getGapCharacter());
- viewport.alignment.getSequences().setElementAt(temp, i);
- viewport.alignment.getSequences().setElementAt(seq, i + 1);
- }
+ int groupAdjustment = 0;
+ if (ssc.getGapsInsertedBegin() && right)
+ {
+ if (viewport.cursorMode)
+ alignPanel.seqPanel.moveCursor(size, 0);
+ else
+ groupAdjustment = size;
+ }
+ else if (!ssc.getGapsInsertedBegin() && !right)
+ {
+ if (viewport.cursorMode)
+ alignPanel.seqPanel.moveCursor(-size, 0);
+ else
+ groupAdjustment = -size;
}
- alignPanel.repaint();
- }
+ if (groupAdjustment != 0)
+ {
+ viewport.getSelectionGroup().setStartRes(
+ viewport.getSelectionGroup().getStartRes() + groupAdjustment);
+ viewport.getSelectionGroup().setEndRes(
+ viewport.getSelectionGroup().getEndRes() + groupAdjustment);
+ }
+
+ boolean appendHistoryItem = false;
+ if (viewport.historyList != null && viewport.historyList.size() > 0
+ && viewport.historyList.peek() instanceof SlideSequencesCommand)
+ {
+ appendHistoryItem = ssc
+ .appendSlideCommand((SlideSequencesCommand) viewport.historyList
+ .peek());
+ }
+ if (!appendHistoryItem)
+ addHistoryItem(ssc);
+ repaint();
+ }
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void copy_actionPerformed(ActionEvent e)
{
+ System.gc();
if (viewport.getSelectionGroup() == null)
{
return;
}
-
- SequenceI [] seqs = viewport.getSelectionAsNewSequence();
+ // TODO: preserve the ordering of displayed alignment annotation in any
+ // internal paste (particularly sequence associated annotation)
+ SequenceI[] seqs = viewport.getSelectionAsNewSequence();
String[] omitHidden = null;
- if (viewport.hasHiddenColumns)
+ if (viewport.hasHiddenColumns())
{
omitHidden = viewport.getViewAsString(true);
}
- String output = new FormatAdapter().formatSequences(
- "Fasta",
- seqs,
- omitHidden);
+ String output = new FormatAdapter().formatSequences("Fasta", seqs,
+ omitHidden);
+ StringSelection ss = new StringSelection(output);
- Toolkit.getDefaultToolkit().getSystemClipboard()
- .setContents(new StringSelection(output), Desktop.instance);
+ try
+ {
+ jalview.gui.Desktop.internalCopy = true;
+ // Its really worth setting the clipboard contents
+ // to empty before setting the large StringSelection!!
+ Toolkit.getDefaultToolkit().getSystemClipboard()
+ .setContents(new StringSelection(""), null);
+
+ Toolkit.getDefaultToolkit().getSystemClipboard()
+ .setContents(ss, Desktop.instance);
+ } catch (OutOfMemoryError er)
+ {
+ new OOMWarning("copying region", er);
+ return;
+ }
Vector hiddenColumns = null;
- if(viewport.hasHiddenColumns)
+ if (viewport.hasHiddenColumns())
{
- hiddenColumns =new Vector();
- int hiddenOffset = viewport.getSelectionGroup().getStartRes();
- for(int i=0; i= hiddenOffset && region[1] <= hiddenCutoff)
+ {
+ hiddenColumns.addElement(new int[]
+ { region[0] - hiddenOffset, region[1] - hiddenOffset });
+ }
}
}
- Desktop.jalviewClipboard = new Object[]{ seqs,
- viewport.alignment.getDataset(),
- hiddenColumns};
+ Desktop.jalviewClipboard = new Object[]
+ { seqs, viewport.getAlignment().getDataset(), hiddenColumns };
+ statusBar.setText(MessageManager.formatMessage("label.copied_sequences_to_clipboard", new String[]{Integer.valueOf(seqs.length).toString()}));
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void pasteNew_actionPerformed(ActionEvent e)
{
paste(true);
@@ -749,23 +1719,25 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void pasteThis_actionPerformed(ActionEvent e)
{
- addHistoryItem(new HistoryItem("Paste Sequences", viewport.alignment,
- HistoryItem.PASTE));
paste(false);
}
/**
- * DOCUMENT ME!
- *
- * @param newAlignment DOCUMENT ME!
+ * Paste contents of Jalview clipboard
+ *
+ * @param newAlignment
+ * true to paste to a new alignment, otherwise add to this.
*/
void paste(boolean newAlignment)
{
+ boolean externalPaste = true;
try
{
Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -776,142 +1748,326 @@ public class AlignFrame
return;
}
- String str = (String) contents.getTransferData(DataFlavor.stringFlavor);
- if(str.length()<1)
+ String str, format;
+ try
+ {
+ str = (String) contents.getTransferData(DataFlavor.stringFlavor);
+ if (str.length() < 1)
+ {
+ return;
+ }
+
+ format = new IdentifyFile().Identify(str, "Paste");
+
+ } catch (OutOfMemoryError er)
+ {
+ new OOMWarning("Out of memory pasting sequences!!", er);
return;
+ }
- String format = new IdentifyFile().Identify(str, "Paste");
SequenceI[] sequences;
+ boolean annotationAdded = false;
+ AlignmentI alignment = null;
+ if (Desktop.jalviewClipboard != null)
+ {
+ // The clipboard was filled from within Jalview, we must use the
+ // sequences
+ // And dataset from the copied alignment
+ SequenceI[] newseq = (SequenceI[]) Desktop.jalviewClipboard[0];
+ // be doubly sure that we create *new* sequence objects.
+ sequences = new SequenceI[newseq.length];
+ for (int i = 0; i < newseq.length; i++)
+ {
+ sequences[i] = new Sequence(newseq[i]);
+ }
+ alignment = new Alignment(sequences);
+ externalPaste = false;
+ }
+ else
+ {
+ // parse the clipboard as an alignment.
+ alignment = new FormatAdapter().readFile(str, "Paste", format);
+ sequences = alignment.getSequencesArray();
+ }
- 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);
- }
-
- AlignmentI alignment = null;
+ int alwidth = 0;
+ ArrayList newGraphGroups = new ArrayList();
+ int fgroup = -1;
if (newAlignment)
{
- alignment = new Alignment(sequences);
- if(Desktop.jalviewClipboard!=null)
- alignment.setDataset( (Alignment)Desktop.jalviewClipboard[1] );
+ if (Desktop.jalviewClipboard != null)
+ {
+ // dataset is inherited
+ alignment.setDataset((Alignment) Desktop.jalviewClipboard[1]);
+ }
else
- alignment.setDataset( null );
-
+ {
+ // new dataset is constructed
+ alignment.setDataset(null);
+ }
+ alwidth = alignment.getWidth() + 1;
}
else
{
+ AlignmentI pastedal = alignment; // preserve pasted alignment object
+ // Add pasted sequences and dataset into existing alignment.
alignment = viewport.getAlignment();
+ alwidth = alignment.getWidth() + 1;
+ // decide if we need to import sequences from an existing dataset
+ boolean importDs = Desktop.jalviewClipboard != null
+ && Desktop.jalviewClipboard[1] != alignment.getDataset();
+ // importDs==true instructs us to copy over new dataset sequences from
+ // an existing alignment
+ Vector newDs = (importDs) ? new Vector() : null; // used to create
+ // minimum dataset set
- //!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());
-
- alignment.addSequence(newseq);
+ if (importDs)
+ {
+ newDs.addElement(null);
+ }
+ SequenceI ds = sequences[i].getDatasetSequence(); // null for a simple
+ // paste
+ if (importDs && ds != null)
+ {
+ if (!newDs.contains(ds))
+ {
+ newDs.setElementAt(ds, i);
+ ds = new Sequence(ds);
+ // update with new dataset sequence
+ sequences[i].setDatasetSequence(ds);
+ }
+ else
+ {
+ ds = sequences[newDs.indexOf(ds)].getDatasetSequence();
+ }
+ }
+ else
+ {
+ // copy and derive new dataset sequence
+ sequences[i] = sequences[i].deriveSequence();
+ alignment.getDataset().addSequence(
+ sequences[i].getDatasetSequence());
+ // TODO: avoid creation of duplicate dataset sequences with a
+ // 'contains' method using SequenceI.equals()/SequenceI.contains()
+ }
+ alignment.addSequence(sequences[i]); // merges dataset
}
+ if (newDs != null)
+ {
+ newDs.clear(); // tidy up
+ }
+ if (alignment.getAlignmentAnnotation() != null)
+ {
+ for (AlignmentAnnotation alan : alignment
+ .getAlignmentAnnotation())
+ {
+ if (alan.graphGroup > fgroup)
+ {
+ fgroup = alan.graphGroup;
+ }
+ }
+ }
+ if (pastedal.getAlignmentAnnotation() != null)
+ {
+ // Add any annotation attached to alignment.
+ AlignmentAnnotation[] alann = pastedal.getAlignmentAnnotation();
+ for (int i = 0; i < alann.length; i++)
+ {
+ annotationAdded = true;
+ if (alann[i].sequenceRef == null && !alann[i].autoCalculated)
+ {
+ AlignmentAnnotation newann = new AlignmentAnnotation(alann[i]);
+ if (newann.graphGroup > -1)
+ {
+ if (newGraphGroups.size() <= newann.graphGroup
+ || newGraphGroups.get(newann.graphGroup) == null)
+ {
+ for (int q = newGraphGroups.size(); q <= newann.graphGroup; q++)
+ {
+ newGraphGroups.add(q, null);
+ }
+ newGraphGroups.set(newann.graphGroup, new Integer(
+ ++fgroup));
+ }
+ newann.graphGroup = newGraphGroups.get(newann.graphGroup)
+ .intValue();
+ }
-
- viewport.setEndSeq(alignment.getHeight());
- alignment.getWidth();
- viewport.firePropertyChange("alignment", null, alignment.getSequences());
+ newann.padAnnotation(alwidth);
+ alignment.addAnnotation(newann);
+ }
+ }
+ }
+ }
+ if (!newAlignment)
+ {
+ // /////
+ // ADD HISTORY ITEM
+ //
+ addHistoryItem(new EditCommand("Add sequences", EditCommand.PASTE,
+ sequences, 0, alignment.getWidth(), alignment));
}
-
-
-
-
-
// Add any annotations attached to sequences
for (int i = 0; i < sequences.length; i++)
- {
- if (sequences[i].getAnnotation() != null)
- {
- for (int a = 0; a < sequences[i].getAnnotation().length; a++)
- {
- AlignmentAnnotation newAnnot =
- new AlignmentAnnotation(
- sequences[i].getAnnotation()[a].label,
- sequences[i].getAnnotation()[a].description,
- sequences[i].getAnnotation()[a].annotations,
- sequences[i].getAnnotation()[a].graphMin,
- sequences[i].getAnnotation()[a].graphMax,
- sequences[i].getAnnotation()[a].graph);
-
- sequences[i].getAnnotation()[a] = newAnnot;
- newAnnot.sequenceMapping = sequences[i].getAnnotation()[a].
- sequenceMapping;
- newAnnot.sequenceRef = sequences[i];
- newAnnot.adjustForAlignment();
- alignment.addAnnotation(newAnnot);
- alignment.setAnnotationIndex(newAnnot, a);
- }
-
- alignPanel.annotationPanel.adjustPanelHeight();
- }
- }
-
- if(newAlignment)
- {
- AlignFrame af = new AlignFrame(alignment);
- String newtitle = new String("Copied sequences");
-
- if(Desktop.jalviewClipboard!=null && Desktop.jalviewClipboard[2]!=null)
- {
- Vector hc = (Vector)Desktop.jalviewClipboard[2];
- for(int i=0; i>>This is a fix for the moment, until a better solution is found!!<<<
- af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(
- alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
-
-
- if (title.startsWith("Copied sequences"))
- {
- newtitle = title;
- }
- else
- {
- newtitle = newtitle.concat("- from " + title);
- }
-
- Desktop.addInternalFrame(af, newtitle, NEW_WINDOW_WIDTH,
- NEW_WINDOW_HEIGHT);
-
- }
-
-
- }
- catch (Exception ex)
- {
- ex.printStackTrace();
- System.out.println("Exception whilst pasting: "+ex);
- // could be anything being pasted in here
- }
-
-
+ {
+ if (sequences[i].getAnnotation() != null)
+ {
+ AlignmentAnnotation newann;
+ for (int a = 0; a < sequences[i].getAnnotation().length; a++)
+ {
+ annotationAdded = true;
+ newann = sequences[i].getAnnotation()[a];
+ newann.adjustForAlignment();
+ newann.padAnnotation(alwidth);
+ if (newann.graphGroup > -1)
+ {
+ if (newann.graphGroup > -1)
+ {
+ if (newGraphGroups.size() <= newann.graphGroup
+ || newGraphGroups.get(newann.graphGroup) == null)
+ {
+ for (int q = newGraphGroups.size(); q <= newann.graphGroup; q++)
+ {
+ newGraphGroups.add(q, null);
+ }
+ newGraphGroups.set(newann.graphGroup, new Integer(
+ ++fgroup));
+ }
+ newann.graphGroup = newGraphGroups.get(newann.graphGroup)
+ .intValue();
+ }
+ }
+ alignment.addAnnotation(sequences[i].getAnnotation()[a]); // annotation
+ // was
+ // duplicated
+ // earlier
+ alignment
+ .setAnnotationIndex(sequences[i].getAnnotation()[a], a);
+ }
+ }
+ }
+ if (!newAlignment)
+ {
+
+ // propagate alignment changed.
+ viewport.setEndSeq(alignment.getHeight());
+ if (annotationAdded)
+ {
+ // Duplicate sequence annotation in all views.
+ AlignmentI[] alview = this.getViewAlignments();
+ for (int i = 0; i < sequences.length; i++)
+ {
+ AlignmentAnnotation sann[] = sequences[i].getAnnotation();
+ if (sann == null)
+ continue;
+ for (int avnum = 0; avnum < alview.length; avnum++)
+ {
+ if (alview[avnum] != alignment)
+ {
+ // duplicate in a view other than the one with input focus
+ int avwidth = alview[avnum].getWidth() + 1;
+ // this relies on sann being preserved after we
+ // modify the sequence's annotation array for each duplication
+ for (int a = 0; a < sann.length; a++)
+ {
+ AlignmentAnnotation newann = new AlignmentAnnotation(
+ sann[a]);
+ sequences[i].addAlignmentAnnotation(newann);
+ newann.padAnnotation(avwidth);
+ alview[avnum].addAnnotation(newann); // annotation was
+ // duplicated earlier
+ // TODO JAL-1145 graphGroups are not updated for sequence
+ // annotation added to several views. This may cause
+ // strangeness
+ alview[avnum].setAnnotationIndex(newann, a);
+ }
+ }
+ }
+ }
+ buildSortByAnnotationScoresMenu();
+ }
+ viewport.firePropertyChange("alignment", null,
+ alignment.getSequences());
+ if (alignPanels != null)
+ {
+ for (AlignmentPanel ap : ((Vector) alignPanels))
+ {
+ ap.validateAnnotationDimensions(false);
+ }
+ }
+ else
+ {
+ alignPanel.validateAnnotationDimensions(false);
+ }
+
+ }
+ else
+ {
+ AlignFrame af = new AlignFrame(alignment, DEFAULT_WIDTH,
+ DEFAULT_HEIGHT);
+ String newtitle = new String("Copied sequences");
+
+ if (Desktop.jalviewClipboard != null
+ && Desktop.jalviewClipboard[2] != null)
+ {
+ Vector hc = (Vector) Desktop.jalviewClipboard[2];
+ for (int i = 0; i < hc.size(); i++)
+ {
+ int[] region = (int[]) hc.elementAt(i);
+ af.viewport.hideColumns(region[0], region[1]);
+ }
+ }
+
+ // >>>This is a fix for the moment, until a better solution is
+ // found!!<<<
+ af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer()
+ .transferSettings(
+ alignPanel.seqPanel.seqCanvas.getFeatureRenderer());
+
+ // TODO: maintain provenance of an alignment, rather than just make the
+ // title a concatenation of operations.
+ if (!externalPaste)
+ {
+ if (title.startsWith("Copied sequences"))
+ {
+ newtitle = title;
+ }
+ else
+ {
+ newtitle = newtitle.concat("- from " + title);
+ }
+ }
+ else
+ {
+ newtitle = new String("Pasted sequences");
+ }
+
+ Desktop.addInternalFrame(af, newtitle, DEFAULT_WIDTH,
+ DEFAULT_HEIGHT);
+
+ }
+
+ } catch (Exception ex)
+ {
+ ex.printStackTrace();
+ System.out.println("Exception whilst pasting: " + ex);
+ // could be anything being pasted in here
+ }
+
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void cut_actionPerformed(ActionEvent e)
{
copy_actionPerformed(null);
@@ -920,91 +2076,60 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
- protected void delete_actionPerformed(ActionEvent e)
+ @Override
+ protected void delete_actionPerformed(ActionEvent evt)
{
- if (viewport.getSelectionGroup() == null)
+ SequenceGroup sg = viewport.getSelectionGroup();
+ if (sg == null)
{
return;
}
-
- SequenceGroup sg = viewport.getSelectionGroup();
-
-
-
- //Jalview no longer allows deletion of residues.
- //Check here whether any residues are in selection area
- /* if( sg.getEndRes()-sg.getStartRes() < viewport.alignment.getWidth()-1)
+ Vector seqs = new Vector();
+ SequenceI seq;
+ for (int i = 0; i < sg.getSize(); i++)
{
- for (int i = 0; i < sg.sequences.size(); i++)
- {
- SequenceI seq = sg.getSequenceAt(i);
- int j = sg.getStartRes();
- do
- {
- if (!jalview.util.Comparison.isGap(seq.getCharAt(j)))
- {
- JOptionPane.showInternalMessageDialog(
- Desktop.desktop, "Cannot delete residues from alignment!\n"
- + "Try hiding columns instead.",
- "Deletion of residues not permitted",
- JOptionPane.WARNING_MESSAGE);
-
- return;
- }
- j++;
- }while(j<=sg.getEndRes());
- }
- }*/
-
-
- addHistoryItem(new HistoryItem("Delete Sequences", viewport.alignment,
- HistoryItem.HIDE));
-
+ seq = sg.getSequenceAt(i);
+ seqs.addElement(seq);
+ }
- for (int i = 0; i < sg.getSize(false); i++)
+ // If the cut affects all sequences, remove highlighted columns
+ if (sg.getSize() == viewport.getAlignment().getHeight())
{
- SequenceI seq = sg.getSequenceAt(i);
- int index = viewport.getAlignment().findIndex(seq);
-
- seq.deleteChars(sg.getStartRes(), sg.getEndRes() + 1);
-
- // If the cut affects all sequences, remove highlighted columns
- if (sg.getSize(false) == viewport.alignment.getHeight())
- {
- viewport.getColumnSelection().removeElements(sg.getStartRes(),
- sg.getEndRes() + 1);
- }
-
- if (seq.getSequence().length() < 1)
- {
- viewport.getAlignment().deleteSequence(seq);
- }
- else
- {
- viewport.getAlignment().getSequences().setElementAt(seq, index);
- }
+ viewport.getColumnSelection().removeElements(sg.getStartRes(),
+ sg.getEndRes() + 1);
}
- viewport.setSelectionGroup(null);
- viewport.alignment.deleteGroup(sg);
-
- viewport.firePropertyChange("alignment", null,
- viewport.getAlignment().getSequences());
+ SequenceI[] cut = new SequenceI[seqs.size()];
+ for (int i = 0; i < seqs.size(); i++)
+ {
+ cut[i] = (SequenceI) seqs.elementAt(i);
+ }
+ /*
+ * //ADD HISTORY ITEM
+ */
+ addHistoryItem(new EditCommand("Cut Sequences", EditCommand.CUT, cut,
+ sg.getStartRes(), sg.getEndRes() - sg.getStartRes() + 1,
+ viewport.getAlignment()));
+ viewport.setSelectionGroup(null);
+ viewport.sendSelection();
+ viewport.getAlignment().deleteGroup(sg);
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment()
+ .getSequences());
if (viewport.getAlignment().getHeight() < 1)
{
try
{
this.setClosed(true);
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
}
}
@@ -1012,44 +2137,53 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void deleteGroups_actionPerformed(ActionEvent e)
{
- viewport.alignment.deleteAllGroups();
- viewport.setSelectionGroup(null);
- alignPanel.repaint();
+ if (avc.deleteGroups()) {
+ PaintRefresher.Refresh(this, viewport.getSequenceSetId());
+ alignPanel.updateAnnotation();
+ alignPanel.paintAlignment(true);
+ }
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void selectAllSequenceMenuItem_actionPerformed(ActionEvent e)
{
SequenceGroup sg = new SequenceGroup();
- for (int i = 0; i < viewport.getAlignment().getSequences().size();
- i++)
+ for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++)
{
sg.addSequence(viewport.getAlignment().getSequenceAt(i), false);
}
- sg.setEndRes(viewport.alignment.getWidth() - 1);
+ sg.setEndRes(viewport.getAlignment().getWidth() - 1);
viewport.setSelectionGroup(sg);
- PaintRefresher.Refresh(null, viewport.alignment);
+ viewport.sendSelection();
+ alignPanel.paintAlignment(true);
+ PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e)
{
- if(viewport.cursorMode)
+ if (viewport.cursorMode)
{
alignPanel.seqPanel.keyboardNo1 = null;
alignPanel.seqPanel.keyboardNo2 = null;
@@ -1059,15 +2193,18 @@ public class AlignFrame
viewport.setSelectionGroup(null);
alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
alignPanel.idPanel.idCanvas.searchResults = null;
- alignPanel.repaint();
- PaintRefresher.Refresh(null, viewport.alignment);
+ alignPanel.paintAlignment(true);
+ PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
+ viewport.sendSelection();
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void invertSequenceMenuItem_actionPerformed(ActionEvent e)
{
SequenceGroup sg = viewport.getSelectionGroup();
@@ -1079,345 +2216,433 @@ public class AlignFrame
return;
}
- for (int i = 0; i < viewport.getAlignment().getSequences().size();
- i++)
+ for (int i = 0; i < viewport.getAlignment().getSequences().size(); i++)
{
sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);
}
- PaintRefresher.Refresh(null, viewport.alignment);
+ alignPanel.paintAlignment(true);
+ PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
+ viewport.sendSelection();
}
+ @Override
public void invertColSel_actionPerformed(ActionEvent e)
{
viewport.invertColumnSelection();
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
+ viewport.sendSelection();
}
-
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void remove2LeftMenuItem_actionPerformed(ActionEvent e)
{
- ColumnSelection colSel = viewport.getColumnSelection();
-
- if (colSel.size() > 0)
- {
- HistoryItem edit;
- addHistoryItem(edit=new HistoryItem("Remove Left", viewport.alignment,
- HistoryItem.HIDE));
-
- int min = colSel.getMin();
- viewport.getAlignment().trimLeft(min);
- colSel.compensateForEdit(0, min);
- edit.addShift(0,min);
- if (viewport.getSelectionGroup() != null)
- {
- viewport.getSelectionGroup().adjustForRemoveLeft(min);
- }
-
- Vector groups = viewport.alignment.getGroups();
-
- for (int i = 0; i < groups.size(); i++)
- {
- SequenceGroup sg = (SequenceGroup) groups.get(i);
-
- if (!sg.adjustForRemoveLeft(min))
- {
- viewport.alignment.deleteGroup(sg);
- }
- }
-
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
- }
+ trimAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void remove2RightMenuItem_actionPerformed(ActionEvent e)
{
+ trimAlignment(false);
+ }
+
+ void trimAlignment(boolean trimLeft)
+ {
ColumnSelection colSel = viewport.getColumnSelection();
+ int column;
if (colSel.size() > 0)
{
- addHistoryItem(new HistoryItem("Remove Right", viewport.alignment,
- HistoryItem.HIDE));
+ if (trimLeft)
+ {
+ column = colSel.getMin();
+ }
+ else
+ {
+ column = colSel.getMax();
+ }
- int max = colSel.getMax();
- viewport.getAlignment().trimRight(max);
- // TODO: delete hidden column entries in colSel to right of max
- // TODO: record hidden columns in history for undo.
+ SequenceI[] seqs;
if (viewport.getSelectionGroup() != null)
{
- viewport.getSelectionGroup().adjustForRemoveRight(max);
+ seqs = viewport.getSelectionGroup().getSequencesAsArray(
+ viewport.getHiddenRepSequences());
+ }
+ else
+ {
+ seqs = viewport.getAlignment().getSequencesArray();
}
- Vector groups = viewport.alignment.getGroups();
-
- for (int i = 0; i < groups.size(); i++)
+ TrimRegionCommand trimRegion;
+ if (trimLeft)
+ {
+ trimRegion = new TrimRegionCommand("Remove Left",
+ TrimRegionCommand.TRIM_LEFT, seqs, column,
+ viewport.getAlignment(), viewport.getColumnSelection(),
+ viewport.getSelectionGroup());
+ viewport.setStartRes(0);
+ }
+ else
{
- SequenceGroup sg = (SequenceGroup) groups.get(i);
+ trimRegion = new TrimRegionCommand("Remove Right",
+ TrimRegionCommand.TRIM_RIGHT, seqs, column,
+ viewport.getAlignment(), viewport.getColumnSelection(),
+ viewport.getSelectionGroup());
+ }
+
+ statusBar.setText(MessageManager.formatMessage("label.removed_columns", new String[]{Integer.valueOf(trimRegion.getSize()).toString()}));
- if (!sg.adjustForRemoveRight(max))
+ addHistoryItem(trimRegion);
+
+ for (SequenceGroup sg : viewport.getAlignment().getGroups())
+ {
+ if ((trimLeft && !sg.adjustForRemoveLeft(column))
+ || (!trimLeft && !sg.adjustForRemoveRight(column)))
{
- viewport.alignment.deleteGroup(sg);
+ viewport.getAlignment().deleteGroup(sg);
}
}
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+ viewport.firePropertyChange("alignment", null, viewport
+ .getAlignment().getSequences());
}
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void removeGappedColumnMenuItem_actionPerformed(ActionEvent e)
{
- HistoryItem edit;
- addHistoryItem(edit=new HistoryItem("Remove Gapped Columns",
- viewport.alignment, HistoryItem.HIDE));
+ int start = 0, end = viewport.getAlignment().getWidth() - 1;
+
+ SequenceI[] seqs;
+ if (viewport.getSelectionGroup() != null)
+ {
+ seqs = viewport.getSelectionGroup().getSequencesAsArray(
+ viewport.getHiddenRepSequences());
+ start = viewport.getSelectionGroup().getStartRes();
+ end = viewport.getSelectionGroup().getEndRes();
+ }
+ else
+ {
+ seqs = viewport.getAlignment().getSequencesArray();
+ }
+
+ RemoveGapColCommand removeGapCols = new RemoveGapColCommand(
+ "Remove Gapped Columns", seqs, start, end,
+ viewport.getAlignment());
+
+ addHistoryItem(removeGapCols);
+
+ statusBar.setText(MessageManager.formatMessage("label.removed_empty_columns", new String[]{Integer.valueOf(removeGapCols.getSize()).toString()}));
- //This is to maintain viewport position on first residue
- //of first sequence
- SequenceI seq = viewport.alignment.getSequenceAt(0);
+ // This is to maintain viewport position on first residue
+ // of first sequence
+ SequenceI seq = viewport.getAlignment().getSequenceAt(0);
int startRes = seq.findPosition(viewport.startRes);
- ShiftList shifts;
- viewport.getAlignment().removeGaps(shifts=new ShiftList());
- edit.alColumnChanges=shifts.getInverse();
- if (viewport.hasHiddenColumns)
- viewport.getColumnSelection().compensateForEdits(shifts);
- viewport.setStartRes(seq.findIndex(startRes)-1);
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+ // ShiftList shifts;
+ // viewport.getAlignment().removeGaps(shifts=new ShiftList());
+ // edit.alColumnChanges=shifts.getInverse();
+ // if (viewport.hasHiddenColumns)
+ // viewport.getColumnSelection().compensateForEdits(shifts);
+ viewport.setStartRes(seq.findIndex(startRes) - 1);
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment()
+ .getSequences());
+
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void removeAllGapsMenuItem_actionPerformed(ActionEvent e)
{
- // TODO: hidden regions should not be touched by removeAllGaps - a minimal number of gaps will remain in alignment segments containing uneven length subsequences
- // TODO: columnSelection.compensateforedits should be called (and passed to history item)
- addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment,
- HistoryItem.HIDE));
-
- //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 start = 0, end = viewport.getAlignment().getWidth() - 1;
- SequenceI current;
- int jSize;
-
- Vector seqs = null;
-
- int start = 0;
- int end = viewport.alignment.getWidth();
-
- if (viewport.getSelectionGroup() != null
- && viewport.getSelectionGroup().getSequences(true) != null
- && viewport.getSelectionGroup().getSize(true) > 0)
+ SequenceI[] seqs;
+ if (viewport.getSelectionGroup() != null)
{
- seqs = viewport.getSelectionGroup().getSequences(true);
+ seqs = viewport.getSelectionGroup().getSequencesAsArray(
+ viewport.getHiddenRepSequences());
start = viewport.getSelectionGroup().getStartRes();
- end = viewport.getSelectionGroup().getEndRes()+1;
+ end = viewport.getSelectionGroup().getEndRes();
}
else
{
- seqs = viewport.alignment.getSequences();
- }
- /* Commented out regions below are partial implementation of todo above.
- * divide start,end into visible chunks, and for each:
- int diff=end-start+1;
- int diffmax=0;
- int dr[] = new int[seqs.size()];
- */
- for (int i = 0; i < seqs.size(); i++)
- {
- current = (SequenceI) seqs.elementAt(i);
- //dr[i]=
- current.removeGaps(start, end);
- /*if (d0) {
- // record shift for history.
- editgaps.addShift(start, diff);
- if (viewport.hasHiddenColumns && diffmax>diff) {
- // pad sequence
- StringBuffer gaps=new StringBuffer(diffmax);
- for (int i=0,j=diffmax-diff; i0) {
- String sq = current.getSequence();
- current.setSequence(sq.substring(0, hcend-dr[i])+gaps.substring(0, dr[i]-diff)+sq.substring());
- }
- }
- }
- }*/
+ seqs = viewport.getAlignment().getSequencesArray();
+ }
- viewport.setStartRes(seq.findIndex(startRes)-1);
+ // This is to maintain viewport position on first residue
+ // of first sequence
+ SequenceI seq = viewport.getAlignment().getSequenceAt(0);
+ int startRes = seq.findPosition(viewport.startRes);
+
+ addHistoryItem(new RemoveGapsCommand("Remove Gaps", seqs, start, end,
+ viewport.getAlignment()));
+
+ viewport.setStartRes(seq.findIndex(startRes) - 1);
+
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment()
+ .getSequences());
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
}
- public void alignmentChanged()
- {
- if(viewport.padGaps)
- viewport.getAlignment().padGaps();
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
+ */
+ @Override
+ public void padGapsMenuitem_actionPerformed(ActionEvent e)
+ {
+ viewport.setPadGaps(padGapsMenuitem.isSelected());
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment()
+ .getSequences());
+ }
+
+ // else
+ {
+ // if (justifySeqs>0)
+ {
+ // alignment.justify(justifySeqs!=RIGHT_JUSTIFY);
+ }
+ }
- if(viewport.vconsensus!=null && viewport.autoCalculateConsensus)
- {
- viewport.updateConsensus();
- viewport.updateConservation();
- }
+ // }
- resetAllColourSchemes();
- if(alignPanel.overviewPanel!=null)
- alignPanel.overviewPanel.updateOverviewImage();
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
+ */
+ @Override
+ public void findMenuItem_actionPerformed(ActionEvent e)
+ {
+ new Finder();
+ }
- viewport.alignment.adjustSequenceAnnotations();
+ @Override
+ public void newView_actionPerformed(ActionEvent e)
+ {
+ newView(true);
+ }
- if(alignPanel.overviewPanel!=null)
- alignPanel.overviewPanel.updateOverviewImage();
+ /**
+ *
+ * @param copyAnnotation
+ * if true then duplicate all annnotation, groups and settings
+ * @return new alignment panel, already displayed.
+ */
+ public AlignmentPanel newView(boolean copyAnnotation)
+ {
+ return newView(null, copyAnnotation);
+ }
- alignPanel.repaint();
- }
+ /**
+ *
+ * @param viewTitle
+ * title of newly created view
+ * @return new alignment panel, already displayed.
+ */
+ public AlignmentPanel newView(String viewTitle)
+ {
+ return newView(viewTitle, true);
+ }
- void resetAllColourSchemes()
+ /**
+ *
+ * @param viewTitle
+ * title of newly created view
+ * @param copyAnnotation
+ * if true then duplicate all annnotation, groups and settings
+ * @return new alignment panel, already displayed.
+ */
+ public AlignmentPanel newView(String viewTitle, boolean copyAnnotation)
{
- ColourSchemeI cs = viewport.globalColourScheme;
- if(cs!=null)
+ AlignmentPanel newap = new Jalview2XML().copyAlignPanel(alignPanel,
+ true);
+ if (!copyAnnotation)
{
- if (cs instanceof ClustalxColourScheme)
+ // just remove all the current annotation except for the automatic stuff
+ newap.av.getAlignment().deleteAllGroups();
+ for (AlignmentAnnotation alan : newap.av.getAlignment()
+ .getAlignmentAnnotation())
{
- ( (ClustalxColourScheme) viewport.getGlobalColourScheme()).
- resetClustalX(viewport.alignment.getSequences(),
- viewport.alignment.getWidth());
+ if (!alan.autoCalculated)
+ {
+ newap.av.getAlignment().deleteAnnotation(alan);
+ }
+ ;
}
+ }
- 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);
+ newap.av.gatherViewsHere = false;
- cs.setConservation(c);
- }
+ if (viewport.viewName == null)
+ {
+ viewport.viewName = "Original";
}
- int s, sSize = viewport.alignment.getGroups().size();
- for(s=0; s 0)
+ || (sg != null && sg.getSize() > 0 && sg.getStartRes() <= sg
+ .getEndRes()))
+ {
+ // now invert the sequence set, if required - empty selection implies
+ // that no hiding is required.
+ if (sg != null)
+ {
+ invertSequenceMenuItem_actionPerformed(null);
+ sg = viewport.getSelectionGroup();
+ toggleSeqs = true;
+
+ }
+ viewport.expandColSelection(sg, true);
+ // finally invert the column selection and get the new sequence
+ // selection.
+ invertColSel_actionPerformed(null);
+ toggleCols = true;
+ }
+ }
+
+ if (toggleSeqs)
+ {
+ if (sg != null && sg.getSize() != viewport.getAlignment().getHeight())
+ {
+ hideSelSequences_actionPerformed(null);
+ hide = true;
+ }
+ else if (!(toggleCols && viewport.getColumnSelection().getSelected()
+ .size() > 0))
+ {
+ showAllSeqs_actionPerformed(null);
+ }
+ }
+
+ if (toggleCols)
+ {
+ if (viewport.getColumnSelection().getSelected().size() > 0)
+ {
+ hideSelColumns_actionPerformed(null);
+ if (!toggleSeqs)
+ {
+ viewport.setSelectionGroup(sg);
+ }
+ }
+ else if (!hide)
+ {
+ showAllColumns_actionPerformed(null);
+ }
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.jbgui.GAlignFrame#hideAllButSelection_actionPerformed(java.awt.
+ * event.ActionEvent)
+ */
+ @Override
+ public void hideAllButSelection_actionPerformed(ActionEvent e)
+ {
+ toggleHiddenRegions(false, false);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.jbgui.GAlignFrame#hideAllSelection_actionPerformed(java.awt.event
+ * .ActionEvent)
+ */
+ @Override
+ public void hideAllSelection_actionPerformed(ActionEvent e)
+ {
+ SequenceGroup sg = viewport.getSelectionGroup();
+ viewport.expandColSelection(sg, false);
+ viewport.hideAllSelectedSeqs();
+ viewport.hideSelectedColumns();
+ alignPanel.paintAlignment(true);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.jbgui.GAlignFrame#showAllhidden_actionPerformed(java.awt.event.
+ * ActionEvent)
+ */
+ @Override
+ public void showAllhidden_actionPerformed(ActionEvent e)
+ {
+ viewport.showAllHiddenColumns();
+ viewport.showAllHiddenSeqs();
+ alignPanel.paintAlignment(true);
+ }
+
+ @Override
+ public void hideSelColumns_actionPerformed(ActionEvent e)
+ {
+ viewport.hideSelectedColumns();
+ alignPanel.paintAlignment(true);
+ }
+
+ @Override
+ public void hiddenMarkers_actionPerformed(ActionEvent e)
+ {
+ viewport.setShowHiddenMarkers(hiddenMarkers.isSelected());
+ repaint();
+ }
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void scaleAbove_actionPerformed(ActionEvent e)
{
viewport.setScaleAboveWrapped(scaleAbove.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void scaleLeft_actionPerformed(ActionEvent e)
{
viewport.setScaleLeftWrapped(scaleLeft.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void scaleRight_actionPerformed(ActionEvent e)
{
viewport.setScaleRightWrapped(scaleRight.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void viewBoxesMenuItem_actionPerformed(ActionEvent e)
{
viewport.setShowBoxes(viewBoxesMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void viewTextMenuItem_actionPerformed(ActionEvent e)
{
viewport.setShowText(viewTextMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void renderGapsMenuItem_actionPerformed(ActionEvent e)
{
viewport.setRenderGaps(renderGapsMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
-
public FeatureSettings featureSettings;
+
+ @Override
public void featureSettings_actionPerformed(ActionEvent e)
{
- if(featureSettings !=null )
+ if (featureSettings != null)
{
featureSettings.close();
featureSettings = null;
}
+ if (!showSeqFeatures.isSelected())
+ {
+ // make sure features are actually displayed
+ showSeqFeatures.setSelected(true);
+ showSeqFeatures_actionPerformed(null);
+ }
featureSettings = new FeatureSettings(this);
}
/**
- * DOCUMENT ME!
- *
- * @param evt DOCUMENT ME!
+ * Set or clear 'Show Sequence Features'
+ *
+ * @param evt
+ * DOCUMENT ME!
*/
+ @Override
public void showSeqFeatures_actionPerformed(ActionEvent evt)
{
viewport.setShowSequenceFeatures(showSeqFeatures.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
+ if (alignPanel.getOverviewPanel() != null)
+ {
+ alignPanel.getOverviewPanel().updateOverviewImage();
+ }
+ }
+
+ /**
+ * Set or clear 'Show Sequence Features'
+ *
+ * @param evt
+ * DOCUMENT ME!
+ */
+ @Override
+ public void showSeqFeaturesHeight_actionPerformed(ActionEvent evt)
+ {
+ viewport.setShowSequenceFeaturesHeight(showSeqFeaturesHeight
+ .isSelected());
+ if (viewport.getShowSequenceFeaturesHeight())
+ {
+ // ensure we're actually displaying features
+ viewport.setShowSequenceFeatures(true);
+ showSeqFeatures.setSelected(true);
+ }
+ alignPanel.paintAlignment(true);
if (alignPanel.getOverviewPanel() != null)
{
alignPanel.getOverviewPanel().updateOverviewImage();
@@ -1550,20 +2941,38 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void annotationPanelMenuItem_actionPerformed(ActionEvent e)
{
viewport.setShowAnnotation(annotationPanelMenuItem.isSelected());
alignPanel.setAnnotationVisible(annotationPanelMenuItem.isSelected());
}
+ @Override
+ public void alignmentProperties()
+ {
+ JEditorPane editPane = new JEditorPane("text/html", "");
+ editPane.setEditable(false);
+ StringBuffer contents = new AlignmentProperties(viewport.getAlignment())
+ .formatAsHtml();
+ editPane.setText(MessageManager.formatMessage("label.html_content", new String[]{contents.toString()}));
+ JInternalFrame frame = new JInternalFrame();
+ frame.getContentPane().add(new JScrollPane(editPane));
+
+ Desktop.instance.addInternalFrame(frame, MessageManager.formatMessage("label.alignment_properties", new String[]{getTitle()}), 500, 400);
+ }
+
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void overviewMenuItem_actionPerformed(ActionEvent e)
{
if (alignPanel.overviewPanel != null)
@@ -1574,28 +2983,36 @@ public class AlignFrame
JInternalFrame frame = new JInternalFrame();
OverviewPanel overview = new OverviewPanel(alignPanel);
frame.setContentPane(overview);
- Desktop.addInternalFrame(frame, "Overview " + this.getTitle(),
- frame.getWidth(), frame.getHeight());
+ Desktop.addInternalFrame(frame, MessageManager.formatMessage("label.overview_params", new String[]{this.getTitle()}),
+ frame.getWidth(), frame.getHeight());
frame.pack();
frame.setLayer(JLayeredPane.PALETTE_LAYER);
frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
{
+ @Override
public void internalFrameClosed(
- javax.swing.event.InternalFrameEvent evt)
+ javax.swing.event.InternalFrameEvent evt)
{
alignPanel.setOverviewPanel(null);
- }
- ;
+ };
});
alignPanel.setOverviewPanel(overview);
}
+ @Override
+ public void textColour_actionPerformed(ActionEvent e)
+ {
+ new TextColourChooser().chooseColour(alignPanel, null);
+ }
+
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void noColourmenuItem_actionPerformed(ActionEvent e)
{
changeColour(null);
@@ -1603,20 +3020,24 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void clustalColour_actionPerformed(ActionEvent e)
{
- changeColour(new ClustalxColourScheme(
- viewport.alignment.getSequences(), viewport.alignment.getWidth()));
+ changeColour(new ClustalxColourScheme(viewport.getAlignment(),
+ viewport.getHiddenRepSequences()));
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void zappoColour_actionPerformed(ActionEvent e)
{
changeColour(new ZappoColourScheme());
@@ -1624,9 +3045,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void taylorColour_actionPerformed(ActionEvent e)
{
changeColour(new TaylorColourScheme());
@@ -1634,9 +3057,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void hydrophobicityColour_actionPerformed(ActionEvent e)
{
changeColour(new HydrophobicColourScheme());
@@ -1644,9 +3069,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void helixColour_actionPerformed(ActionEvent e)
{
changeColour(new HelixColourScheme());
@@ -1654,9 +3081,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void strandColour_actionPerformed(ActionEvent e)
{
changeColour(new StrandColourScheme());
@@ -1664,9 +3093,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void turnColour_actionPerformed(ActionEvent e)
{
changeColour(new TurnColourScheme());
@@ -1674,9 +3105,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void buriedColour_actionPerformed(ActionEvent e)
{
changeColour(new BuriedColourScheme());
@@ -1684,25 +3117,47 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void nucleotideColour_actionPerformed(ActionEvent e)
{
changeColour(new NucleotideColourScheme());
}
+ @Override
+ public void purinePyrimidineColour_actionPerformed(ActionEvent e)
+ {
+ changeColour(new PurinePyrimidineColourScheme());
+ }
+
+ /*
+ * public void covariationColour_actionPerformed(ActionEvent e) {
+ * changeColour(new
+ * CovariationColourScheme(viewport.getAlignment().getAlignmentAnnotation
+ * ()[0])); }
+ */
+ @Override
public void annotationColour_actionPerformed(ActionEvent e)
{
new AnnotationColourChooser(viewport, alignPanel);
}
+ @Override
+ public void rnahelicesColour_actionPerformed(ActionEvent e)
+ {
+ new RNAHelicesColourChooser(viewport, alignPanel);
+ }
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void applyToAllGroups_actionPerformed(ActionEvent e)
{
viewport.setColourAppliesToAllGroups(applyToAllGroups.isSelected());
@@ -1710,22 +3165,23 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param cs DOCUMENT ME!
+ *
+ * @param cs
+ * DOCUMENT ME!
*/
public void changeColour(ColourSchemeI cs)
{
+ // TODO: compare with applet and pull up to model method
int threshold = 0;
- if(cs!=null)
+ if (cs != null)
{
if (viewport.getAbovePIDThreshold())
{
threshold = SliderPanel.setPIDSliderSource(alignPanel, cs,
- "Background");
+ "Background");
- cs.setThreshold(threshold,
- viewport.getIgnoreGapsConsensus());
+ cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
viewport.setGlobalColourScheme(cs);
}
@@ -1737,38 +3193,34 @@ public class AlignFrame
if (viewport.getConservationSelected())
{
- Alignment al = (Alignment) viewport.alignment;
+ Alignment al = (Alignment) viewport.getAlignment();
Conservation c = new Conservation("All",
- ResidueProperties.propHash, 3,
- al.getSequences(), 0,
- al.getWidth() - 1);
+ ResidueProperties.propHash, 3, al.getSequences(), 0,
+ al.getWidth() - 1);
c.calculate();
- c.verdict(false, viewport.ConsPercGaps);
+ c.verdict(false, viewport.getConsPercGaps());
cs.setConservation(c);
- cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel, cs,
- "Background"));
+ cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel,
+ cs, "Background"));
}
else
{
cs.setConservation(null);
}
- cs.setConsensus(viewport.vconsensus);
+ cs.setConsensus(viewport.getSequenceConsensusHash());
}
viewport.setGlobalColourScheme(cs);
if (viewport.getColourAppliesToAllGroups())
{
- Vector groups = viewport.alignment.getGroups();
- for (int i = 0; i < groups.size(); i++)
+ for (SequenceGroup sg : viewport.getAlignment().getGroups())
{
- SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
-
if (cs == null)
{
sg.cs = null;
@@ -1777,51 +3229,52 @@ public class AlignFrame
if (cs instanceof ClustalxColourScheme)
{
- sg.cs = new ClustalxColourScheme(
- sg.getSequences(true), sg.getWidth());
+ sg.cs = new ClustalxColourScheme(sg,
+ viewport.getHiddenRepSequences());
}
else if (cs instanceof UserColourScheme)
{
- sg.cs = new UserColourScheme( ( (UserColourScheme) cs).getColours());
+ sg.cs = new UserColourScheme(((UserColourScheme) cs).getColours());
}
else
{
try
{
- sg.cs = (ColourSchemeI) cs.getClass().newInstance();
- }
- catch (Exception ex)
+ sg.cs = cs.getClass().newInstance();
+ } catch (Exception ex)
{
}
}
if (viewport.getAbovePIDThreshold()
- || cs instanceof PIDColourScheme
- || cs instanceof Blosum62ColourScheme)
+ || cs instanceof PIDColourScheme
+ || cs instanceof Blosum62ColourScheme)
{
- sg.cs.setThreshold(threshold,
- viewport.getIgnoreGapsConsensus());
+ sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());
- sg.cs.setConsensus(AAFrequency.calculate(
- sg.getSequences(true), 0,
- sg.getWidth()));
- }
+ sg.cs.setConsensus(AAFrequency.calculate(
+ sg.getSequences(viewport.getHiddenRepSequences()),
+ sg.getStartRes(), sg.getEndRes() + 1));
+ }
else
+ {
sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
-
+ }
if (viewport.getConservationSelected())
{
Conservation c = new Conservation("Group",
- ResidueProperties.propHash, 3,
- sg.getSequences(true), 0,
- viewport.alignment.getWidth() - 1);
+ ResidueProperties.propHash, 3, sg.getSequences(viewport
+ .getHiddenRepSequences()), sg.getStartRes(),
+ sg.getEndRes() + 1);
c.calculate();
- c.verdict(false, viewport.ConsPercGaps);
+ c.verdict(false, viewport.getConsPercGaps());
sg.cs.setConservation(c);
}
else
+ {
sg.cs.setConservation(null);
+ }
}
}
@@ -1830,46 +3283,52 @@ public class AlignFrame
alignPanel.getOverviewPanel().updateOverviewImage();
}
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void modifyPID_actionPerformed(ActionEvent e)
{
- if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null)
+ if (viewport.getAbovePIDThreshold()
+ && viewport.getGlobalColourScheme() != null)
{
SliderPanel.setPIDSliderSource(alignPanel,
- viewport.getGlobalColourScheme(),
- "Background");
+ viewport.getGlobalColourScheme(), "Background");
SliderPanel.showPIDSlider();
}
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void modifyConservation_actionPerformed(ActionEvent e)
{
- if (viewport.getConservationSelected() && viewport.globalColourScheme!=null)
+ if (viewport.getConservationSelected()
+ && viewport.getGlobalColourScheme() != null)
{
SliderPanel.setConservationSlider(alignPanel,
- viewport.globalColourScheme,
- "Background");
+ viewport.getGlobalColourScheme(), "Background");
SliderPanel.showConservationSlider();
}
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void conservationMenuItem_actionPerformed(ActionEvent e)
{
viewport.setConservationSelected(conservationMenuItem.isSelected());
@@ -1884,9 +3343,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void abovePIDThreshold_actionPerformed(ActionEvent e)
{
viewport.setAbovePIDThreshold(abovePIDThreshold.isSelected());
@@ -1901,19 +3362,21 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void userDefinedColour_actionPerformed(ActionEvent e)
{
- if (e.getActionCommand().equals("User Defined..."))
+ if (e.getActionCommand().equals(MessageManager.getString("action.user_defined")))
{
new UserDefinedColours(alignPanel, null);
}
else
{
- UserColourScheme udc = (UserColourScheme) UserDefinedColours.
- getUserColourSchemes().get(e.getActionCommand());
+ UserColourScheme udc = (UserColourScheme) UserDefinedColours
+ .getUserColourSchemes().get(e.getActionCommand());
changeColour(udc);
}
@@ -1926,8 +3389,8 @@ public class AlignFrame
int i, iSize = menuItems.length;
for (i = 0; i < iSize; i++)
{
- if (menuItems[i].getName() != null &&
- menuItems[i].getName().equals("USER_DEFINED"))
+ if (menuItems[i].getName() != null
+ && menuItems[i].getName().equals("USER_DEFINED"))
{
colourMenu.remove(menuItems[i]);
iSize--;
@@ -1935,44 +3398,52 @@ public class AlignFrame
}
if (jalview.gui.UserDefinedColours.getUserColourSchemes() != null)
{
- java.util.Enumeration userColours = jalview.gui.UserDefinedColours.
- getUserColourSchemes().keys();
+ java.util.Enumeration userColours = jalview.gui.UserDefinedColours
+ .getUserColourSchemes().keys();
while (userColours.hasMoreElements())
{
- final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.
- nextElement().toString());
+ final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
+ userColours.nextElement().toString());
radioItem.setName("USER_DEFINED");
radioItem.addMouseListener(new MouseAdapter()
+ {
+ @Override
+ public void mousePressed(MouseEvent evt)
+ {
+ if (evt.isControlDown()
+ || SwingUtilities.isRightMouseButton(evt))
{
- public void mousePressed(MouseEvent evt)
- {
- if(evt.isControlDown() || SwingUtilities.isRightMouseButton(evt))
- {
- radioItem.removeActionListener(radioItem.getActionListeners()[0]);
+ radioItem.removeActionListener(radioItem.getActionListeners()[0]);
- int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop,
- "Remove from default list?",
- "Remove user defined colour",
+ int option = JOptionPane.showInternalConfirmDialog(
+ jalview.gui.Desktop.desktop,
+ MessageManager.getString("label.remove_from_default_list"),
+ MessageManager.getString("label.remove_user_defined_colour"),
JOptionPane.YES_NO_OPTION);
- if(option == JOptionPane.YES_OPTION)
+ if (option == JOptionPane.YES_OPTION)
+ {
+ jalview.gui.UserDefinedColours
+ .removeColourFromDefaults(radioItem.getText());
+ colourMenu.remove(radioItem);
+ }
+ else
+ {
+ radioItem.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent evt)
{
- jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText());
- colourMenu.remove(radioItem);
+ userDefinedColour_actionPerformed(evt);
}
- else
- radioItem.addActionListener(new ActionListener()
- {
- public void actionPerformed(ActionEvent evt)
- {
- userDefinedColour_actionPerformed(evt);
- }
- });
- }
+ });
}
- });
+ }
+ }
+ });
radioItem.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent evt)
{
userDefinedColour_actionPerformed(evt);
@@ -1987,9 +3458,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void PIDColour_actionPerformed(ActionEvent e)
{
changeColour(new PIDColourScheme());
@@ -1997,9 +3470,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void BLOSUM62Colour_actionPerformed(ActionEvent e)
{
changeColour(new Blosum62ColourScheme());
@@ -2007,119 +3482,161 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void sortPairwiseMenuItem_actionPerformed(ActionEvent e)
{
- addHistoryItem(new HistoryItem("Pairwise Sort", viewport.alignment,
- HistoryItem.SORT));
- AlignmentSorter.sortByPID(viewport.getAlignment(),
- viewport.getAlignment().getSequenceAt(0));
- alignPanel.repaint();
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+ AlignmentSorter.sortByPID(viewport.getAlignment(), viewport
+ .getAlignment().getSequenceAt(0), null);
+ addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder,
+ viewport.getAlignment()));
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void sortIDMenuItem_actionPerformed(ActionEvent e)
{
- addHistoryItem(new HistoryItem("ID Sort", viewport.alignment,
- HistoryItem.SORT));
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
AlignmentSorter.sortByID(viewport.getAlignment());
- alignPanel.repaint();
+ addHistoryItem(new OrderCommand("ID Sort", oldOrder,
+ viewport.getAlignment()));
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
- public void sortGroupMenuItem_actionPerformed(ActionEvent e)
+ @Override
+ public void sortLengthMenuItem_actionPerformed(ActionEvent e)
{
- addHistoryItem(new HistoryItem("Group Sort", viewport.alignment,
- HistoryItem.SORT));
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+ AlignmentSorter.sortByLength(viewport.getAlignment());
+ addHistoryItem(new OrderCommand("Length Sort", oldOrder,
+ viewport.getAlignment()));
+ alignPanel.paintAlignment(true);
+ }
+ /**
+ * DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
+ */
+ @Override
+ public void sortGroupMenuItem_actionPerformed(ActionEvent e)
+ {
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
AlignmentSorter.sortByGroup(viewport.getAlignment());
- alignPanel.repaint();
+ addHistoryItem(new OrderCommand("Group Sort", oldOrder,
+ viewport.getAlignment()));
+
+ alignPanel.paintAlignment(true);
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void removeRedundancyMenuItem_actionPerformed(ActionEvent e)
{
new RedundancyPanel(alignPanel, this);
}
-
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)
{
- if ( (viewport.getSelectionGroup() == null) ||
- (viewport.getSelectionGroup().getSize(false) < 2))
+ if ((viewport.getSelectionGroup() == null)
+ || (viewport.getSelectionGroup().getSize() < 2))
{
JOptionPane.showInternalMessageDialog(this,
- "You must select at least 2 sequences.",
- "Invalid Selection",
- JOptionPane.WARNING_MESSAGE);
+ MessageManager.getString("label.you_must_select_least_two_sequences"), MessageManager.getString("label.invalid_selection"),
+ JOptionPane.WARNING_MESSAGE);
}
else
{
JInternalFrame frame = new JInternalFrame();
frame.setContentPane(new PairwiseAlignPanel(viewport));
- Desktop.addInternalFrame(frame, "Pairwise Alignment", 600, 500);
+ Desktop.addInternalFrame(frame, MessageManager.getString("action.pairwise_alignment"), 600, 500);
}
}
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void PCAMenuItem_actionPerformed(ActionEvent e)
{
- if ( ( (viewport.getSelectionGroup() != null) &&
- (viewport.getSelectionGroup().getSize(false) < 4) &&
- (viewport.getSelectionGroup().getSize(false) > 0)) ||
- (viewport.getAlignment().getHeight() < 4))
+ if (((viewport.getSelectionGroup() != null)
+ && (viewport.getSelectionGroup().getSize() < 4) && (viewport
+ .getSelectionGroup().getSize() > 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);
+ MessageManager.getString("label.principal_component_analysis_must_take_least_four_input_sequences"),
+ MessageManager.getString("label.sequence_selection_insufficient"),
+ JOptionPane.WARNING_MESSAGE);
return;
}
- new PCAPanel(viewport);
+ new PCAPanel(alignPanel);
}
-
+ @Override
public void autoCalculate_actionPerformed(ActionEvent e)
{
viewport.autoCalculateConsensus = autoCalculate.isSelected();
- if(viewport.autoCalculateConsensus)
+ if (viewport.autoCalculateConsensus)
{
- alignmentChanged();
+ viewport.firePropertyChange("alignment", null, viewport
+ .getAlignment().getSequences());
}
}
+ @Override
+ public void sortByTreeOption_actionPerformed(ActionEvent e)
+ {
+ viewport.sortByTree = sortByTree.isSelected();
+ }
+
+ @Override
+ protected void listenToViewSelections_actionPerformed(ActionEvent e)
+ {
+ viewport.followSelection = listenToViewSelections.isSelected();
+ }
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void averageDistanceTreeMenuItem_actionPerformed(ActionEvent e)
{
NewTreePanel("AV", "PID", "Average distance tree using PID");
@@ -2127,9 +3644,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
public void neighbourTreeMenuItem_actionPerformed(ActionEvent e)
{
NewTreePanel("NJ", "PID", "Neighbour joining tree using PID");
@@ -2137,9 +3656,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void njTreeBlosumMenuItem_actionPerformed(ActionEvent e)
{
NewTreePanel("NJ", "BL", "Neighbour joining tree using BLOSUM62");
@@ -2147,9 +3668,11 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void avTreeBlosumMenuItem_actionPerformed(ActionEvent e)
{
NewTreePanel("AV", "BL", "Average distance tree using BLOSUM62");
@@ -2157,202 +3680,323 @@ public class AlignFrame
/**
* DOCUMENT ME!
- *
- * @param type DOCUMENT ME!
- * @param pwType DOCUMENT ME!
- * @param title DOCUMENT ME!
+ *
+ * @param type
+ * DOCUMENT ME!
+ * @param pwType
+ * DOCUMENT ME!
+ * @param title
+ * DOCUMENT ME!
*/
void NewTreePanel(String type, String pwType, String title)
{
TreePanel tp;
- if (viewport.getSelectionGroup() != null) {
- if (viewport.getSelectionGroup().getSize(false) < 3) {
- JOptionPane.showMessageDialog(Desktop.desktop,
- "You need to have more than two sequences selected to build a tree!",
- "Not enough sequences",
- JOptionPane.WARNING_MESSAGE);
+ if (viewport.getSelectionGroup() != null
+ && viewport.getSelectionGroup().getSize() > 0)
+ {
+ if (viewport.getSelectionGroup().getSize() < 3)
+ {
+ JOptionPane
+ .showMessageDialog(
+ Desktop.desktop,
+ MessageManager.getString("label.you_need_more_two_sequences_selected_build_tree"),
+ MessageManager.getString("label.not_enough_sequences"), JOptionPane.WARNING_MESSAGE);
return;
}
- int s = 0;
SequenceGroup sg = viewport.getSelectionGroup();
/* Decide if the selection is a column region */
- while (s < sg.getSize(false))
+ for (SequenceI _s : sg.getSequences())
{
- if ( ( (SequenceI) sg.getSequences(false).elementAt(s++)).getLength() <
- sg.getEndRes())
+ if (_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);
+ JOptionPane
+ .showMessageDialog(
+ Desktop.desktop,
+ MessageManager.getString("label.selected_region_to_tree_may_only_contain_residues_or_gaps"),
+ MessageManager.getString("label.sequences_selection_not_aligned"),
+ JOptionPane.WARNING_MESSAGE);
return;
}
}
title = title + " on region";
- tp = new TreePanel(viewport, type, pwType);
+ tp = new TreePanel(alignPanel, type, pwType);
}
else
{
- //are the sequences aligned?
- if (!viewport.alignment.isAligned())
+ // are the visible sequences aligned?
+ if (!viewport.getAlignment().isAligned(false))
{
- 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);
+ JOptionPane
+ .showMessageDialog(
+ Desktop.desktop,
+ MessageManager.getString("label.sequences_must_be_aligned_before_creating_tree"),
+ MessageManager.getString("label.sequences_not_aligned"),
+ JOptionPane.WARNING_MESSAGE);
return;
}
- if(viewport.alignment.getHeight()<2)
+ if (viewport.getAlignment().getHeight() < 2)
+ {
return;
+ }
- tp = new TreePanel(viewport, type, pwType);
+ tp = new TreePanel(alignPanel, type, pwType);
+ }
+
+ title += " from ";
+
+ if (viewport.viewName != null)
+ {
+ title += viewport.viewName + " of ";
}
- addTreeMenuItem(tp, title);
+ title += this.title;
- Desktop.addInternalFrame(tp, title + " from " + this.title, 600, 500);
+ Desktop.addInternalFrame(tp, title, 600, 500);
}
/**
* DOCUMENT ME!
- *
- * @param title DOCUMENT ME!
- * @param order DOCUMENT ME!
+ *
+ * @param title
+ * DOCUMENT ME!
+ * @param order
+ * DOCUMENT ME!
*/
- public void addSortByOrderMenuItem(String title, final AlignmentOrder order)
+ 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()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
- addHistoryItem(new HistoryItem("Sort", viewport.alignment,
- HistoryItem.SORT));
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
- // TODO: JBPNote - have to map order entries to curent SequenceI pointers
+ // TODO: JBPNote - have to map order entries to curent SequenceI
+ // pointers
AlignmentSorter.sortBy(viewport.getAlignment(), order);
- alignPanel.repaint();
+
+ addHistoryItem(new OrderCommand(order.getName(), oldOrder, viewport
+ .getAlignment()));
+
+ alignPanel.paintAlignment(true);
}
});
}
/**
- * 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.
+ * Add a new sort by annotation score menu item
+ *
+ * @param sort
+ * the menu to add the option to
+ * @param scoreLabel
+ * the label used to retrieve scores for each sequence on the
+ * alignment
*/
- void addTreeMenuItem(final TreePanel treePanel, String title)
+ public void addSortByAnnotScoreMenuItem(JMenu sort,
+ final String scoreLabel)
{
- final JMenuItem item = new JMenuItem(title);
+ final JMenuItem item = new JMenuItem(scoreLabel);
+ sort.add(item);
+ item.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+ AlignmentSorter.sortByAnnotationScore(scoreLabel,
+ viewport.getAlignment());// ,viewport.getSelectionGroup());
+ addHistoryItem(new OrderCommand("Sort by " + scoreLabel, oldOrder,
+ viewport.getAlignment()));
+ alignPanel.paintAlignment(true);
+ }
+ });
+ }
- treeCount++;
+ /**
+ * last hash for alignment's annotation array - used to minimise cost of
+ * rebuild.
+ */
+ protected int _annotationScoreVectorHash;
- if (treeCount == 1)
+ /**
+ * search the alignment and rebuild the sort by annotation score submenu the
+ * last alignment annotation vector hash is stored to minimize cost of
+ * rebuilding in subsequence calls.
+ *
+ */
+ @Override
+ public void buildSortByAnnotationScoresMenu()
+ {
+ if (viewport.getAlignment().getAlignmentAnnotation() == null)
{
- sort.add(sortByTreeMenu);
+ return;
}
- sortByTreeMenu.add(item);
- item.addActionListener(new java.awt.event.ActionListener()
+ if (viewport.getAlignment().getAlignmentAnnotation().hashCode() != _annotationScoreVectorHash)
{
- public void actionPerformed(ActionEvent e)
+ sortByAnnotScore.removeAll();
+ // almost certainly a quicker way to do this - but we keep it simple
+ Hashtable scoreSorts = new Hashtable();
+ AlignmentAnnotation aann[];
+ for (SequenceI sqa : viewport.getAlignment().getSequences())
{
- addHistoryItem(new HistoryItem("Tree Sort",
- viewport.alignment, HistoryItem.SORT));
- AlignmentSorter.sortByTree(viewport.getAlignment(),
- treePanel.getTree());
- alignPanel.repaint();
+ aann = sqa.getAnnotation();
+ for (int i = 0; aann != null && i < aann.length; i++)
+ {
+ if (aann[i].hasScore() && aann[i].sequenceRef != null)
+ {
+ scoreSorts.put(aann[i].label, aann[i].label);
+ }
+ }
}
- });
+ Enumeration labels = scoreSorts.keys();
+ while (labels.hasMoreElements())
+ {
+ addSortByAnnotScoreMenuItem(sortByAnnotScore,
+ (String) labels.nextElement());
+ }
+ sortByAnnotScore.setVisible(scoreSorts.size() > 0);
+ scoreSorts.clear();
+
+ _annotationScoreVectorHash = viewport.getAlignment()
+ .getAlignmentAnnotation().hashCode();
+ }
+ }
+
+ /**
+ * 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.
+ */
+ @Override
+ public void buildTreeMenu()
+ {
+ sortByTreeMenu.removeAll();
- treePanel.addInternalFrameListener(new javax.swing.event.
- InternalFrameAdapter()
+ Vector comps = (Vector) PaintRefresher.components.get(viewport
+ .getSequenceSetId());
+ Vector treePanels = new Vector();
+ int i, iSize = comps.size();
+ for (i = 0; i < iSize; i++)
{
- public void internalFrameClosed(
- javax.swing.event.InternalFrameEvent evt)
+ if (comps.elementAt(i) instanceof TreePanel)
{
- treeCount--;
- sortByTreeMenu.remove(item);
+ treePanels.add(comps.elementAt(i));
+ }
+ }
+
+ iSize = treePanels.size();
+
+ if (iSize < 1)
+ {
+ sortByTreeMenu.setVisible(false);
+ return;
+ }
+
+ sortByTreeMenu.setVisible(true);
- if (treeCount == 0)
+ for (i = 0; i < treePanels.size(); i++)
+ {
+ final TreePanel tp = (TreePanel) treePanels.elementAt(i);
+ final JMenuItem item = new JMenuItem(tp.getTitle());
+ final NJTree tree = ((TreePanel) treePanels.elementAt(i)).getTree();
+ item.addActionListener(new java.awt.event.ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
{
- sort.remove(sortByTreeMenu);
+ tp.sortByTree_actionPerformed(null);
+ addHistoryItem(tp.sortAlignmentIn(alignPanel));
+
}
- }
- ;
- });
+ });
+
+ sortByTreeMenu.add(item);
+ }
+ }
+
+ public boolean sortBy(AlignmentOrder alorder, String undoname)
+ {
+ SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+ AlignmentSorter.sortBy(viewport.getAlignment(), alorder);
+ if (undoname != null)
+ {
+ addHistoryItem(new OrderCommand(undoname, oldOrder,
+ viewport.getAlignment()));
+ }
+ alignPanel.paintAlignment(true);
+ return true;
}
/**
- * Work out whether the whole set of sequences
- * or just the selected set will be submitted for multiple alignment.
- *
+ * Work out whether the whole set of sequences or just the selected set will
+ * be submitted for multiple alignment.
+ *
*/
- private jalview.datamodel.AlignmentView gatherSequencesForAlignment()
+ public jalview.datamodel.AlignmentView gatherSequencesForAlignment()
{
// Now, check we have enough sequences
AlignmentView msa = null;
- if ( (viewport.getSelectionGroup() != null) &&
- (viewport.getSelectionGroup().getSize(false) > 1))
+ 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(false)];
-
- for (int i = 0; i < sz; i++)
- {
- msa[i] = (SequenceI) seqs.getSequenceAt(i);
- } */
+ // 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(false)];
+ *
+ * for (int i = 0; i < sz; i++) { msa[i] = (SequenceI)
+ * seqs.getSequenceAt(i); }
+ */
msa = viewport.getAlignmentView(true);
}
else
{
- /*Vector seqs = viewport.getAlignment().getSequences();
-
- if (seqs.size() > 1)
- {
- msa = new SequenceI[seqs.size()];
-
- for (int i = 0; i < seqs.size(); i++)
- {
- msa[i] = (SequenceI) seqs.elementAt(i);
- }
- }*/
+ /*
+ * Vector seqs = viewport.getAlignment().getSequences();
+ *
+ * if (seqs.size() > 1) { msa = new SequenceI[seqs.size()];
+ *
+ * for (int i = 0; i < seqs.size(); i++) { msa[i] = (SequenceI)
+ * seqs.elementAt(i); } }
+ */
msa = viewport.getAlignmentView(false);
}
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).
+ * Decides what is submitted to a secondary structure prediction service: the
+ * first sequence in the alignment, or in the current selection, or, if the
+ * alignment is 'aligned' (ie padded with gaps), then the currently selected
+ * region or the whole alignment. (where the first sequence in the set is the
+ * one that the prediction will be for).
*/
- AlignmentView gatherSeqOrMsaForSecStrPrediction()
+ public AlignmentView gatherSeqOrMsaForSecStrPrediction()
{
- AlignmentView seqs = null;
+ AlignmentView seqs = null;
- if ( (viewport.getSelectionGroup() != null) &&
- (viewport.getSelectionGroup().getSize(false) > 0))
+ if ((viewport.getSelectionGroup() != null)
+ && (viewport.getSelectionGroup().getSize() > 0))
{
seqs = viewport.getAlignmentView(true);
}
@@ -2360,28 +4004,36 @@ public class AlignFrame
{
seqs = viewport.getAlignmentView(false);
}
- // limit sequences - JBPNote in future - could spawn multiple prediction jobs
- // TODO: viewport.alignment.isAligned is a global state - the local selection may well be aligned - we preserve 2.0.8 behaviour for moment.
- if (!viewport.alignment.isAligned())
+ // limit sequences - JBPNote in future - could spawn multiple prediction
+ // jobs
+ // TODO: viewport.getAlignment().isAligned is a global state - the local
+ // selection may well be aligned - we preserve 2.0.8 behaviour for moment.
+ if (!viewport.getAlignment().isAligned(false))
{
- seqs.setSequences(new SeqCigar[] { seqs.getSequences()[0] } );
+ seqs.setSequences(new SeqCigar[]
+ { seqs.getSequences()[0] });
+ // TODO: if seqs.getSequences().length>1 then should really have warned
+ // user!
+
}
return seqs;
}
+
/**
* DOCUMENT ME!
- *
- * @param e DOCUMENT ME!
+ *
+ * @param e
+ * DOCUMENT ME!
*/
+ @Override
protected void LoadtreeMenuItem_actionPerformed(ActionEvent e)
{
// Pick the tree file
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
- getProperty(
- "LAST_DIRECTORY"));
+ JalviewFileChooser chooser = new JalviewFileChooser(
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Select a newick-like tree file");
- chooser.setToolTipText("Load a tree file");
+ chooser.setDialogTitle(MessageManager.getString("label.select_newick_like_tree_file"));
+ chooser.setToolTipText(MessageManager.getString("label.load_tree_file"));
int value = chooser.showOpenDialog(null);
@@ -2389,38 +4041,71 @@ public class AlignFrame
{
String choice = chooser.getSelectedFile().getPath();
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);
-
+ jalview.io.NewickFile fin = null;
try
{
- jalview.io.NewickFile fin = new jalview.io.NewickFile(choice,
- "File");
+ fin = new jalview.io.NewickFile(choice, "File");
viewport.setCurrentTree(ShowNewickTree(fin, choice).getTree());
+ } catch (Exception ex)
+ {
+ JOptionPane.showMessageDialog(Desktop.desktop, ex.getMessage(),
+ MessageManager.getString("label.problem_reading_tree_file"), JOptionPane.WARNING_MESSAGE);
+ ex.printStackTrace();
}
- catch (Exception ex)
+ if (fin != null && fin.hasWarningMessage())
{
JOptionPane.showMessageDialog(Desktop.desktop,
- "Problem reading tree file",
- ex.getMessage(),
- JOptionPane.WARNING_MESSAGE);
- ex.printStackTrace();
+ fin.getWarningMessage(), MessageManager.getString("label.possible_problem_with_tree_file"),
+ JOptionPane.WARNING_MESSAGE);
}
}
}
+ @Override
+ protected void tcoffeeColorScheme_actionPerformed(ActionEvent e)
+ {
+ changeColour(new TCoffeeColourScheme(alignPanel.getAlignment()));
+ }
public TreePanel ShowNewickTree(NewickFile nf, String title)
{
- return ShowNewickTree(nf,title,600,500,4,5);
+ return ShowNewickTree(nf, title, 600, 500, 4, 5);
+ }
+
+ public TreePanel ShowNewickTree(NewickFile nf, String title,
+ AlignmentView input)
+ {
+ return ShowNewickTree(nf, title, input, 600, 500, 4, 5);
+ }
+
+ public TreePanel ShowNewickTree(NewickFile nf, String title, int w,
+ int h, int x, int y)
+ {
+ return ShowNewickTree(nf, title, null, w, h, x, y);
}
+
/**
- * DOCUMENT ME!
- *
- * @param nf DOCUMENT ME!
- * @param title DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Add a treeviewer for the tree extracted from a newick file object to the
+ * current alignment view
+ *
+ * @param nf
+ * the tree
+ * @param title
+ * tree viewer title
+ * @param input
+ * Associated alignment input data (or null)
+ * @param w
+ * width
+ * @param h
+ * height
+ * @param x
+ * position
+ * @param y
+ * position
+ * @return TreePanel handle
*/
- public TreePanel ShowNewickTree(NewickFile nf, String title, int w,int h,int x, int y)
+ public TreePanel ShowNewickTree(NewickFile nf, String title,
+ AlignmentView input, int w, int h, int x, int y)
{
TreePanel tp = null;
@@ -2430,22 +4115,18 @@ public class AlignFrame
if (nf.getTree() != null)
{
- tp = new TreePanel(viewport,
- "FromFile",
- title,
- nf);
-
- tp.setSize(w,h);
+ tp = new TreePanel(alignPanel, "FromFile", title, nf, input);
- if(x>0 && y>0)
- tp.setLocation(x,y);
+ tp.setSize(w, h);
+ if (x > 0 && y > 0)
+ {
+ tp.setLocation(x, y);
+ }
Desktop.addInternalFrame(tp, title, w, h);
- addTreeMenuItem(tp, title);
}
- }
- catch (Exception ex)
+ } catch (Exception ex)
{
ex.printStackTrace();
}
@@ -2453,324 +4134,560 @@ public class AlignFrame
return tp;
}
- class PrintThread
- extends Thread
- {
- public void run()
- {
- PrinterJob printJob = PrinterJob.getPrinterJob();
- PageFormat pf = printJob.pageDialog(printJob.defaultPage());
- printJob.setPrintable(alignPanel, pf);
-
- if (printJob.printDialog())
- {
- try
- {
- printJob.print();
- }
- catch (Exception PrintException)
- {
- PrintException.printStackTrace();
- }
- }
- }
- }
+ private boolean buildingMenu = false;
/**
* Generates menu items and listener event actions for web service clients
- *
+ *
*/
public void BuildWebServiceMenu()
{
- if ( (Discoverer.services != null)
- && (Discoverer.services.size() > 0))
+ while (buildingMenu)
+ {
+ try
+ {
+ System.err.println("Waiting for building menu to finish.");
+ Thread.sleep(10);
+ } catch (Exception e)
+ {
+ }
+ ;
+ }
+ final AlignFrame me = this;
+ buildingMenu = true;
+ new Thread(new Runnable()
{
- Vector msaws = (Vector) Discoverer.services.get("MsaWS");
- Vector secstrpr = (Vector) Discoverer.services.get("SecStrPred");
- Vector wsmenu = new Vector();
- final AlignFrame af = this;
- if (msaws != null)
+ @Override
+ public void run()
{
- // Add any Multiple Sequence Alignment Services
- final JMenu msawsmenu = new JMenu("Alignment");
- for (int i = 0, j = msaws.size(); i < j; i++)
+ final List legacyItems=new ArrayList();
+ try
{
- final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) msaws.
- get(i);
- final JMenuItem method = new JMenuItem(sh.getName());
- method.addActionListener(new ActionListener()
+ System.err.println("Building ws menu again "
+ + Thread.currentThread());
+ // TODO: add support for context dependent disabling of services based
+ // on
+ // alignment and current selection
+ // TODO: add additional serviceHandle parameter to specify abstract
+ // handler
+ // class independently of AbstractName
+ // TODO: add in rediscovery GUI function to restart discoverer
+ // TODO: group services by location as well as function and/or
+ // introduce
+ // object broker mechanism.
+ final Vector wsmenu = new Vector();
+ final IProgressIndicator af = me;
+ final JMenu msawsmenu = new JMenu("Alignment");
+ final JMenu secstrmenu = new JMenu(
+ "Secondary Structure Prediction");
+ final JMenu seqsrchmenu = new JMenu("Sequence Database Search");
+ final JMenu analymenu = new JMenu("Analysis");
+ final JMenu dismenu = new JMenu("Protein Disorder");
+ // JAL-940 - only show secondary structure prediction services from
+ // the legacy server
+ if (// Cache.getDefault("SHOW_JWS1_SERVICES", true)
+ // &&
+ Discoverer.services != null && (Discoverer.services.size() > 0))
{
- public void actionPerformed(ActionEvent e)
+ // TODO: refactor to allow list of AbstractName/Handler bindings to
+ // be
+ // stored or retrieved from elsewhere
+ // No MSAWS used any more:
+ // Vector msaws = null; // (Vector) Discoverer.services.get("MsaWS");
+ Vector secstrpr = (Vector) Discoverer.services
+ .get("SecStrPred");
+ if (secstrpr != null)
{
- AlignmentView msa = gatherSequencesForAlignment();
- new jalview.ws.MsaWSClient(sh, title, msa,
- false, true, viewport.getAlignment().getDataset(), af);
-
+ // Add any secondary structure prediction services
+ for (int i = 0, j = secstrpr.size(); i < j; i++)
+ {
+ final ext.vamsas.ServiceHandle sh = (ext.vamsas.ServiceHandle) secstrpr
+ .get(i);
+ jalview.ws.WSMenuEntryProviderI impl = jalview.ws.jws1.Discoverer
+ .getServiceClient(sh);
+ int p=secstrmenu.getItemCount();
+ impl.attachWSMenuEntry(secstrmenu, me);
+ int q=secstrmenu.getItemCount();
+ for (int litm=p;litm -1)
+ }
+
+ // Add all submenus in the order they should appear on the web
+ // services menu
+ wsmenu.add(msawsmenu);
+ wsmenu.add(secstrmenu);
+ wsmenu.add(dismenu);
+ wsmenu.add(analymenu);
+ // No search services yet
+ // wsmenu.add(seqsrchmenu);
+
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
{
- // We know that ClustalWS can accept partial alignments for refinement.
- final JMenuItem methodR = new JMenuItem(sh.getName()+" Realign");
- methodR.addActionListener(new ActionListener()
+ @Override
+ public void run()
{
- public void actionPerformed(ActionEvent e)
+ try
{
- AlignmentView msa = gatherSequencesForAlignment();
- new jalview.ws.MsaWSClient(sh, title, msa,
- true, true, viewport.getAlignment().getDataset(), af);
-
- }
-
- });
- msawsmenu.add(methodR);
-
- }
- }
- 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)
- {
- AlignmentView msa = gatherSeqOrMsaForSecStrPrediction();
- if (msa.getSequences().length == 1)
- {
- // Single Sequence prediction
- new jalview.ws.JPredClient(sh, title, false, msa, af);
- }
- else
- {
- if (msa.getSequences().length > 1)
+ webService.removeAll();
+ // first, add discovered services onto the webservices menu
+ if (wsmenu.size() > 0)
{
- // Sequence profile based prediction
- new jalview.ws.JPredClient(sh,
- title, true, msa, af);
+ for (int i = 0, j = wsmenu.size(); i < j; i++)
+ {
+ webService.add(wsmenu.get(i));
+ }
+ }
+ else
+ {
+ webService.add(me.webServiceNoServices);
+ }
+ // TODO: move into separate menu builder class.
+ boolean new_sspred=false;
+ if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
+ {
+ Jws2Discoverer jws2servs = Jws2Discoverer.getDiscoverer();
+ if (jws2servs != null)
+ {
+ if (jws2servs.hasServices())
+ {
+ jws2servs.attachWSMenuEntry(webService, me);
+ for (Jws2Instance sv:jws2servs.getServices()) {
+ if (sv.description.toLowerCase().contains("jpred"))
+ {
+ for (JMenuItem jmi:legacyItems)
+ {
+ jmi.setVisible(false);
+ }
+ }
+ }
+
+ }
+ if (jws2servs.isRunning())
+ {
+ JMenuItem tm = new JMenuItem(
+ "Still discovering JABA Services");
+ tm.setEnabled(false);
+ webService.add(tm);
+ }
+ }
}
+ build_urlServiceMenu(me.webService);
+ build_fetchdbmenu(webService);
+ for (JMenu item : wsmenu)
+ {
+ if (item.getItemCount() == 0)
+ {
+ item.setEnabled(false);
+ }
+ else
+ {
+ item.setEnabled(true);
+ }
+ }
+ } catch (Exception e)
+ {
+ Cache.log
+ .debug("Exception during web service menu building process.",
+ e);
}
+ ;
}
});
- secstrmenu.add(method);
+ } catch (Exception e)
+ {
}
- wsmenu.add(secstrmenu);
- }
- this.webService.removeAll();
- for (int i = 0, j = wsmenu.size(); i < j; i++)
- {
- webService.add( (JMenu) wsmenu.get(i));
+ ;
+
+ buildingMenu = false;
}
- }
- else
- {
- 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.
+ }).start();
+
}
- /* public void vamsasStore_actionPerformed(ActionEvent e)
+ /**
+ * construct any groupURL type service menu entries.
+ *
+ * @param webService
+ */
+ private void build_urlServiceMenu(JMenu webService)
{
- JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
- getProperty("LAST_DIRECTORY"));
-
- chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle("Export to Vamsas file");
- chooser.setToolTipText("Export");
-
- int value = chooser.showSaveDialog(this);
-
- if (value == JalviewFileChooser.APPROVE_OPTION)
+ // TODO: remove this code when 2.7 is released
+ // DEBUG - alignmentView
+ /*
+ * JMenuItem testAlView = new JMenuItem("Test AlignmentView"); final
+ * AlignFrame af = this; testAlView.addActionListener(new ActionListener() {
+ *
+ * @Override public void actionPerformed(ActionEvent e) {
+ * jalview.datamodel.AlignmentView
+ * .testSelectionViews(af.viewport.getAlignment(),
+ * af.viewport.getColumnSelection(), af.viewport.selectionGroup); }
+ *
+ * }); webService.add(testAlView);
+ */
+ // TODO: refactor to RestClient discoverer and merge menu entries for
+ // rest-style services with other types of analysis/calculation service
+ // SHmmr test client - still being implemented.
+ // DEBUG - alignmentView
+
+ for (jalview.ws.rest.RestClient client : jalview.ws.rest.RestClient
+ .getRestClients())
{
- jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(viewport);
- //vs.store(chooser.getSelectedFile().getAbsolutePath() );
- vs.storeJalview( chooser.getSelectedFile().getAbsolutePath(), this);
+ client.attachWSMenuEntry(
+ JvSwingUtils.findOrCreateMenu(webService, client.getAction()),
+ this);
}
- }*/
-
-
-
-public void showTranslation_actionPerformed(ActionEvent e)
-{
- SequenceI [] selection = viewport.getSelectionAsNewSequence();
- String [] seqstring = viewport.getViewAsString(true);
-
- int s, sSize = selection.length;
- SequenceI [] newSeq = new SequenceI[sSize];
-
- int res, resSize;
- StringBuffer protein;
- String seq;
- for(s=0; s filesmatched = new ArrayList