{\r
final AlignmentPanel alignPanel;\r
final AlignViewport viewport;\r
- public static final int NEW_WINDOW_WIDTH = 700;\r
- public static final int NEW_WINDOW_HEIGHT = 500;\r
+ int NEW_WINDOW_WIDTH = 700;\r
+ int NEW_WINDOW_HEIGHT = 500;\r
jalview.bin.JalviewLite applet;\r
\r
\r
- public AlignFrame(AlignmentI al, jalview.bin.JalviewLite applet)\r
+ public AlignFrame(AlignmentI al, jalview.bin.JalviewLite applet, String title)\r
{\r
this.applet = applet;\r
viewport = new AlignViewport(al, applet);\r
add(alignPanel);\r
alignPanel.validate();\r
\r
- String treeFile = applet.getParameter("treeFile");\r
- if (treeFile != null)\r
+ if(applet!=null)\r
{\r
- try\r
+ String treeFile = applet.getParameter("treeFile");\r
+ if (treeFile != null)\r
{\r
- treeFile = treeFile;\r
- jalview.io.NewickFile fin = new jalview.io.NewickFile(applet.\r
- getCodeBase() + treeFile, "URL");\r
- fin.parse();\r
+ try\r
+ {\r
+ treeFile = treeFile;\r
+ jalview.io.NewickFile fin = new jalview.io.NewickFile(applet.\r
+ getCodeBase() + treeFile, "URL");\r
+ fin.parse();\r
\r
- if (fin.getTree() != null)\r
+ if (fin.getTree() != null)\r
+ {\r
+ TreePanel tp = null;\r
+ tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
+ fin, "FromFile", applet.getCodeBase() + treeFile);\r
+ jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500);\r
+ addTreeMenuItem(tp, treeFile);\r
+ }\r
+ }\r
+ catch (Exception ex)\r
{\r
- TreePanel tp = null;\r
- tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
- fin, "FromFile", applet.getCodeBase() + treeFile);\r
- jalview.bin.JalviewLite.addFrame(tp, treeFile, 600, 500);\r
- addTreeMenuItem(tp, treeFile);\r
+ ex.printStackTrace();\r
}\r
}\r
- catch (Exception ex)\r
+\r
+ String param = applet.getParameter("sortBy");\r
+ if (param != null)\r
{\r
- ex.printStackTrace();\r
+ if (param.equalsIgnoreCase("Id"))\r
+ sortIDMenuItem_actionPerformed(null);\r
+ else if (param.equalsIgnoreCase("Pairwise Identity"))\r
+ sortPairwiseMenuItem_actionPerformed(null);\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
+ param = applet.getParameter("wrap");\r
+ if (param != null)\r
+ {\r
+ if (param.equalsIgnoreCase("true"))\r
+ {\r
+ wrapMenuItem.setState(true);\r
+ wrapMenuItem_actionPerformed(null);\r
+ }\r
+ }\r
+\r
+ try\r
+ {\r
+ param = applet.getParameter("windowWidth");\r
+ if (param != null)\r
+ {\r
+ int width = Integer.parseInt(param);\r
+ NEW_WINDOW_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
+ }\r
+ }\r
+ catch (Exception ex)\r
+ {}\r
+\r
}\r
\r
this.addWindowListener(new WindowAdapter()\r
}\r
}\r
});\r
+\r
+ jalview.bin.JalviewLite.addFrame(this, title,\r
+ NEW_WINDOW_WIDTH,\r
+ NEW_WINDOW_HEIGHT);\r
+\r
+\r
}\r
\r
public void inputText_actionPerformed(ActionEvent e)\r
jalview.bin.JalviewLite.addFrame(frame,\r
"Alignment output - " + e.getActionCommand(),\r
600, 500);\r
- cap.setText(FormatAdapter.formatSequences(e.getActionCommand(),\r
+ cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),\r
viewport.getAlignment().\r
getSequences()));\r
}\r
{\r
PaintRefresher.components.remove(viewport.alignment);\r
dispose();\r
+ if(PaintRefresher.components.size()==0 && applet==null)\r
+ System.exit(0);\r
}\r
\r
Stack historyList = new Stack();\r
newSeqs[i] = (SequenceI) seqs.elementAt(i);\r
}\r
\r
- AlignFrame af = new AlignFrame(new Alignment(newSeqs), applet);\r
String newtitle = new String("Copied sequences");\r
if (getTitle().startsWith("Copied sequences"))\r
{\r
{\r
newtitle = newtitle.concat("- from " + getTitle());\r
}\r
+ AlignFrame af = new AlignFrame(new Alignment(newSeqs), applet, newtitle);\r
+\r
jalview.bin.JalviewLite.addFrame(af, newtitle, NEW_WINDOW_WIDTH,\r
NEW_WINDOW_HEIGHT);\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
seqs = viewport.alignment.getSequences();\r
\r
- for (int i = 0; i <seqs.size(); i++)\r
+ for (int i = 0; i < seqs.size(); i++)\r
{\r
- current = (SequenceI)seqs.elementAt(i);\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
+ 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
viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
}\r
viewport.updateConsensus();\r
viewport.updateConservation ();\r
resetAllColourSchemes();\r
+ if(alignPanel.overviewPanel!=null)\r
+ alignPanel.overviewPanel.updateOverviewImage();\r
alignPanel.repaint();\r
}\r
\r
\r
public void font_actionPerformed(ActionEvent e)\r
{\r
- Frame frame = new Frame();\r
- FontChooser fc = new FontChooser(alignPanel, frame);\r
- frame.add(fc);\r
- jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 100);\r
-\r
+ new FontChooser(alignPanel);\r
}\r
\r
protected void fullSeqId_actionPerformed(ActionEvent e)\r
\r
public void annotationPanelMenuItem_actionPerformed(ActionEvent e)\r
{\r
- if (annotationPanelMenuItem.getState() && viewport.getWrapAlignment())\r
- {\r
- annotationPanelMenuItem.setState(false);\r
- return;\r
- }\r
viewport.setShowAnnotation(annotationPanelMenuItem.getState());\r
alignPanel.setAnnotationVisible(annotationPanelMenuItem.getState());\r
}\r
\r
public void PCAMenuItem_actionPerformed(ActionEvent e)\r
{\r
+ //are the sequences aligned?\r
+ if (!viewport.alignment.isAligned())\r
+ {\r
+ SequenceI current;\r
+ int Width = viewport.getAlignment().getWidth();\r
+\r
+ for (int i = 0; i < viewport.getAlignment().getSequences().size();\r
+ i++)\r
+ {\r
+ current = viewport.getAlignment().getSequenceAt(i);\r
+\r
+ if (current.getLength() < Width)\r
+ {\r
+ current.insertCharAt(Width - 1, viewport.getGapCharacter());\r
+ }\r
+ }\r
+ alignPanel.repaint();\r
+ }\r
\r
if ( (viewport.getSelectionGroup() != null &&\r
viewport.getSelectionGroup().getSize() < 4 &&\r
\r
try\r
{\r
- PCAPanel pcaPanel = new PCAPanel(viewport, null);\r
- Frame frame = new Frame();\r
- frame.add(pcaPanel);\r
- jalview.bin.JalviewLite.addFrame(frame, "Principal component analysis",\r
- 400, 400);\r
+ new PCAPanel(viewport);\r
}\r
catch (java.lang.OutOfMemoryError ex)\r
{\r
git://source.jalview.org / jalview.git / blobdiff