{\r
viewport = new AlignViewport(al);\r
\r
+ if(viewport.vconsensus==null)\r
+ {\r
+ //Out of memory caluclating consensus.\r
+ BLOSUM62Colour.setEnabled(false);\r
+ PIDColour.setEnabled(false);\r
+ conservationMenuItem.setEnabled(false);\r
+ modifyConservation.setEnabled(false);\r
+ abovePIDThreshold.setEnabled(false);\r
+ modifyPID.setEnabled(false);\r
+ }\r
+\r
alignPanel = new AlignmentPanel(this, viewport);\r
alignPanel.annotationPanel.adjustPanelHeight();\r
alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.\r
getPreferredSize());\r
alignPanel.setAnnotationVisible(viewport.getShowAnnotation());\r
\r
+ String sortby = jalview.bin.Cache.getDefault("SORT_ALIGNMENT", "No sort");\r
+\r
+ if(sortby.equals("Id"))\r
+ sortIDMenuItem_actionPerformed(null);\r
+ else if(sortby.equals("Pairwise Identity"))\r
+ sortPairwiseMenuItem_actionPerformed(null);\r
+\r
getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
\r
- addInternalFrameListener(new InternalFrameAdapter()\r
+ viewport.addPropertyChangeListener(new PropertyChangeListener()\r
{\r
- public void internalFrameActivated(InternalFrameEvent evt)\r
- {\r
- javax.swing.SwingUtilities.invokeLater(new Runnable()\r
- {\r
- public void run()\r
- {\r
- alignPanel.requestFocus();\r
- }\r
- });\r
- }\r
- });\r
+ public void propertyChange(PropertyChangeEvent evt)\r
+ {\r
+ if (evt.getPropertyName().equals("alignment"))\r
+ {\r
+ alignmentChanged();\r
+ }\r
+ }\r
+ });\r
+\r
+\r
addServiceListeners();\r
}\r
\r
redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment,\r
HistoryItem.HIDE));\r
restoreHistoryItem(hi);\r
- resetAllColourSchemes();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
/**\r
HistoryItem hi = (HistoryItem) redoList.pop();\r
restoreHistoryItem(hi);\r
updateEditMenuBar();\r
- viewport.updateConsensus();\r
- resetAllColourSchemes();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
// used by undo and redo\r
\r
updateEditMenuBar();\r
\r
- viewport.updateConsensus();\r
- viewport.updateConservation();\r
- alignPanel.repaint();\r
viewport.firePropertyChange("alignment", null,\r
viewport.getAlignment().getSequences());\r
}\r
}\r
else\r
{\r
- viewport.firePropertyChange("alignment", null,\r
- viewport.getAlignment().getSequences());\r
viewport.setEndSeq(viewport.alignment.getHeight());\r
viewport.alignment.getWidth();\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- resetAllColourSchemes();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
}\r
catch (Exception ex)\r
{\r
+ // could be anything being pasted in here\r
}\r
\r
- // could be anything being pasted in here\r
+\r
}\r
\r
/**\r
*/\r
protected void delete_actionPerformed(ActionEvent e)\r
{\r
- boolean seqsdeleted = false;\r
\r
if (viewport.getSelectionGroup() == null)\r
{\r
\r
if (seq.getSequence().length() < 1)\r
{\r
- seqsdeleted = true;\r
viewport.getAlignment().deleteSequence(seq);\r
}\r
else\r
viewport.setSelectionGroup(null);\r
viewport.alignment.deleteGroup(sg);\r
\r
- if (seqsdeleted)\r
- {\r
- viewport.firePropertyChange("alignment", null,\r
+ viewport.firePropertyChange("alignment", null,\r
viewport.getAlignment().getSequences());\r
- }\r
\r
- viewport.resetSeqLimits(alignPanel.seqPanel.seqCanvas.getHeight());\r
+\r
\r
if (viewport.getAlignment().getHeight() < 1)\r
{\r
{\r
}\r
}\r
-\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- resetAllColourSchemes();\r
- alignPanel.repaint();\r
}\r
\r
/**\r
}\r
}\r
\r
- resetAllColourSchemes();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
}\r
\r
}\r
}\r
\r
- resetAllColourSchemes();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
}\r
\r
\r
viewport.setStartRes(seq.findIndex(startRes)-1);\r
\r
- resetAllColourSchemes();\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
/**\r
{\r
seqs = viewport.getSelectionGroup().sequences;\r
start = viewport.getSelectionGroup().getStartRes();\r
- end = viewport.getSelectionGroup().getEndRes();\r
+ end = viewport.getSelectionGroup().getEndRes()+1;\r
}\r
else\r
{\r
current = (SequenceI) seqs.elementAt(i);\r
jSize = current.getLength();\r
\r
+ // Removing a range is much quicker than removing gaps\r
+ // one by one for long sequences\r
int j = start;\r
+ int rangeStart=-1, rangeEnd=-1;\r
\r
do\r
{\r
if (jalview.util.Comparison.isGap(current.getCharAt(j)))\r
{\r
- current.deleteCharAt(j);\r
- j--;\r
- jSize--;\r
+ if(rangeStart==-1)\r
+ {\r
+ rangeStart = j;\r
+ rangeEnd = j+1;\r
+ }\r
+ else\r
+ {\r
+ rangeEnd++;\r
+ }\r
+ j++;\r
+ }\r
+ else\r
+ {\r
+ if(rangeStart>-1)\r
+ {\r
+ current.deleteChars(rangeStart, rangeEnd);\r
+ j-=rangeEnd-rangeStart;\r
+ jSize-=rangeEnd-rangeStart;\r
+ rangeStart = -1;\r
+ rangeEnd = -1;\r
+ }\r
+ else\r
+ j++;\r
}\r
- j++;\r
}\r
while (j < end && j < jSize);\r
+ if(rangeStart>-1)\r
+ {\r
+ current.deleteChars(rangeStart, rangeEnd);\r
+ }\r
}\r
\r
viewport.setStartRes(seq.findIndex(startRes)-1);\r
\r
-\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- resetAllColourSchemes();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
+ public void alignmentChanged()\r
+ {\r
+ if(viewport.vconsensus!=null)\r
+ {\r
+ viewport.updateConsensus();\r
+ viewport.updateConservation();\r
+ }\r
+ resetAllColourSchemes();\r
+ if(alignPanel.overviewPanel!=null)\r
+ alignPanel.overviewPanel.updateOverviewImage();\r
+\r
+ alignPanel.repaint();\r
+ }\r
\r
void resetAllColourSchemes()\r
{\r
ColourSchemeI cs = viewport.globalColourScheme;\r
if(cs!=null)\r
{\r
- cs.setConsensus(viewport.vconsensus);\r
- if(cs.conservationApplied())\r
- {\r
- Alignment al = (Alignment) viewport.alignment;\r
- Conservation c = new Conservation("All",\r
- ResidueProperties.propHash, 3,\r
- al.getSequences(), 0,\r
- al.getWidth() - 1);\r
- c.calculate();\r
- c.verdict(false, viewport.ConsPercGaps);\r
+ if (cs instanceof ClustalxColourScheme)\r
+ {\r
+ ( (ClustalxColourScheme) viewport.getGlobalColourScheme()).\r
+ resetClustalX(viewport.alignment.getSequences(),\r
+ viewport.alignment.getWidth());\r
+ }\r
\r
- cs.setConservation(c);\r
- }\r
- }\r
+ cs.setConsensus(viewport.vconsensus);\r
+ if (cs.conservationApplied())\r
+ {\r
+ Alignment al = (Alignment) viewport.alignment;\r
+ Conservation c = new Conservation("All",\r
+ ResidueProperties.propHash, 3,\r
+ al.getSequences(), 0,\r
+ al.getWidth() - 1);\r
+ c.calculate();\r
+ c.verdict(false, viewport.ConsPercGaps);\r
\r
- if(viewport.getGlobalColourScheme()!=null\r
- && viewport.getGlobalColourScheme() instanceof ClustalxColourScheme)\r
- {\r
- ((ClustalxColourScheme)viewport.getGlobalColourScheme()).\r
- resetClustalX(viewport.alignment.getSequences(),\r
- viewport.alignment.getWidth());\r
+ cs.setConservation(c);\r
+ }\r
}\r
\r
int s, sSize = viewport.alignment.getGroups().size();\r
{\r
((ClustalxColourScheme)sg.cs).resetClustalX(sg.sequences, sg.getWidth());\r
}\r
-\r
sg.recalcConservation();\r
-\r
}\r
}\r
\r
}\r
}\r
\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- alignPanel.repaint();\r
+ alignmentChanged();\r
}\r
\r
/**\r
return;\r
}\r
\r
- try\r
- {\r
PCAPanel pcaPanel = new PCAPanel(viewport, null);\r
JInternalFrame frame = new JInternalFrame();\r
frame.setContentPane(pcaPanel);\r
Desktop.addInternalFrame(frame, "Principal component analysis",\r
400, 400);\r
- }\r
- catch (java.lang.OutOfMemoryError ex)\r
- {\r
- JOptionPane.showInternalMessageDialog(this,\r
- "Too many sequences selected\nfor Principal Component Analysis!!",\r
- "Out of memory",\r
- JOptionPane.WARNING_MESSAGE);\r
- }\r
}\r
\r
/**\r
}\r
;\r
});\r
- viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener()\r
- {\r
- public void propertyChange(PropertyChangeEvent evt)\r
- {\r
- if (evt.getPropertyName().equals("alignment"))\r
- {\r
- treePanel.getTree().UpdatePlaceHolders( (Vector) evt.getNewValue());\r
- treePanel.repaint();\r
- }\r
- }\r
- });\r
}\r
\r
/**\r