/*
* Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 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
import java.awt.*;
import java.awt.datatransfer.*;
+import java.awt.dnd.*;
import java.awt.event.*;
import java.awt.print.*;
import javax.swing.*;
import jalview.analysis.*;
+import jalview.commands.*;
import jalview.datamodel.*;
import jalview.io.*;
import jalview.jbgui.*;
import jalview.schemes.*;
-import jalview.commands.*;
import jalview.ws.*;
-import java.awt.dnd.*;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
/**
* DOCUMENT ME!
* @author $author$
* @version $Revision$
*/
-public class AlignFrame extends GAlignFrame implements DropTargetListener
+public class AlignFrame
+ extends GAlignFrame implements DropTargetListener
{
/** DOCUMENT ME!! */
public static final int DEFAULT_WIDTH = 700;
String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort");
if (sortby.equals("Id"))
+ {
sortIDMenuItem_actionPerformed(null);
+ }
else if (sortby.equals("Pairwise Identity"))
+ {
sortPairwiseMenuItem_actionPerformed(null);
+ }
if (Desktop.desktop != null)
{
wrapMenuItem_actionPerformed(null);
}
+ if (jalview.bin.Cache.getDefault("SHOW_OVERVIEW",false))
+ {
+ this.overviewMenuItem_actionPerformed(null);
+ }
+
addKeyListener();
}
break;
case KeyEvent.VK_DOWN:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ moveSelectedSequences(false);
if (viewport.cursorMode)
- {
alignPanel.seqPanel.moveCursor(0, 1);
- }
- else
- moveSelectedSequences(false);
break;
case KeyEvent.VK_UP:
+ if (evt.isAltDown() || !viewport.cursorMode)
+ moveSelectedSequences(true);
if (viewport.cursorMode)
- {
alignPanel.seqPanel.moveCursor(0, -1);
- }
- else
- moveSelectedSequences(true);
+
break;
case KeyEvent.VK_LEFT:
- if (viewport.cursorMode)
- {
+ if (evt.isAltDown() || !viewport.cursorMode)
+ slideSequences(false,
+ alignPanel.seqPanel.getKeyboardNo1());
+ else
alignPanel.seqPanel.moveCursor( -1, 0);
- }
+
+
break;
case KeyEvent.VK_RIGHT:
- if (viewport.cursorMode)
- {
+ if (evt.isAltDown() || !viewport.cursorMode)
+ slideSequences(true,
+ alignPanel.seqPanel.getKeyboardNo1());
+ else
alignPanel.seqPanel.moveCursor(1, 0);
- }
break;
case KeyEvent.VK_SPACE:
cut_actionPerformed(null);
}
else
+ {
alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()
|| evt.isShiftDown()
|| evt.isAltDown());
+ }
break;
hideSelSequences_actionPerformed(null);
hide = true;
}
- else if (! (toggleCols && viewport.colSel.getSelected().size() > 0))
+ else if (! (toggleCols &&
+ viewport.colSel.getSelected().size() > 0))
+ {
showAllSeqs_actionPerformed(null);
}
+ }
if (toggleCols)
{
{
hideSelColumns_actionPerformed(null);
if (!toggleSeqs)
+ {
viewport.selectionGroup = sg;
}
+ }
else if (!hide)
+ {
showAllColumns_actionPerformed(null);
}
+ }
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;
}
}
+
+ 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;
+ }
+ }
});
}
if(newPanel)
{
if (ap.av.padGaps)
+ {
ap.av.alignment.padGaps();
+ }
ap.av.updateConservation(ap);
ap.av.updateConsensus(ap);
}
public void setProgressBar(String message, long id)
{
if(progressBars == null)
+ {
progressBars = new Hashtable();
+ }
JPanel progressPanel;
GridLayout layout = (GridLayout) statusPanel.getLayout();
progressBars.remove( progressPanel );
progressPanel = null;
if(message!=null)
+ {
statusBar.setText(message);
+ }
layout.setRows(layout.getRows() - 1);
}
&& frames[i] != this
&& ( (AlignFrame) frames[i]).fileName.equals(fileName))
{
- try{
+ try
+ {
frames[i].setSelected(true);
Desktop.instance.closeAssociatedWindows();
- }catch(java.beans.PropertyVetoException ex){}
+ }
+ 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
{
- viewport.alignment.deleteAllGroups();
- viewport.sequenceColours=null;
- while (viewport.alignment.getHeight() > 0)
- {
- viewport.alignment.deleteSequence(0);
- }
+ Rectangle bounds = this.getBounds();
- viewport.historyList.clear();
- viewport.redoList.clear();
- Alignment dset = viewport.alignment.getDataset();
- while (dset.getHeight() > 0)
- {
- dset.deleteSequence(0);
- }
+ FileLoader loader = new FileLoader();
+ String protocol = fileName.startsWith("http:") ? "URL" : "File";
+ AlignFrame newframe =
+ loader.LoadFileWaitTillLoaded(fileName, protocol, currentFileFormat);
- firePropertyChange("Alignment", null, viewport.alignment.getSequences());
+ newframe.setBounds(bounds);
- updateEditMenuBar();
+ this.closeMenuItem_actionPerformed(true);
}
-
- FileLoader loader = new FileLoader();
- String protocol = fileName.startsWith("http:")? "URL":"File";
- loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
-
}
}
|| currentFileFormat==null
|| fileName.startsWith("http")
)
+ {
saveAs_actionPerformed(null);
+ }
else
+ {
saveAlignment(fileName, currentFileFormat);
}
+ }
/**
* DOCUMENT ME!
JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (reply == JOptionPane.YES_OPTION)
+ {
omitHidden = viewport.getViewAsString(false);
}
+ }
String output = new FormatAdapter().formatSequences(
format,
}
if (!success)
+ {
JOptionPane.showInternalMessageDialog(
this, "Couldn't save file: " + fileName,
"Error Saving File",
JOptionPane.WARNING_MESSAGE);
+ }
return success;
}
{
new AnnotationExporter().exportAnnotations(
alignPanel,
- viewport.alignment.getAlignmentAnnotation(),
+ viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
viewport.alignment.getGroups()
);
}
public void closeMenuItem_actionPerformed(boolean closeAllTabs)
{
if(alignPanels!=null && alignPanels.size()<2)
+ {
closeAllTabs = true;
+ }
try
{
if(alignPanels!=null)
{
if (closeAllTabs)
+ {
for (int i = 0; i < alignPanels.size(); i++)
{
AlignmentPanel ap = (AlignmentPanel) alignPanels.elementAt(i);
PaintRefresher.RemoveComponent(ap.idPanel.idCanvas);
PaintRefresher.RemoveComponent(ap);
}
+ }
else
{
int index = tabbedPane.getSelectedIndex();
tabbedPane.validate();
if(index==tabbedPane.getTabCount())
+ {
index --;
+ }
this.tabSelectionChanged(index);
}
}
if (closeAllTabs)
+ {
this.setClosed(true);
}
+ }
catch (Exception ex)
{
ex.printStackTrace();
protected void redoMenuItem_actionPerformed(ActionEvent e)
{
if(viewport.redoList.size()<1)
+ {
return;
+ }
CommandI command = (CommandI) viewport.redoList.pop();
viewport.historyList.push(command);
//The original view is closed, we must validate
//the current view against the closed view first
if (al != null)
+ {
PaintRefresher.validateSequences(al, viewport.alignment);
+ }
originalSource = viewport;
}
}
}
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
+
+ synchronized void slideSequences(boolean right, int size)
+ {
+ Vector sg = new Vector();
+ if(viewport.cursorMode)
+ {
+ sg.addElement(viewport.alignment.getSequenceAt(
+ alignPanel.seqPanel.seqCanvas.cursorY));
+ }
+ else if(viewport.getSelectionGroup()!=null
+ && viewport.getSelectionGroup().getSize()!=viewport.alignment.getHeight())
+ {
+ sg = viewport.getSelectionGroup().getSequences(
+ viewport.hiddenRepSequences);
+ }
+
+ if(sg.size()<1)
+ {
+ return;
+ }
+
+ Vector invertGroup = new Vector();
+
+ for (int i = 0; i < viewport.alignment.getHeight(); i++)
+ {
+ if(!sg.contains(viewport.alignment.getSequenceAt(i)))
+ invertGroup.add(viewport.alignment.getSequenceAt(i));
+ }
+
+ SequenceI[] seqs1 = new SequenceI[sg.size()];
+ for (int i = 0; i < sg.size(); i++)
+ seqs1[i] = (SequenceI) sg.elementAt(i);
+
+ SequenceI[] seqs2 = new SequenceI[invertGroup.size()];
+ for (int i = 0; i < invertGroup.size(); i++)
+ seqs2[i] = (SequenceI) invertGroup.elementAt(i);
+
+ 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()
+ );
+
+ 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;
+ }
+
+ 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!
*
{
hiddenColumns =new Vector();
int hiddenOffset = viewport.getSelectionGroup().getStartRes();
- for(int i=0; i<viewport.getColumnSelection().getHiddenColumns().size(); i++)
+ for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns().size();
+ i++)
{
int[] region = (int[])
viewport.getColumnSelection().getHiddenColumns().elementAt(i);
- hiddenColumns.addElement(new int[]{region[0]-hiddenOffset,
+ hiddenColumns.addElement(new int[]
+ {region[0] - hiddenOffset,
region[1]-hiddenOffset});
}
}
-
-
- Desktop.jalviewClipboard = new Object[]{ seqs,
+ Desktop.jalviewClipboard = new Object[]
+ {
+ seqs,
viewport.alignment.getDataset(),
hiddenColumns};
statusBar.setText("Copied "+seqs.length+" sequences to clipboard.");
{
str = (String) contents.getTransferData(DataFlavor.stringFlavor);
if (str.length() < 1)
+ {
return;
+ }
format = new IdentifyFile().Identify(str, "Paste");
}
else
{
- sequences = new FormatAdapter().readFile(str, "Paste", format).getSequencesArray();
+ sequences = new FormatAdapter().readFile(str, "Paste", format).
+ getSequencesArray();
}
AlignmentI alignment = null;
alignment = new Alignment(sequences);
if (Desktop.jalviewClipboard != null)
+ {
alignment.setDataset( (Alignment) Desktop.jalviewClipboard[1]);
+ }
else
+ {
alignment.setDataset(null);
}
+ }
else
{
alignment = viewport.getAlignment();
for (int i = 0; i < sequences.length; i++)
{
newseqs[i] = new Sequence(sequences[i].getName(),
- sequences[i].getSequence(), sequences[i].getStart(),
+ sequences[i].getSequence(),
+ sequences[i].getStart(),
sequences[i].getEnd());
alignment.addSequence(newseqs[i]);
SequenceI [] cut = new SequenceI[seqs.size()];
for(int i=0; i<seqs.size(); i++)
+ {
cut[i] = (SequenceI)seqs.elementAt(i);
+ }
/*
viewport.sequenceColours = null;
viewport.setSelectionGroup(null);
PaintRefresher.Refresh(this, viewport.getSequenceSetId());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
sg.setEndRes(viewport.alignment.getWidth() - 1);
viewport.setSelectionGroup(sg);
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
}
viewport.setSelectionGroup(null);
alignPanel.seqPanel.seqCanvas.highlightSearchResults(null);
alignPanel.idPanel.idCanvas.searchResults = null;
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
}
sg.addOrRemove(viewport.getAlignment().getSequenceAt(i), false);
}
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
PaintRefresher.Refresh(alignPanel, viewport.getSequenceSetId());
}
public void invertColSel_actionPerformed(ActionEvent e)
{
viewport.invertColumnSelection();
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
if (colSel.size() > 0)
{
if(trimLeft)
+ {
column = colSel.getMin();
+ }
else
+ {
column = colSel.getMax();
+ }
SequenceI [] seqs;
if(viewport.getSelectionGroup()!=null)
- seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
+ {
+ seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+ hiddenRepSequences);
+ }
else
+ {
seqs = viewport.alignment.getSequencesArray();
+ }
TrimRegionCommand trimRegion;
SequenceI[] seqs;
if (viewport.getSelectionGroup() != null)
{
- seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
+ seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+ hiddenRepSequences);
start = viewport.getSelectionGroup().getStartRes();
end = viewport.getSelectionGroup().getEndRes();
}
else
+ {
seqs = viewport.alignment.getSequencesArray();
+ }
RemoveGapColCommand removeGapCols =
// if (viewport.hasHiddenColumns)
// viewport.getColumnSelection().compensateForEdits(shifts);
viewport.setStartRes(seq.findIndex(startRes)-1);
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+ viewport.firePropertyChange("alignment", null,
+ viewport.getAlignment().getSequences());
}
SequenceI[] seqs;
if (viewport.getSelectionGroup() != null)
{
- seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.hiddenRepSequences);
+ seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport.
+ hiddenRepSequences);
start = viewport.getSelectionGroup().getStartRes();
end = viewport.getSelectionGroup().getEndRes();
}
else
+ {
seqs = viewport.alignment.getSequencesArray();
+ }
//This is to maintain viewport position on first residue
//of first sequence
viewport.setStartRes(seq.findIndex(startRes)-1);
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
+ viewport.firePropertyChange("alignment", null,
+ viewport.getAlignment().getSequences());
}
AlignmentPanel newap =
new Jalview2XML().copyAlignPanel(alignPanel, true);
+ newap.av.gatherViewsHere = false;
+
if (viewport.viewName == null)
+ {
viewport.viewName = "Original";
+ }
newap.av.historyList = viewport.historyList;
newap.av.redoList = viewport.redoList;
int index = Desktop.getViewCount(viewport.getSequenceSetId());
String newViewName = "View " +index;
- Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId());
+ Vector comps = (Vector) PaintRefresher.components.get(viewport.
+ getSequenceSetId());
Vector existingNames = new Vector();
for(int i=0; i<comps.size(); i++)
{
{
AlignmentPanel ap = (AlignmentPanel)comps.elementAt(i);
if(!existingNames.contains(ap.av.viewName))
+ {
existingNames.addElement(ap.av.viewName);
}
}
+ }
while(existingNames.contains(newViewName))
{
viewport.setShowJVSuffix(seqLimits.isSelected());
alignPanel.idPanel.idCanvas.setPreferredSize(alignPanel.calculateIdWidth());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
public void idRightAlign_actionPerformed(ActionEvent e)
{
viewport.rightAlignIds = idRightAlign.isSelected();
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
protected void colourTextMenuItem_actionPerformed(ActionEvent e)
{
viewport.setColourText(colourTextMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
public void hideSelSequences_actionPerformed(ActionEvent e)
{
viewport.hideAllSelectedSeqs();
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
public void hideSelColumns_actionPerformed(ActionEvent e)
{
viewport.hideSelectedColumns();
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
public void hiddenMarkers_actionPerformed(ActionEvent e)
protected void scaleAbove_actionPerformed(ActionEvent e)
{
viewport.setScaleAboveWrapped(scaleAbove.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
protected void scaleLeft_actionPerformed(ActionEvent e)
{
viewport.setScaleLeftWrapped(scaleLeft.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
protected void scaleRight_actionPerformed(ActionEvent e)
{
viewport.setScaleRightWrapped(scaleRight.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
public void viewBoxesMenuItem_actionPerformed(ActionEvent e)
{
viewport.setShowBoxes(viewBoxesMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
public void viewTextMenuItem_actionPerformed(ActionEvent e)
{
viewport.setShowText(viewTextMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
protected void renderGapsMenuItem_actionPerformed(ActionEvent e)
{
viewport.setRenderGaps(renderGapsMenuItem.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
public void showSeqFeatures_actionPerformed(ActionEvent evt)
{
viewport.setShowSequenceFeatures(showSeqFeatures.isSelected());
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
if (alignPanel.getOverviewPanel() != null)
{
alignPanel.getOverviewPanel().updateOverviewImage();
sg.getEndRes()+1));
}
else
+ {
sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+ }
if (viewport.getConservationSelected())
{
Conservation c = new Conservation("Group",
ResidueProperties.propHash, 3,
- sg.getSequences(viewport.hiddenRepSequences),
+ sg.getSequences(viewport.
+ hiddenRepSequences),
sg.getStartRes(),
sg.getEndRes()+1);
c.calculate();
sg.cs.setConservation(c);
}
else
+ {
sg.cs.setConservation(null);
}
}
+ }
if (alignPanel.getOverviewPanel() != null)
{
alignPanel.getOverviewPanel().updateOverviewImage();
}
- alignPanel.repaint();
+
+
+
+ alignPanel.paintAlignment(true);
}
/**
while (userColours.hasMoreElements())
{
- final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.
+ final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
+ userColours.
nextElement().toString());
radioItem.setName("USER_DEFINED");
radioItem.addMouseListener(new MouseAdapter()
{
radioItem.removeActionListener(radioItem.getActionListeners()[0]);
- int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop,
+ int option = JOptionPane.showInternalConfirmDialog(jalview.gui.
+ Desktop.desktop,
"Remove from default list?",
"Remove user defined colour",
JOptionPane.YES_NO_OPTION);
if(option == JOptionPane.YES_OPTION)
{
- jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText());
+ jalview.gui.UserDefinedColours.removeColourFromDefaults(
+ radioItem.getText());
colourMenu.remove(radioItem);
}
else
+ {
radioItem.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent evt)
});
}
}
+ }
});
radioItem.addActionListener(new ActionListener()
{
SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
AlignmentSorter.sortByPID(viewport.getAlignment(),
viewport.getAlignment().getSequenceAt(0));
- addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder, viewport.alignment));
- alignPanel.repaint();
+ addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder,
+ viewport.alignment));
+ alignPanel.paintAlignment(true);
}
/**
SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
AlignmentSorter.sortByID(viewport.getAlignment());
addHistoryItem(new OrderCommand("ID Sort", oldOrder, viewport.alignment));
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
AlignmentSorter.sortByGroup(viewport.getAlignment());
addHistoryItem(new OrderCommand("Group Sort", oldOrder, viewport.alignment));
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
/**
{
TreePanel tp;
- if (viewport.getSelectionGroup() != null) {
- if (viewport.getSelectionGroup().getSize() < 3) {
+ if (viewport.getSelectionGroup() != null)
+ {
+ if (viewport.getSelectionGroup().getSize() < 3)
+ {
JOptionPane.showMessageDialog(Desktop.desktop,
"You need to have more than two sequences selected to build a tree!",
"Not enough sequences",
}
if(viewport.alignment.getHeight()<2)
+ {
return;
+ }
tp = new TreePanel(alignPanel, type, pwType);
}
title += " from ";
if(viewport.viewName!=null)
+ {
title+= viewport.viewName+" of ";
+ }
title += this.title;
// TODO: JBPNote - have to map order entries to curent SequenceI pointers
AlignmentSorter.sortBy(viewport.getAlignment(), order);
- addHistoryItem(new OrderCommand(order.getName(), oldOrder, viewport.alignment));
+ addHistoryItem(new OrderCommand(order.getName(), oldOrder,
+ viewport.alignment));
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
});
}
{
sortByTreeMenu.removeAll();
- Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId());
+ Vector comps = (Vector) PaintRefresher.components.get(viewport.
+ getSequenceSetId());
Vector treePanels = new Vector();
int i, iSize = comps.size();
for(i=0; i<iSize; i++)
oldOrder,
viewport.alignment));
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
});
// 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())
{
- seqs.setSequences(new SeqCigar[] { seqs.getSequences()[0] } );
+ seqs.setSequences(new SeqCigar[]
+ {seqs.getSequences()[0]});
}
return seqs;
}
{
return ShowNewickTree(nf,title,600,500,4,5);
}
- public TreePanel ShowNewickTree(NewickFile nf, String title, AlignmentView input)
+
+ 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) {
+
+ public TreePanel ShowNewickTree(NewickFile nf, String title, int w, int h,
+ int x, int y)
+ {
return ShowNewickTree(nf, title, null, w, h, x, y);
}
/**
* @param y position
* @return TreePanel handle
*/
- public TreePanel ShowNewickTree(NewickFile nf, String title, AlignmentView input, 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;
try
tp.setSize(w,h);
if(x>0 && y>0)
+ {
tp.setLocation(x,y);
+ }
Desktop.addInternalFrame(tp, title, w, h);
{
AlignmentView msa = gatherSequencesForAlignment();
new jalview.ws.MsaWSClient(sh, title, msa,
- false, true, viewport.getAlignment().getDataset(), af);
+ false, true,
+ viewport.getAlignment().getDataset(),
+ af);
}
{
AlignmentView msa = gatherSequencesForAlignment();
new jalview.ws.MsaWSClient(sh, title, msa,
- true, true, viewport.getAlignment().getDataset(), af);
+ true, true,
+ viewport.getAlignment().getDataset(),
+ af);
}
public void showTranslation_actionPerformed(ActionEvent e)
{
+ ///////////////////////////////
+ // Collect Data to be translated/transferred
+
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<sSize; s++)
- {
- protein = new StringBuffer();
- seq = AlignSeq.extractGaps("-. ", seqstring[s]);
- resSize = seq.length();
- resSize -= resSize%3;
-
- for(res = 0; res < resSize; res+=3)
- {
- String codon = seq.substring(res, res+3);
- codon = codon.replace('U', 'T');
- String aa = ResidueProperties.codonTranslate(codon);
- if(aa==null)
- protein.append(viewport.getGapCharacter());
- else if(aa.equals("STOP"))
- protein.append("X");
- else
- protein.append( aa );
- }
- newSeq[s] = new Sequence(selection[s].getName(),
- protein.toString());
- }
-
-
- AlignmentI al = new Alignment(newSeq);
- al.setDataset(null);
-
-
- ////////////////////////////////
- // Copy annotations across
- jalview.datamodel.AlignmentAnnotation[] annotations
- = viewport.alignment.getAlignmentAnnotation();
- int a, aSize;
- if(annotations!=null)
- {
- for (int i = 0; i < annotations.length; i++)
- {
- if (annotations[i].label.equals("Quality") ||
- annotations[i].label.equals("Conservation") ||
- annotations[i].label.equals("Consensus"))
- {
- continue;
- }
-
- aSize = viewport.alignment.getWidth() / 3;
- jalview.datamodel.Annotation[] anots =
- new jalview.datamodel.Annotation[aSize];
-
- for (a = 0; a < viewport.alignment.getWidth(); a++)
- {
- if (annotations[i].annotations[a] == null
- || annotations[i].annotations[a] == null)
- continue;
-
- anots[a / 3] = new Annotation(
- annotations[i].annotations[a].displayCharacter,
- annotations[i].annotations[a].description,
- annotations[i].annotations[a].secondaryStructure,
- annotations[i].annotations[a].value,
- annotations[i].annotations[a].colour);
- }
-
- jalview.datamodel.AlignmentAnnotation aa
- = new jalview.datamodel.AlignmentAnnotation(annotations[i].label,
- annotations[i].description, anots);
- al.addAnnotation(aa);
- }
- }
-
+ AlignmentI al = null;
+ try {
+ al = jalview.analysis.Dna.CdnaTranslate(selection, seqstring, viewport.getViewAsVisibleContigs(true),
+ viewport.getGapCharacter(), viewport.alignment.getAlignmentAnnotation(),
+ viewport.alignment.getWidth());
+ } catch (Exception ex) {
+ al = null;
+ jalview.bin.Cache.log.debug("Exception during translation.",ex);
+ }
+ if (al==null)
+ {
+ JOptionPane.showMessageDialog(Desktop.desktop,
+ "Please select at least three bases in at least one sequence in order to perform a cDNA translation.",
+ "Translation Failed",
+ JOptionPane.WARNING_MESSAGE);
+ } else {
AlignFrame af = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT);
Desktop.addInternalFrame(af, "Translation of "+this.getTitle(),
DEFAULT_WIDTH,
DEFAULT_HEIGHT);
-
-
-
-
+ }
}
/**
public boolean parseFeaturesFile(String file, String type)
{
boolean featuresFile = false;
- try{
- featuresFile = new FeaturesFile(file, type).parse(viewport.alignment.getDataset(),
+ try
+ {
+ featuresFile = new FeaturesFile(file,
+ type).parse(viewport.alignment.getDataset(),
alignPanel.seqPanel.seqCanvas.
getFeatureRenderer().featureColours,
false);
{
viewport.showSequenceFeatures = true;
showSeqFeatures.setSelected(true);
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
return featuresFile;
try
{
- DataFlavor uriListFlavor = new DataFlavor("text/uri-list;class=java.lang.String");
+ DataFlavor uriListFlavor = new DataFlavor(
+ "text/uri-list;class=java.lang.String");
if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor))
{
//Works on Windows and MacOSX
evt.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
- files = (java.util.List) t.getTransferData(DataFlavor.javaFileListFlavor);
+ files = (java.util.List) t.getTransferData(DataFlavor.
+ javaFileListFlavor);
}
else if (t.isDataFlavorSupported(uriListFlavor))
{
// AlignFrame
public void loadJalviewDataFile(String file)
{
- try{
+ try
+ {
String protocol = "File";
if (file.indexOf("http:") > -1 || file.indexOf("file:") > -1)
viewport.getAlignment(),
0, false);
alignPanel.adjustAnnotationHeight();
- alignPanel.repaint();
+ alignPanel.paintAlignment(true);
}
else
+ {
new FileLoader().LoadFile(viewport, file, protocol, format);
}
}
+ }
else
{
// (isAnnotation)
alignPanel.adjustAnnotationHeight();
}
- }catch(Exception ex)
+ }
+ catch (Exception ex)
{
ex.printStackTrace();
}
}
}
-class PrintThread extends Thread
+class PrintThread
+ extends Thread
{
AlignmentPanel ap;
public PrintThread(AlignmentPanel ap)
PrinterJob printJob = PrinterJob.getPrinterJob();
if (pf != null)
+ {
printJob.setPrintable(ap, pf);
+ }
else
+ {
printJob.setPrintable(ap);
+ }
if (printJob.printDialog())
{