public static final int NEW_WINDOW_HEIGHT = 500;\r
jalview.bin.JalviewLite applet;\r
\r
- public AlignFrame(AlignmentI al)\r
- {\r
- this.applet = null;\r
- viewport = new AlignViewport(al, null);\r
- alignPanel = new AlignmentPanel(this, viewport);\r
- add(alignPanel);\r
- alignPanel.validate();\r
- }\r
\r
public AlignFrame(AlignmentI al, jalview.bin.JalviewLite applet)\r
{\r
alignPanel.validate();\r
\r
String treeFile = applet.getParameter("treeFile");\r
- TreePanel treepanel = null;\r
if (treeFile != null)\r
{\r
try\r
}\r
}\r
\r
+ String param = applet.getParameter("sortBy");\r
+ if(param!=null)\r
+ {\r
+ if (param.equalsIgnoreCase("Id"))\r
+ sortIDMenuItem_actionPerformed(null);\r
+ else if (param.equalsIgnoreCase("Pairwise Identity"))\r
+ sortPairwiseMenuItem_actionPerformed(null);\r
+ }\r
+\r
+ this.addWindowListener(new WindowAdapter()\r
+ {\r
+ public void windowClosing(WindowEvent e)\r
+ {\r
+ closeMenuItem_actionPerformed(null);\r
+ }\r
+ });\r
\r
+ viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener()\r
+ {\r
+ public void propertyChange(java.beans.PropertyChangeEvent evt)\r
+ {\r
+ if (evt.getPropertyName().equals("alignment"))\r
+ {\r
+ alignmentChanged();\r
+ }\r
+ }\r
+ });\r
}\r
\r
public void inputText_actionPerformed(ActionEvent e)\r
{\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer(true);\r
+ CutAndPasteTransfer cap = new CutAndPasteTransfer(true, applet);\r
Frame frame = new Frame();\r
frame.add(cap);\r
jalview.bin.JalviewLite.addFrame(frame, "Cut & Paste Input", 500, 500);\r
\r
protected void outputText_actionPerformed(ActionEvent e)\r
{\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer(false);\r
+ CutAndPasteTransfer cap = new CutAndPasteTransfer(false, applet);\r
Frame frame = new Frame();\r
frame.add(cap);\r
jalview.bin.JalviewLite.addFrame(frame,\r
\r
public void closeMenuItem_actionPerformed(ActionEvent e)\r
{\r
+ PaintRefresher.components.remove(viewport.alignment);\r
dispose();\r
}\r
\r
redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment,\r
HistoryItem.HIDE));\r
restoreHistoryItem(hi);\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
protected void redoMenuItem_actionPerformed(ActionEvent e)\r
HistoryItem hi = (HistoryItem) redoList.pop();\r
restoreHistoryItem(hi);\r
updateEditMenuBar();\r
- viewport.updateConsensus();\r
- alignPanel.repaint();\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, viewport.getAlignment().getSequences());\r
}\r
\r
public void moveSelectedSequences(boolean up)\r
{\r
viewport.setEndSeq(viewport.alignment.getHeight());\r
viewport.alignment.getWidth();\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
}\r
catch (Exception ex)\r
{}\r
}\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
\r
}\r
\r
{\r
sg.addSequence(viewport.getAlignment().getSequenceAt(i), false);\r
}\r
- sg.setEndRes(viewport.alignment.getWidth());\r
+ sg.setEndRes(viewport.alignment.getWidth()-1);\r
viewport.setSelectionGroup(sg);\r
alignPanel.repaint();\r
PaintRefresher.Refresh(null, viewport.alignment);\r
viewport.setSelectionGroup(null);\r
viewport.getColumnSelection().clear();\r
viewport.setSelectionGroup(null);\r
+ alignPanel.repaint();\r
PaintRefresher.Refresh(null, viewport.alignment);\r
}\r
\r
viewport.alignment.deleteGroup(sg);\r
}\r
}\r
-\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
}\r
\r
viewport.alignment.deleteGroup(sg);\r
}\r
}\r
-\r
- alignPanel.repaint();\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
}\r
addHistoryItem(new HistoryItem("Remove Gapped Columns",\r
viewport.alignment,\r
HistoryItem.HIDE));\r
+\r
+ //This is to maintain viewport position on first residue\r
+ //of first sequence\r
+ SequenceI seq = viewport.alignment.getSequenceAt(0);\r
+ int startRes = seq.findPosition(viewport.startRes);\r
+\r
viewport.getAlignment().removeGaps();\r
- viewport.updateConservation();\r
- viewport.updateConsensus();\r
- alignPanel.repaint();\r
+\r
+ viewport.setStartRes(seq.findIndex(startRes)-1);\r
+\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
public void removeAllGapsMenuItem_actionPerformed(ActionEvent e)\r
addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment,\r
HistoryItem.HIDE));\r
\r
+ //This is to maintain viewport position on first residue\r
+ //of first sequence\r
+ SequenceI seq = viewport.alignment.getSequenceAt(0);\r
+ int startRes = seq.findPosition(viewport.startRes);\r
+\r
SequenceI current;\r
int jSize;\r
\r
while(j < end && j < jSize) ;\r
}\r
\r
- viewport.updateConservation();\r
+ viewport.setStartRes(seq.findIndex(startRes)-1);\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
+ }\r
+\r
+ public void alignmentChanged()\r
+ {\r
viewport.updateConsensus();\r
+ viewport.updateConservation ();\r
+ resetAllColourSchemes();\r
alignPanel.repaint();\r
}\r
\r
+ void resetAllColourSchemes()\r
+ {\r
+ ColourSchemeI cs = viewport.globalColourScheme;\r
+ if(cs!=null)\r
+ {\r
+ if (cs instanceof ClustalxColourScheme)\r
+ {\r
+ ( (ClustalxColourScheme) viewport.getGlobalColourScheme()).\r
+ resetClustalX(viewport.alignment.getSequences(),\r
+ viewport.alignment.getWidth());\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
+ cs.setConservation(c);\r
+ }\r
+ }\r
+\r
+ int s, sSize = viewport.alignment.getGroups().size();\r
+ for(s=0; s<sSize; s++)\r
+ {\r
+ SequenceGroup sg = (SequenceGroup)viewport.alignment.getGroups().elementAt(s);\r
+ if(sg.cs!=null && sg.cs instanceof ClustalxColourScheme)\r
+ {\r
+ ((ClustalxColourScheme)sg.cs).resetClustalX(sg.sequences, sg.getWidth());\r
+ }\r
+ sg.recalcConservation();\r
+ }\r
+ }\r
+\r
+\r
\r
public void findMenuItem_actionPerformed(ActionEvent e)\r
{\r
{\r
int threshold = 0;\r
\r
- if (viewport.getAbovePIDThreshold())\r
+ if(cs!=null)\r
{\r
- threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");\r
-\r
- cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
+ if (viewport.getAbovePIDThreshold())\r
+ {\r
+ threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");\r
\r
- viewport.setGlobalColourScheme(cs);\r
- }\r
- else\r
- {\r
- cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
- }\r
+ cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
\r
- if (viewport.getConservationSelected())\r
- {\r
+ viewport.setGlobalColourScheme(cs);\r
+ }\r
+ else\r
+ {\r
+ cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
+ }\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
+ if (viewport.getConservationSelected())\r
+ {\r
\r
- c.calculate();\r
- c.verdict(false, viewport.ConsPercGaps);\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
\r
- cs.setConservation(c);\r
+ c.calculate();\r
+ c.verdict(false, viewport.ConsPercGaps);\r
\r
- // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
- cs.setConsensus(viewport.vconsensus);\r
- viewport.setGlobalColourScheme(cs);\r
+ cs.setConservation(c);\r
\r
- SliderPanel.setConservationSlider(alignPanel, cs, "Background");\r
+ cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel, cs,\r
+ "Background"));\r
\r
- }\r
- else\r
- {\r
- // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
- if (cs != null)\r
+ }\r
+ else\r
{\r
- cs.setConsensus(viewport.vconsensus);\r
+ cs.setConservation(null);\r
}\r
- viewport.setGlobalColourScheme(cs);\r
+\r
+ cs.setConsensus(viewport.vconsensus);\r
+\r
}\r
+ viewport.setGlobalColourScheme(cs);\r
\r
if (viewport.getColourAppliesToAllGroups())\r
{\r
}\r
if (cs instanceof ClustalxColourScheme)\r
{\r
- ClustalxColourScheme cxs = (ClustalxColourScheme) cs;\r
- cxs.resetClustalX(viewport.alignment.getSequences(), viewport.alignment.getWidth());\r
- sg.cs = cxs;\r
+ sg.cs = new ClustalxColourScheme(sg.sequences, sg.getWidth());\r
}\r
else\r
{\r
sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus());\r
sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));\r
}\r
+ else\r
+ sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
\r
if (viewport.getConservationSelected())\r
{\r
viewport.alignment.getWidth() - 1);\r
c.calculate();\r
c.verdict(false, viewport.ConsPercGaps);\r
-\r
- // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
- cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));\r
- sg.cs = cs;\r
+ sg.cs.setConservation(c);\r
}\r
else\r
{\r
- // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
- sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));\r
+ sg.cs.setConservation(null);\r
+ sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());\r
}\r
\r
}\r
}\r
\r
- updateCSConsensus();\r
\r
if (alignPanel.getOverviewPanel() != null)\r
{\r
alignPanel.repaint();\r
}\r
\r
- public void updateCSConsensus()\r
- {\r
- //Colour schemes must have their consensus updated\r
\r
- }\r
\r
protected void modifyPID_actionPerformed(ActionEvent e)\r
{\r
- if (viewport.getAbovePIDThreshold())\r
+ if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null)\r
{\r
SliderPanel.setPIDSliderSource(alignPanel, viewport.getGlobalColourScheme(),\r
"Background");\r
\r
protected void modifyConservation_actionPerformed(ActionEvent e)\r
{\r
- if (viewport.getConservationSelected())\r
+ if (viewport.getConservationSelected() && viewport.globalColourScheme!=null)\r
{\r
SliderPanel.setConservationSlider(alignPanel, viewport.globalColourScheme,\r
"Background");\r
if (viewport.getSelectionGroup().getSize() > 1)\r
{\r
Frame frame = new Frame();\r
- frame.add(new PairwiseAlignPanel(viewport));\r
+ frame.add(new PairwiseAlignPanel(alignPanel));\r
jalview.bin.JalviewLite.addFrame(frame, "Pairwise Alignment", 600, 500);\r
}\r
}\r
if (viewport.getSelectionGroup() != null &&\r
viewport.getSelectionGroup().getSize() > 3)\r
{\r
- tp = new TreePanel(viewport, viewport.getSelectionGroup().sequences, type,\r
+ tp = new TreePanel(alignPanel, viewport.getSelectionGroup().sequences, type,\r
pwType,\r
0, viewport.alignment.getWidth());\r
}\r
else\r
{\r
- tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
+ tp = new TreePanel(alignPanel, viewport.getAlignment().getSequences(),\r
type, pwType, 0, viewport.alignment.getWidth());\r
}\r
\r