Vector alignPanels = new Vector();
- /** DOCUMENT ME!! */
+ /**
+ * Last format used to load or save alignments in this window
+ */
String currentFileFormat = null;
-
+ /**
+ * Current filename for this alignment
+ */
String fileName = null;
}
setMenusFromViewport(viewport);
-
+ buildSortByAnnotationScoresMenu();
if (viewport.wrapAlignment)
{
wrapMenuItem_actionPerformed(null);
showTranslation.setVisible( nucleotide );
conservationMenuItem.setEnabled( !nucleotide );
modifyConservation.setEnabled( !nucleotide );
-
+
//Remember AlignFrame always starts as protein
if(!nucleotide)
{
calculateMenu.remove(calculateMenu.getItemCount()-2);
}
+ setShowProductsEnabled();
}
+
+
/**
* Need to call this method when tabs are selected for multiple views,
* or when loading from Jalview2XML.java
{
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" },
+ jalview.io.AppletFormatAdapter.WRITABLE_EXTENSIONS,
+ jalview.io.AppletFormatAdapter.WRITABLE_FNAMES,
currentFileFormat,
false);
currentFileFormat);
jalview.bin.Cache.setProperty("LAST_DIRECTORY", fileName);
-
+ if (currentFileFormat.indexOf(" ")>-1)
+ {
+ currentFileFormat = currentFileFormat.substring(0, currentFileFormat.indexOf(" "));
+ }
saveAlignment(fileName, currentFileFormat);
}
}
omitHidden = viewport.getViewAsString(false);
}
}
+ FormatAdapter f = new FormatAdapter();
- String output = new FormatAdapter().formatSequences(
+ String output = f.formatSequences(
format,
- viewport.alignment.getSequencesArray(),
- omitHidden);
+ (Alignment) viewport.alignment, // class cast exceptions will occur in the distant future
+ omitHidden, f.getCacheSuffixDefault(format), viewport.colSel);
if (output == null)
{
cap.setText(new FormatAdapter().formatSequences(
e.getActionCommand(),
- viewport.alignment.getSequencesArray(),
- omitHidden));
+ viewport.alignment,
+ omitHidden, viewport.colSel));
}
/**
}
}
-
-
+ /**
+ *
+ * @return alignment objects for all views
+ */
+ AlignmentI[] getViewAlignments()
+ {
+ 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.alignment };
+ }
+ return null;
+ }
/**
* DOCUMENT ME!
*
*/
protected void undoMenuItem_actionPerformed(ActionEvent e)
{
+ if (viewport.historyList.empty())
+ return;
CommandI command = (CommandI)viewport.historyList.pop();
viewport.redoList.push(command);
- command.undoCommand();
+ command.undoCommand(getViewAlignments());
AlignViewport originalSource = getOriginatingSource(command);
updateEditMenuBar();
CommandI command = (CommandI) viewport.redoList.pop();
viewport.historyList.push(command);
- command.doCommand();
+ command.doCommand(getViewAlignments());
AlignViewport originalSource = getOriginatingSource(command);
updateEditMenuBar();
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)
{
- alignPanel.annotationPanel.adjustPanelHeight();
+ // 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
+ alview[avnum].setAnnotationIndex(newann, a);
+ }
+ }
+ }
+ }
+ buildSortByAnnotationScoresMenu();
}
viewport.firePropertyChange("alignment", null, alignment.getSequences());
+
} else {
AlignFrame af = new AlignFrame(alignment, DEFAULT_WIDTH, DEFAULT_HEIGHT);
String newtitle = new String("Copied sequences");
*/
public void buildSortByAnnotationScoresMenu()
{
+ if(viewport.alignment.getAlignmentAnnotation()==null)
+ {
+ return;
+ }
+
if (viewport.alignment.getAlignmentAnnotation().hashCode()!=_annotationScoreVectorHash)
{
sortByAnnotScore.removeAll();
// almost certainly a quicker way to do this - but we keep it simple
Hashtable scoreSorts=new Hashtable();
- AlignmentAnnotation aann[] = viewport.alignment.getAlignmentAnnotation();
- for (int i=0;i<aann.length; i++)
+ AlignmentAnnotation aann[];
+ Enumeration sq = viewport.alignment.getSequences().elements();
+ while (sq.hasMoreElements())
{
- if (aann[i].hasScore() && aann[i].sequenceRef!=null)
+ aann = ((SequenceI) sq.nextElement()).getAnnotation();
+ for (int i=0;aann!=null && i<aann.length; i++)
{
- scoreSorts.put(aann[i].label, aann[i].label);
+ if (aann[i].hasScore() && aann[i].sequenceRef!=null)
+ {
+ scoreSorts.put(aann[i].label, aann[i].label);
+ }
}
}
Enumeration labels = scoreSorts.keys();
}
sortByAnnotScore.setVisible(scoreSorts.size()>0);
scoreSorts.clear();
+
+ _annotationScoreVectorHash =
+ viewport.alignment.getAlignmentAnnotation().hashCode();
}
}
{
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,
+ fin = new jalview.io.NewickFile(choice,
"File");
viewport.setCurrentTree(ShowNewickTree(fin, choice).getTree());
}
catch (Exception ex)
{
JOptionPane.showMessageDialog(Desktop.desktop,
- "Problem reading tree file",
ex.getMessage(),
+ "Problem reading tree file",
JOptionPane.WARNING_MESSAGE);
ex.printStackTrace();
}
+ if (fin!=null && fin.hasWarningMessage())
+ {
+ JOptionPane.showMessageDialog(Desktop.desktop,
+ fin.getWarningMessage(),
+ "Possible problem with tree file",
+ JOptionPane.WARNING_MESSAGE);
+ }
}
}
{
ex.printStackTrace();
}
-
+
return tp;
}
*/
public void BuildWebServiceMenu()
{
+ // TODO: add support for context dependent disabling of services based on alignment and current selection
+ // TODO: refactor to allow list of AbstractName/Handler bindings to be stored or retrieved from elsewhere
+ // 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.
if ( (Discoverer.services != null)
&& (Discoverer.services.size() > 0))
{
resetWebServiceMenu();
this.webService.add(this.webServiceNoServices);
}
- // TODO: add in rediscovery function
- // TODO: reduce code redundancy.
- // TODO: group services by location as well as function.
}
public void actionPerformed(ActionEvent e)
{
- new jalview.io.DBRefFetcher(
+ new jalview.ws.DBRefFetcher(
alignPanel.av.getSequenceSelection(),
alignPanel.alignFrame).fetchDBRefs(false);
}
vs.storeJalview( chooser.getSelectedFile().getAbsolutePath(), this);
}
}*/
+ /**
+ * prototype of an automatically enabled/disabled analysis function
+ *
+ */
+ protected void setShowProductsEnabled()
+ {
+ SequenceI [] selection = viewport.getSequenceSelection();
+ if (canShowProducts(selection, viewport.getSelectionGroup()!=null, viewport.getAlignment().getDataset()))
+ {
+ showProducts.setEnabled(true);
+
+ } else {
+ showProducts.setEnabled(false);
+ }
+ }
+ /**
+ * search selection for sequence xRef products and build the
+ * show products menu.
+ * @param selection
+ * @param dataset
+ * @return true if showProducts menu should be enabled.
+ */
+ public boolean canShowProducts(SequenceI[] selection, boolean isRegionSelection, Alignment dataset)
+ {
+ boolean showp=false;
+ try {
+ showProducts.removeAll();
+ final boolean dna = viewport.getAlignment().isNucleotide();
+ final Alignment ds = dataset;
+ String[] ptypes = CrossRef.findSequenceXrefTypes(dna, selection, dataset);
+ //Object[] prods = CrossRef.buildXProductsList(viewport.getAlignment().isNucleotide(), selection, dataset, true);
+ final SequenceI[] sel = selection;
+ for (int t=0; ptypes!=null && t<ptypes.length; t++)
+ {
+ showp=true;
+ final boolean isRegSel = isRegionSelection;
+ final AlignFrame af = this;
+ final String source = ptypes[t];
+ JMenuItem xtype = new JMenuItem(ptypes[t]);
+ xtype.addActionListener(new ActionListener() {
+
+ public void actionPerformed(ActionEvent e)
+ {
+ // TODO: new thread for this call with vis-delay
+ af.showProductsFor(sel, ds, isRegSel, dna, source);
+ }
+
+ });
+ showProducts.add(xtype);
+ }
+ showProducts.setVisible(showp);
+ showProducts.setEnabled(showp);
+ } catch (Exception e)
+ {
+ jalview.bin.Cache.log.warn("canTranslate threw an exception - please report to help@jalview.org",e);
+ return false;
+ }
+ return showp;
+ }
+protected void showProductsFor(SequenceI[] sel, Alignment ds, boolean isRegSel, boolean dna, String source)
+ {
+ final boolean fisRegSel = isRegSel;
+ final boolean fdna = dna;
+ final String fsrc = source;
+ final AlignFrame ths = this;
+ final SequenceI[] fsel = sel;
+ Runnable foo = new Runnable() {
+
+ public void run()
+ {
+ final long sttime = System.currentTimeMillis();
+ ths.setProgressBar("Searching for sequences from "+fsrc, sttime);
+ try {
+ Alignment ds = ths.getViewport().alignment.getDataset(); // update our local dataset reference
+ Alignment prods = CrossRef.findXrefSequences(fsel, fdna, fsrc, ds);
+ if (prods!=null)
+ {
+ SequenceI[] sprods = new SequenceI[prods.getHeight()];
+ for (int s=0; s<sprods.length;s++)
+ {
+ sprods[s] = (prods.getSequenceAt(s)).deriveSequence();
+ if (ds.getSequences()==null || !ds.getSequences().contains(sprods[s].getDatasetSequence()))
+ ds.addSequence(sprods[s].getDatasetSequence());
+ sprods[s].updatePDBIds();
+ }
+ Alignment al = new Alignment(sprods);
+ AlignedCodonFrame[] cf = prods.getCodonFrames();
+ for (int s=0; cf!=null && s<cf.length; s++)
+ {
+ al.addCodonFrame(cf[s]);
+ cf[s] = null;
+ }
+ al.setDataset(ds);
+ AlignFrame naf = new AlignFrame(al, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+ String newtitle =""+((fdna) ? "Proteins " : "Nucleotides ") + " for "+((fisRegSel) ? "selected region of " : "")
+ + getTitle();
+ Desktop.addInternalFrame(naf, newtitle, DEFAULT_WIDTH,
+ DEFAULT_HEIGHT);
+ } else {
+ System.err.println("No Sequences generated for xRef type "+fsrc);
+ }
+ }
+ catch (Exception e)
+ {
+ jalview.bin.Cache.log.error("Exception when finding crossreferences",e);
+ }
+ catch (Error e)
+ {
+ jalview.bin.Cache.log.error("Error when finding crossreferences",e);
+ }
+ ths.setProgressBar("Finished searching for sequences from "+fsrc, sttime);
+ }
+
+ };
+ Thread frunner = new Thread(foo);
+ frunner.start();
+ }
+public boolean canShowTranslationProducts(SequenceI[] selection, AlignmentI alignment)
+{
+ // old way
+ try {
+ return (jalview.analysis.Dna.canTranslate(selection, viewport.getViewAsVisibleContigs(true)));
+ } catch (Exception e)
+ {
+ jalview.bin.Cache.log.warn("canTranslate threw an exception - please report to help@jalview.org",e);
+ return false;
+ }
+}
+
+public void showProducts_actionPerformed(ActionEvent e)
+{
+ ///////////////////////////////
+ // Collect Data to be translated/transferred
+
+ SequenceI [] selection = viewport.getSequenceSelection();
+ AlignmentI al = null;
+ try {
+ al = jalview.analysis.Dna.CdnaTranslate(selection, viewport.getViewAsVisibleContigs(true),
+ viewport.getGapCharacter(), viewport.getAlignment().getDataset());
+ } 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 void showTranslation_actionPerformed(ActionEvent e)
{
try {
al = jalview.analysis.Dna.CdnaTranslate(selection, seqstring, viewport.getViewAsVisibleContigs(true),
viewport.getGapCharacter(), viewport.alignment.getAlignmentAnnotation(),
- viewport.alignment.getWidth());
+ viewport.alignment.getWidth(), viewport.getAlignment().getDataset());
} catch (Exception ex) {
al = null;
jalview.bin.Cache.log.debug("Exception during translation.",ex);
{
// (isAnnotation)
alignPanel.adjustAnnotationHeight();
+ buildSortByAnnotationScoresMenu();
}
}