/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
import jalview.datamodel.*;\r
import jalview.analysis.*;\r
import jalview.io.*;\r
+import jalview.commands.*;\r
import java.awt.*;\r
import java.awt.event.*;\r
import java.util.*;\r
{\r
public AlignmentPanel alignPanel;\r
public AlignViewport viewport;\r
- int NEW_WINDOW_WIDTH = 700;\r
- int NEW_WINDOW_HEIGHT = 500;\r
- jalview.bin.JalviewLite applet;\r
+ int DEFAULT_WIDTH = 700;\r
+ int DEFAULT_HEIGHT = 500;\r
\r
String jalviewServletURL;\r
\r
ex.printStackTrace();\r
}\r
\r
- this.applet = applet;\r
viewport = new AlignViewport(al, applet);\r
alignPanel = new AlignmentPanel(this, viewport);\r
\r
if (param != null)\r
{\r
int width = Integer.parseInt(param);\r
- NEW_WINDOW_WIDTH = width;\r
+ DEFAULT_WIDTH = width;\r
}\r
param = applet.getParameter("windowHeight");\r
if (param != null)\r
{\r
int height = Integer.parseInt(param);\r
- NEW_WINDOW_HEIGHT = height;\r
+ DEFAULT_HEIGHT = height;\r
}\r
}\r
catch (Exception ex)\r
this.addKeyListener(this);\r
alignPanel.seqPanel.seqCanvas.addKeyListener(this);\r
alignPanel.idPanel.idCanvas.addKeyListener(this);\r
+ alignPanel.scalePanel.addKeyListener(this);\r
+ alignPanel.annotationPanel.addKeyListener(this);\r
\r
viewport.addPropertyChangeListener(new java.beans.PropertyChangeListener()\r
{\r
else\r
{\r
add(alignPanel, BorderLayout.CENTER);\r
- jalview.bin.JalviewLite.addFrame(this, title, NEW_WINDOW_WIDTH,\r
- NEW_WINDOW_HEIGHT);\r
+ jalview.bin.JalviewLite.addFrame(this, title, DEFAULT_WIDTH,\r
+ DEFAULT_HEIGHT);\r
}\r
alignPanel.validate();\r
alignPanel.repaint();\r
case KeyEvent.VK_SPACE:\r
if(viewport.cursorMode)\r
{\r
- alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown());\r
+ alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown()\r
+ || evt.isShiftDown()\r
+ || evt.isAltDown()\r
+ );\r
}\r
break;\r
\r
case KeyEvent.VK_BACK_SPACE:\r
if(viewport.cursorMode)\r
{\r
- alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown());\r
+ alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown()\r
+ || evt.isShiftDown()\r
+ || evt.isAltDown()\r
+ );\r
}\r
else\r
{\r
findMenuItem_actionPerformed();\r
}\r
break;\r
- }\r
+ case KeyEvent.VK_H:\r
+ {\r
+ boolean toggleSeqs = !evt.isControlDown();\r
+ boolean toggleCols = !evt.isShiftDown();\r
+ boolean hide = false;\r
+ SequenceGroup sg = viewport.getSelectionGroup();\r
+\r
+ if(toggleSeqs)\r
+ {\r
+ if (sg != null && sg.getSize(false) != viewport.alignment.getHeight())\r
+ {\r
+ hide = true;\r
+ viewport.hideAllSelectedSeqs();\r
+ }\r
+ else if (!(toggleCols && viewport.colSel.getSelected().size() > 0))\r
+ viewport.showAllHiddenSeqs();\r
+ }\r
+\r
+ if(toggleCols)\r
+ {\r
+ if (viewport.colSel.getSelected().size() > 0)\r
+ {\r
+ viewport.hideSelectedColumns();\r
+ if(!toggleSeqs)\r
+ viewport.selectionGroup = sg;\r
+ }\r
+ else if (!hide)\r
+ viewport.showAllHiddenColumns();\r
+ }\r
+\r
+ alignPanel.repaint();\r
+ break;\r
+ }\r
+ case KeyEvent.VK_PAGE_UP:\r
+ if (viewport.wrapAlignment)\r
+ alignPanel.scrollUp(true);\r
+ else\r
+ alignPanel.setScrollValues(viewport.startRes,\r
+ viewport.startSeq\r
+ - viewport.endSeq + viewport.startSeq);\r
+ break;\r
+ case KeyEvent.VK_PAGE_DOWN:\r
+ if (viewport.wrapAlignment)\r
+ alignPanel.scrollUp(false);\r
+ else\r
+ alignPanel.setScrollValues(viewport.startRes,\r
+ viewport.startSeq\r
+ + viewport.endSeq - viewport.startSeq);\r
+ break;\r
+ }\r
}\r
public void keyReleased(KeyEvent evt)\r
{}\r
}\r
public void actionPerformed(ActionEvent evt)\r
{\r
- if(evt.getSource()==inputText)\r
+ Object source = evt.getSource();\r
+\r
+ if(source==inputText)\r
inputText_actionPerformed();\r
- else if(evt.getSource()==loadTree)\r
+ else if(source==loadTree)\r
loadTree_actionPerformed();\r
- else if(evt.getSource()==loadApplication)\r
+ else if(source==loadApplication)\r
launchFullApplication();\r
- else if(evt.getSource()==closeMenuItem)\r
+ else if(source==closeMenuItem)\r
closeMenuItem_actionPerformed();\r
- else if(evt.getSource()==copy)\r
+ else if(source==copy)\r
copy_actionPerformed();\r
- else if(evt.getSource()==undoMenuItem)\r
+ else if(source==undoMenuItem)\r
undoMenuItem_actionPerformed();\r
- else if(evt.getSource()==redoMenuItem)\r
+ else if(source==redoMenuItem)\r
redoMenuItem_actionPerformed();\r
- else if(evt.getSource()==inputText)\r
+ else if(source==inputText)\r
inputText_actionPerformed();\r
- else if(evt.getSource()==closeMenuItem)\r
+ else if(source==closeMenuItem)\r
closeMenuItem_actionPerformed();\r
- else if(evt.getSource()==undoMenuItem)\r
+ else if(source==undoMenuItem)\r
undoMenuItem_actionPerformed();\r
- else if(evt.getSource()==redoMenuItem)\r
+ else if(source==redoMenuItem)\r
redoMenuItem_actionPerformed();\r
- else if(evt.getSource()==copy)\r
+ else if(source==copy)\r
copy_actionPerformed();\r
- else if(evt.getSource()==pasteNew)\r
+ else if(source==pasteNew)\r
pasteNew_actionPerformed();\r
- else if(evt.getSource()==pasteThis)\r
+ else if(source==pasteThis)\r
pasteThis_actionPerformed();\r
- else if(evt.getSource()==cut)\r
+ else if(source==cut)\r
cut_actionPerformed();\r
- else if(evt.getSource()==delete)\r
+ else if(source==delete)\r
delete_actionPerformed();\r
- else if(evt.getSource()==deleteGroups)\r
+ else if(source==deleteGroups)\r
deleteGroups_actionPerformed();\r
- else if(evt.getSource()==selectAllSequenceMenuItem)\r
+ else if(source==selectAllSequenceMenuItem)\r
selectAllSequenceMenuItem_actionPerformed();\r
- else if(evt.getSource()==deselectAllSequenceMenuItem)\r
+ else if(source==deselectAllSequenceMenuItem)\r
deselectAllSequenceMenuItem_actionPerformed();\r
- else if(evt.getSource()==invertSequenceMenuItem)\r
+ else if(source==invertSequenceMenuItem)\r
invertSequenceMenuItem_actionPerformed();\r
- else if(evt.getSource()==remove2LeftMenuItem)\r
+ else if(source==invertColSel)\r
+ { viewport.invertColumnSelection(); alignPanel.repaint(); }\r
+ else if(source==remove2LeftMenuItem)\r
remove2LeftMenuItem_actionPerformed();\r
- else if(evt.getSource()==remove2RightMenuItem)\r
+ else if(source==remove2RightMenuItem)\r
remove2RightMenuItem_actionPerformed();\r
- else if(evt.getSource()==removeGappedColumnMenuItem)\r
+ else if(source==removeGappedColumnMenuItem)\r
removeGappedColumnMenuItem_actionPerformed();\r
- else if(evt.getSource()==removeAllGapsMenuItem)\r
+ else if(source==removeAllGapsMenuItem)\r
removeAllGapsMenuItem_actionPerformed();\r
- else if(evt.getSource()==findMenuItem)\r
+ else if(source==findMenuItem)\r
findMenuItem_actionPerformed();\r
- else if(evt.getSource()==font)\r
+ else if(source==font)\r
font_actionPerformed();\r
- else if(evt.getSource()==featureSettings)\r
+ else if(source==showColumns)\r
+ {\r
+ viewport.showAllHiddenColumns(); alignPanel.repaint();\r
+ }\r
+ else if(source==showSeqs)\r
+ {\r
+ viewport.showAllHiddenSeqs();\r
+ }\r
+ else if(source == hideColumns)\r
+ {\r
+ viewport.hideSelectedColumns(); alignPanel.repaint();\r
+ }\r
+ else if(source == hideSequences && viewport.getSelectionGroup()!=null)\r
+ {\r
+ viewport.hideAllSelectedSeqs();\r
+ }\r
+ else if(source==featureSettings)\r
featureSettings_actionPerformed();\r
- else if(evt.getSource()==overviewMenuItem)\r
+ else if(source==overviewMenuItem)\r
overviewMenuItem_actionPerformed();\r
- else if(evt.getSource()==noColourmenuItem)\r
+ else if(source==noColourmenuItem)\r
noColourmenuItem_actionPerformed();\r
- else if(evt.getSource()==clustalColour)\r
+ else if(source==clustalColour)\r
clustalColour_actionPerformed();\r
- else if(evt.getSource()==zappoColour)\r
+ else if(source==zappoColour)\r
zappoColour_actionPerformed();\r
- else if(evt.getSource()==taylorColour)\r
+ else if(source==taylorColour)\r
taylorColour_actionPerformed();\r
- else if(evt.getSource()==hydrophobicityColour)\r
+ else if(source==hydrophobicityColour)\r
hydrophobicityColour_actionPerformed();\r
- else if(evt.getSource()==helixColour)\r
+ else if(source==helixColour)\r
helixColour_actionPerformed();\r
- else if(evt.getSource()==strandColour)\r
+ else if(source==strandColour)\r
strandColour_actionPerformed();\r
- else if(evt.getSource()==turnColour)\r
+ else if(source==turnColour)\r
turnColour_actionPerformed();\r
- else if(evt.getSource()==buriedColour)\r
+ else if(source==buriedColour)\r
buriedColour_actionPerformed();\r
- else if(evt.getSource()==nucleotideColour)\r
+ else if(source==nucleotideColour)\r
nucleotideColour_actionPerformed();\r
- else if(evt.getSource()==modifyPID)\r
+ else if(source==modifyPID)\r
modifyPID_actionPerformed();\r
- else if(evt.getSource()==modifyConservation)\r
+ else if(source==modifyConservation)\r
modifyConservation_actionPerformed();\r
- else if(evt.getSource()==userDefinedColour)\r
+ else if(source==userDefinedColour)\r
userDefinedColour_actionPerformed();\r
- else if(evt.getSource()==PIDColour)\r
+ else if(source==PIDColour)\r
PIDColour_actionPerformed();\r
- else if(evt.getSource()==BLOSUM62Colour)\r
+ else if(source==BLOSUM62Colour)\r
BLOSUM62Colour_actionPerformed();\r
- else if(evt.getSource()==annotationColour)\r
+ else if(source==annotationColour)\r
new AnnotationColourChooser(viewport, alignPanel);\r
- else if(evt.getSource()==sortPairwiseMenuItem)\r
+ else if(source==sortPairwiseMenuItem)\r
sortPairwiseMenuItem_actionPerformed();\r
- else if(evt.getSource()==sortIDMenuItem)\r
+ else if(source==sortIDMenuItem)\r
sortIDMenuItem_actionPerformed();\r
- else if(evt.getSource()==sortGroupMenuItem)\r
+ else if(source==sortGroupMenuItem)\r
sortGroupMenuItem_actionPerformed();\r
- else if(evt.getSource()==removeRedundancyMenuItem)\r
+ else if(source==removeRedundancyMenuItem)\r
removeRedundancyMenuItem_actionPerformed();\r
- else if(evt.getSource()==pairwiseAlignmentMenuItem)\r
+ else if(source==pairwiseAlignmentMenuItem)\r
pairwiseAlignmentMenuItem_actionPerformed();\r
- else if(evt.getSource()==PCAMenuItem)\r
+ else if(source==PCAMenuItem)\r
PCAMenuItem_actionPerformed();\r
- else if(evt.getSource()==averageDistanceTreeMenuItem)\r
+ else if(source==averageDistanceTreeMenuItem)\r
averageDistanceTreeMenuItem_actionPerformed();\r
- else if(evt.getSource()==neighbourTreeMenuItem)\r
+ else if(source==neighbourTreeMenuItem)\r
neighbourTreeMenuItem_actionPerformed();\r
- else if(evt.getSource()==njTreeBlosumMenuItem)\r
+ else if(source==njTreeBlosumMenuItem)\r
njTreeBlosumMenuItem_actionPerformed();\r
- else if(evt.getSource()==avDistanceTreeBlosumMenuItem)\r
+ else if(source==avDistanceTreeBlosumMenuItem)\r
avTreeBlosumMenuItem_actionPerformed();\r
- else if(evt.getSource()==documentation)\r
+ else if(source==documentation)\r
documentation_actionPerformed();\r
- else if(evt.getSource()==about)\r
+ else if(source==about)\r
about_actionPerformed();\r
\r
}\r
\r
protected void outputText_actionPerformed(ActionEvent e)\r
{\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);\r
+ CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this);\r
Frame frame = new Frame();\r
frame.add(cap);\r
jalview.bin.JalviewLite.addFrame(frame,\r
StringBuffer url = new StringBuffer(jalviewServletURL);\r
\r
url.append("?open="+\r
- appendProtocol( applet.getParameter("file") ) );\r
+ appendProtocol( viewport.applet.getParameter("file") ) );\r
\r
- if(applet.getParameter("features")!=null)\r
+ if(viewport.applet.getParameter("features")!=null)\r
{\r
url.append( "&features=" );\r
- url.append( appendProtocol( applet.getParameter("features") ) );\r
+ url.append( appendProtocol( viewport.applet.getParameter("features") ) );\r
+ }\r
+\r
+ if(viewport.applet.getParameter("annotations")!=null)\r
+ {\r
+ url.append( "&annotations=" );\r
+ url.append( appendProtocol( viewport.applet.getParameter("annotations") ) );\r
}\r
\r
- if(applet.getParameter("defaultColour")!=null)\r
+ if(viewport.applet.getParameter("jnetfile")!=null)\r
+ {\r
+ url.append( "&annotations=" );\r
+ url.append( appendProtocol( viewport.applet.getParameter("jnetfile") ) );\r
+ }\r
+\r
+ if(viewport.applet.getParameter("defaultColour")!=null)\r
{\r
url.append("&colour=" +\r
- removeWhiteSpace(applet.getParameter("defaultColour"))\r
+ removeWhiteSpace(viewport.applet.getParameter("defaultColour"))\r
);\r
}\r
\r
- if(applet.getParameter("userDefinedColour")!=null)\r
+ if(viewport.applet.getParameter("userDefinedColour")!=null)\r
{\r
url.append( "&colour=" +\r
- removeWhiteSpace( applet.getParameter("userDefinedColour") )\r
+ removeWhiteSpace( viewport.applet.getParameter("userDefinedColour") )\r
);\r
}\r
\r
new URL(url);\r
}catch(java.net.MalformedURLException ex)\r
{\r
- url = applet.getCodeBase()+url;\r
+ url = viewport.applet.getCodeBase()+url;\r
}\r
return url;\r
}\r
public void closeMenuItem_actionPerformed()\r
{\r
PaintRefresher.components.remove(viewport.alignment);\r
- if(PaintRefresher.components.size()==0 && applet==null)\r
+ if(PaintRefresher.components.size()==0 && viewport.applet==null)\r
System.exit(0);\r
\r
this.dispose();\r
\r
void updateEditMenuBar()\r
{\r
- if (historyList.size() > 0)\r
- {\r
- undoMenuItem.setEnabled(true);\r
- HistoryItem hi = (HistoryItem) historyList.peek();\r
- undoMenuItem.setLabel("Undo " + hi.getDescription());\r
- }\r
- else\r
- {\r
- undoMenuItem.setEnabled(false);\r
- undoMenuItem.setLabel("Undo");\r
- }\r
-\r
- if (redoList.size() > 0)\r
- {\r
- redoMenuItem.setEnabled(true);\r
- HistoryItem hi = (HistoryItem) redoList.peek();\r
- redoMenuItem.setLabel("Redo " + hi.getDescription());\r
- }\r
- else\r
- {\r
- redoMenuItem.setEnabled(false);\r
- redoMenuItem.setLabel("Redo");\r
- }\r
}\r
\r
- public void addHistoryItem(HistoryItem hi)\r
- {\r
- historyList.push(hi);\r
- updateEditMenuBar();\r
- }\r
\r
protected void undoMenuItem_actionPerformed()\r
{\r
- HistoryItem hi = (HistoryItem) historyList.pop();\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()\r
{\r
- HistoryItem hi = (HistoryItem) redoList.pop();\r
- restoreHistoryItem(hi);\r
- updateEditMenuBar();\r
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
+\r
}\r
\r
// used by undo and redo\r
- void restoreHistoryItem(HistoryItem hi)\r
+ void restoreHistoryItem(CommandI command)\r
{\r
- hi.restore();\r
-\r
- updateEditMenuBar();\r
-\r
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
public void moveSelectedSequences(boolean up)\r
alignPanel.repaint();\r
}\r
\r
- StringBuffer copiedSequences;\r
+ static StringBuffer copiedSequences;\r
+ static Vector copiedHiddenColumns;\r
protected void copy_actionPerformed()\r
{\r
if (viewport.getSelectionGroup() == null)\r
int index = 0, startRes, endRes;\r
char ch;\r
\r
+ if (viewport.hasHiddenColumns && viewport.getSelectionGroup() != null)\r
+ {\r
+ copiedHiddenColumns = new Vector();\r
+ int hiddenOffset = viewport.getSelectionGroup().getStartRes();\r
+ for (int i = 0; i < viewport.getColumnSelection().getHiddenColumns().size();\r
+ i++)\r
+ {\r
+ int[] region = (int[])\r
+ viewport.getColumnSelection().getHiddenColumns().elementAt(i);\r
+\r
+ copiedHiddenColumns.addElement(new int[]\r
+ {region[0] - hiddenOffset,\r
+ region[1] - hiddenOffset});\r
+ }\r
+ }\r
+ else\r
+ copiedHiddenColumns = null;\r
+\r
+\r
for (int i = 0; i < sg.getSize(false); i++)\r
{\r
SequenceI seq = null;\r
\r
protected void pasteThis_actionPerformed()\r
{\r
- addHistoryItem(new HistoryItem("Paste Sequences", viewport.alignment,\r
- HistoryItem.PASTE));\r
+ // addHistoryItem(new HistoryItem("Paste Sequences", viewport.alignment,\r
+ // HistoryItem.PASTE));\r
paste(false);\r
}\r
\r
newtitle = newtitle.concat("- from " + getTitle());\r
}\r
AlignFrame af = new AlignFrame(new Alignment(newSeqs),\r
- applet,\r
+ viewport.applet,\r
newtitle,\r
false);\r
+ if (copiedHiddenColumns != null)\r
+ {\r
+ for (int i = 0; i < copiedHiddenColumns.size(); i++)\r
+ {\r
+ int[] region = (int[]) copiedHiddenColumns.elementAt(i);\r
+ af.viewport.hideColumns(region[0], region[1]);\r
+ }\r
+ }\r
+\r
\r
- jalview.bin.JalviewLite.addFrame(af, newtitle, NEW_WINDOW_WIDTH,\r
- NEW_WINDOW_HEIGHT);\r
+ jalview.bin.JalviewLite.addFrame(af, newtitle, DEFAULT_WIDTH,\r
+ DEFAULT_HEIGHT);\r
}\r
else\r
{\r
\r
protected void delete_actionPerformed()\r
{\r
- addHistoryItem(new HistoryItem("Delete Sequences", viewport.alignment,\r
- HistoryItem.HIDE));\r
+ //addHistoryItem(new HistoryItem("Delete Sequences", viewport.alignment,\r
+ // HistoryItem.HIDE));\r
if (viewport.getSelectionGroup() == null)\r
{\r
return;\r
\r
public void remove2LeftMenuItem_actionPerformed()\r
{\r
- ColumnSelection colSel = viewport.getColumnSelection();\r
- if (colSel.size() > 0)\r
- {\r
- addHistoryItem(new HistoryItem("Remove Left", viewport.alignment,\r
- HistoryItem.HIDE));\r
- int min = colSel.getMin();\r
- viewport.getAlignment().trimLeft(min);\r
- colSel.compensateForEdit(0, min);\r
-\r
- if (viewport.getSelectionGroup() != null)\r
- {\r
- viewport.getSelectionGroup().adjustForRemoveLeft(min);\r
- }\r
-\r
- Vector groups = viewport.alignment.getGroups();\r
- for (int i = 0; i < groups.size(); i++)\r
- {\r
- SequenceGroup sg = (SequenceGroup) groups.elementAt(i);\r
- if (!sg.adjustForRemoveLeft(min))\r
- {\r
- viewport.alignment.deleteGroup(sg);\r
- }\r
- }\r
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
- }\r
}\r
\r
public void remove2RightMenuItem_actionPerformed()\r
{\r
- ColumnSelection colSel = viewport.getColumnSelection();\r
- if (colSel.size() > 0)\r
- {\r
- addHistoryItem(new HistoryItem("Remove Right", viewport.alignment,\r
- HistoryItem.HIDE));\r
- int max = colSel.getMax();\r
- viewport.getAlignment().trimRight(max);\r
- if (viewport.getSelectionGroup() != null)\r
- {\r
- viewport.getSelectionGroup().adjustForRemoveRight(max);\r
- }\r
-\r
- Vector groups = viewport.alignment.getGroups();\r
- for (int i = 0; i < groups.size(); i++)\r
- {\r
- SequenceGroup sg = (SequenceGroup) groups.elementAt(i);\r
- if (!sg.adjustForRemoveRight(max))\r
- {\r
- viewport.alignment.deleteGroup(sg);\r
- }\r
- }\r
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
- }\r
-\r
}\r
\r
public void removeGappedColumnMenuItem_actionPerformed()\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
-\r
- viewport.setStartRes(seq.findIndex(startRes)-1);\r
-\r
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
public void removeAllGapsMenuItem_actionPerformed()\r
{\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
- Vector seqs=null;\r
-\r
- int start=0, end = viewport.alignment.getWidth();\r
-\r
- if (viewport.getSelectionGroup() != null\r
- && viewport.getSelectionGroup().getSequences(false) != null\r
- && viewport.getSelectionGroup().getSize(false)>0)\r
- {\r
- seqs = viewport.getSelectionGroup().getSequences(true);\r
- start = viewport.getSelectionGroup().getStartRes();\r
- end = viewport.getSelectionGroup().getEndRes()+1;\r
- }\r
- else\r
- seqs = viewport.alignment.getSequences();\r
-\r
- for (int i = 0; i < seqs.size(); i++)\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
- 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
- }\r
- while (j < end && j < jSize);\r
- if(rangeStart>-1)\r
- {\r
- current.deleteChars(rangeStart, rangeEnd);\r
- }\r
- }\r
- viewport.setStartRes(seq.findIndex(startRes)-1);\r
- viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
\r
public void alignmentChanged()\r
viewport.alignment.getWidth());\r
}\r
\r
- cs.setConsensus(viewport.vconsensus);\r
+ cs.setConsensus(viewport.hconsensus);\r
if (cs.conservationApplied())\r
{\r
Alignment al = (Alignment) viewport.alignment;\r
alignPanel.repaint();\r
}\r
\r
+\r
protected void scaleAbove_actionPerformed()\r
{\r
viewport.setScaleAboveWrapped(scaleAbove.getState());\r
cs.setConservation(null);\r
}\r
\r
- cs.setConsensus(viewport.vconsensus);\r
+ cs.setConsensus(viewport.hconsensus);\r
\r
}\r
viewport.setGlobalColourScheme(cs);\r
\r
public void sortPairwiseMenuItem_actionPerformed()\r
{\r
- addHistoryItem(new HistoryItem("Pairwise Sort", viewport.alignment,\r
- HistoryItem.SORT));\r
+ // addHistoryItem(new HistoryItem("Pairwise Sort", viewport.alignment,\r
+ // HistoryItem.SORT));\r
AlignmentSorter.sortByPID(viewport.getAlignment(),\r
viewport.getAlignment().getSequenceAt(0));\r
alignPanel.repaint();\r
\r
public void sortIDMenuItem_actionPerformed()\r
{\r
- addHistoryItem(new HistoryItem("ID Sort", viewport.alignment,\r
- HistoryItem.SORT));\r
+ // addHistoryItem(new HistoryItem("ID Sort", viewport.alignment,\r
+ // HistoryItem.SORT));\r
AlignmentSorter.sortByID(viewport.getAlignment());\r
alignPanel.repaint();\r
}\r
\r
public void sortGroupMenuItem_actionPerformed()\r
{\r
- addHistoryItem(new HistoryItem("Group Sort", viewport.alignment,\r
- HistoryItem.SORT));\r
+ // addHistoryItem(new HistoryItem("Group Sort", viewport.alignment,\r
+ // HistoryItem.SORT));\r
AlignmentSorter.sortByGroup(viewport.getAlignment());\r
alignPanel.repaint();\r
\r
\r
public void pairwiseAlignmentMenuItem_actionPerformed()\r
{\r
- if (viewport.getSelectionGroup().getSize(false) > 1)\r
+ if (viewport.getSelectionGroup()!=null\r
+ && viewport.getSelectionGroup().getSize(false) > 1)\r
{\r
Frame frame = new Frame();\r
frame.add(new PairwiseAlignPanel(alignPanel));\r
\r
}\r
\r
- final TreePanel tp = new TreePanel(viewport,\r
- type,\r
- pwType);\r
+ if ( (viewport.getSelectionGroup() != null &&\r
+ viewport.getSelectionGroup().getSize(false) > 1)\r
+ || (viewport.getSelectionGroup() == null\r
+ && viewport.alignment.getHeight() > 1))\r
+ {\r
+ final TreePanel tp = new TreePanel(viewport,\r
+ type,\r
+ pwType);\r
\r
- addTreeMenuItem(tp, title);\r
+ addTreeMenuItem(tp, title);\r
\r
- jalview.bin.JalviewLite.addFrame(tp, title, 600, 500);\r
+ jalview.bin.JalviewLite.addFrame(tp, title, 600, 500);\r
+ }\r
}\r
\r
void loadTree_actionPerformed()\r
{\r
public void actionPerformed(ActionEvent evt)\r
{\r
- addHistoryItem(new HistoryItem("Sort", viewport.alignment,\r
- HistoryItem.SORT));\r
+ // addHistoryItem(new HistoryItem("Sort", viewport.alignment,\r
+ // HistoryItem.SORT));\r
AlignmentSorter.sortByTree(viewport.getAlignment(), treePanel.getTree());\r
alignPanel.repaint();\r
}\r
\r
public void showURL(String url, String target)\r
{\r
- if (applet == null)\r
+ if (viewport.applet == null)\r
{\r
System.out.println("Not running as applet - no browser available.");\r
}\r
try\r
{\r
System.out.println("Show url: "+url);\r
- applet.getAppletContext().showDocument(new java.net.URL(url),\r
+ viewport.applet.getAppletContext().showDocument(new java.net.URL(url),\r
target);\r
}\r
catch (Exception ex)\r
MenuItem item;\r
\r
// dynamically fill save as menu with available formats\r
- for (int i = 0; i < jalview.io.AppletFormatAdapter.formats.size(); i++)\r
+ for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length; i++)\r
{\r
\r
- item = new MenuItem( (String) jalview.io.AppletFormatAdapter.formats.\r
- elementAt(\r
- i));\r
+ item = new MenuItem( jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]);\r
+\r
item.addActionListener(new java.awt.event.ActionListener()\r
{\r
public void actionPerformed(ActionEvent e)\r
sequenceFeatures.setState(false);\r
annotationColour.setLabel("by Annotation...");\r
annotationColour.addActionListener(this);\r
+ invertSequenceMenuItem.setLabel("Invert Sequence Selection");\r
+ invertColSel.setLabel("Invert Column Selection");\r
+ menu1.setLabel("Show");\r
+ showColumns.setLabel("All Columns ");\r
+ showSeqs.setLabel("All Sequences");\r
+ menu2.setLabel("Hide");\r
+ hideColumns.setLabel("Selected Columns");\r
+ hideSequences.setLabel("Selected Sequences");\r
+ invertColSel.addActionListener(this);\r
+ showColumns.addActionListener(this);\r
+ showSeqs.addActionListener(this);\r
+ hideColumns.addActionListener(this);\r
+ hideSequences.addActionListener(this);\r
+\r
\r
alignFrameMenuBar.add(fileMenu);\r
alignFrameMenuBar.add(editMenu);\r
editMenu.add(selectAllSequenceMenuItem);\r
editMenu.add(deselectAllSequenceMenuItem);\r
editMenu.add(invertSequenceMenuItem);\r
- editMenu.add(deleteGroups);\r
+ editMenu.add(invertColSel);\r
+ editMenu.add(deleteGroups);\r
editMenu.addSeparator();\r
editMenu.add(remove2LeftMenuItem);\r
editMenu.add(remove2RightMenuItem);\r
searchMenu.add(findMenuItem);\r
viewMenu.add(font);\r
viewMenu.addSeparator();\r
- viewMenu.add(seqLimits);\r
- viewMenu.addSeparator();\r
+ viewMenu.add(menu1);\r
+ viewMenu.add(menu2);\r
+ viewMenu.addSeparator();\r
viewMenu.add(wrapMenuItem);\r
viewMenu.add(scaleAbove);\r
viewMenu.add(scaleLeft);\r
viewMenu.add(scaleRight);\r
viewMenu.addSeparator();\r
+ viewMenu.add(seqLimits);\r
viewMenu.add(viewBoxesMenuItem);\r
viewMenu.add(viewTextMenuItem);\r
viewMenu.add(colourTextMenuItem);\r
calculate.add(njTreeBlosumMenuItem);\r
helpMenu.add(documentation);\r
helpMenu.add(about);\r
+ menu1.add(showColumns);\r
+ menu1.add(showSeqs);\r
+ menu2.add(hideColumns);\r
+ menu2.add(hideSequences);\r
}\r
\r
public void setEmbedded()\r
fileMenu.remove(closeMenuItem);\r
fileMenu.remove(3); // Seperator\r
\r
- applet.setLayout(new BorderLayout());\r
- applet.add(embeddedMenu, BorderLayout.NORTH);\r
- applet.add(statusBar, BorderLayout.SOUTH);\r
- // applet.validate();\r
+ viewport.applet.setLayout(new BorderLayout());\r
+ viewport.applet.add(embeddedMenu, BorderLayout.NORTH);\r
+ viewport.applet.add(statusBar, BorderLayout.SOUTH);\r
+ // viewport.applet.validate();\r
\r
- alignPanel.setSize(applet.size().width, applet.size().height\r
+ alignPanel.setSize(viewport.applet.size().width, viewport.applet.size().height\r
- embeddedMenu.HEIGHT - statusBar.HEIGHT);\r
\r
- applet.add(alignPanel, BorderLayout.CENTER);\r
- applet.validate();\r
+ viewport.applet.add(alignPanel, BorderLayout.CENTER);\r
+ viewport.applet.validate();\r
\r
}\r
\r
MenuItem featureSettings = new MenuItem();\r
CheckboxMenuItem sequenceFeatures = new CheckboxMenuItem();\r
MenuItem annotationColour = new MenuItem();\r
+ MenuItem invertColSel = new MenuItem();\r
+ Menu menu1 = new Menu();\r
+ MenuItem showColumns = new MenuItem();\r
+ MenuItem showSeqs = new MenuItem();\r
+ Menu menu2 = new Menu();\r
+ MenuItem hideColumns = new MenuItem();\r
+ MenuItem hideSequences = new MenuItem();\r
\r
public void mousePressed(MouseEvent evt)\r
{\r