import java.awt.event.*;
import java.awt.print.*;
import javax.swing.*;
+import javax.swing.event.MenuEvent;
import jalview.analysis.*;
import jalview.commands.*;
}
setMenusFromViewport(viewport);
-
+ buildSortByAnnotationScoresMenu();
if (viewport.wrapAlignment)
{
wrapMenuItem_actionPerformed(null);
}
}
-
-
+ /**
+ *
+ * @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 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;
+ for (int i=0; i < sequences.length; i++)
+ {
+ AlignmentAnnotation sann[] = sequences[i].getAnnotation();
+ if (sann==null)
+ continue;
+ // this relies on sann being preserved after we modify the sequence's annotation array
+ 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");
contents.append("<br>Maximum Sequence Length: "+max);
contents.append("<br>Average Length: "+(int)avg);
- if (((Alignment)viewport.alignment).alignmentProperties != null)
+ if (((Alignment)viewport.alignment).getProperties() != null)
{
- Hashtable props = ((Alignment)viewport.alignment).alignmentProperties;
+ Hashtable props = ((Alignment)viewport.alignment).getProperties();
Enumeration en = props.keys();
contents.append("<br><br><table border=\"1\">");
while(en.hasMoreElements())
{
String key = en.nextElement().toString();
- contents.append("<tr><td>"+key+"</td><td>"+props.get(key)+"</td></tr>");
+ StringBuffer val = new StringBuffer();
+ String vals = props.get(key).toString();
+ int pos=0, npos;
+ do {
+ npos = vals.indexOf("\n",pos);
+ if (npos==-1)
+ {
+ val.append(vals.substring(pos));
+ } else {
+ val.append(vals.substring(pos, npos));
+ val.append("<br>");
+ }
+ pos = npos+1;
+ } while (npos!=-1);
+ contents.append("<tr><td>"+key+"</td><td>"+val+"</td></tr>");
}
contents.append("</table>");
}
editPane.setText(contents.toString()+"</html>");
JInternalFrame frame = new JInternalFrame();
- frame.getContentPane().add(editPane);
+ frame.getContentPane().add(new JScrollPane(editPane));
Desktop.instance.addInternalFrame(frame,"Alignment Properties: "+getTitle(),500,400);
}
alignPanel.paintAlignment(true);
}
-
/**
* DOCUMENT ME!
*
}
});
}
+ /**
+ * 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
+ */
+ public void addSortByAnnotScoreMenuItem(JMenu sort, final String scoreLabel)
+ {
+ final JMenuItem item = new JMenuItem(scoreLabel);
+ sort.add(item);
+ item.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray();
+ AlignmentSorter.sortByAnnotationScore(scoreLabel, viewport.getAlignment());
+ addHistoryItem(new OrderCommand("Sort by "+scoreLabel, oldOrder, viewport.alignment));
+ alignPanel.paintAlignment(true);
+ }
+ });
+ }
+ /**
+ * last hash for alignment's annotation array - used to minimise cost of rebuild.
+ */
+ protected int _annotationScoreVectorHash;
+ /**
+ * 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.
+ *
+ */
+ 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[];
+ Enumeration sq = viewport.alignment.getSequences().elements();
+ while (sq.hasMoreElements())
+ {
+ aann = ((SequenceI) sq.nextElement()).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.alignment.getAlignmentAnnotation().hashCode();
+ }
+ }
/**
* Maintain the Order by->Displayed Tree menu.
{
// (isAnnotation)
alignPanel.adjustAnnotationHeight();
+ buildSortByAnnotationScoresMenu();
}
}
{
return viewport;
}
+
+
+ /**
+ * Open the dialog for regex description parsing.
+ */
+ protected void extractScores_actionPerformed(ActionEvent e)
+ {
+ ParseProperties pp = new jalview.analysis.ParseProperties(viewport.alignment);
+ if (pp.getScoresFromDescription("col", "score column ", "\\W+([-+]?\\d*\\.?\\d*e?-?\\d*)\\W+([-+]?\\d*\\.?\\d*e?-?\\d*)")>0)
+ {
+ buildSortByAnnotationScoresMenu();
+ }
+ }
}
class PrintThread