import java.util.*;\r
import java.io.InputStreamReader;\r
import java.io.BufferedReader;\r
+import java.io.FileReader;\r
\r
public class AlignFrame\r
extends GAlignFrame\r
{\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
{\r
try\r
{\r
- treeFile = treeFile;\r
jalview.io.NewickFile fin = new jalview.io.NewickFile(applet.\r
getCodeBase() + treeFile, "URL");\r
fin.parse();\r
else if (param.equalsIgnoreCase("Pairwise Identity"))\r
sortPairwiseMenuItem_actionPerformed(null);\r
}\r
+\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
+\r
+ /**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @param String DOCUMENT ME!\r
+ */\r
+\r
+ public void parseGroupsFile(String file)\r
+ {\r
+ try\r
+ {\r
+ BufferedReader in = new BufferedReader(new FileReader(file));\r
+ SequenceI seq = null;\r
+ String line, text, token;\r
+ UserColourScheme ucs;\r
+ int index, start, end;\r
+ StringTokenizer st;\r
+ SequenceGroup sg;\r
+ int lineNo = 0;\r
+ while ( (line = in.readLine()) != null)\r
+ {\r
+ lineNo++;\r
+ st = new StringTokenizer(line, "\t");\r
+ if (st.countTokens() != 6)\r
+ {\r
+ System.out.println("Groups file " + file +\r
+ " is invalid. Read help file.\nLine: \n"\r
+ +lineNo +": "+line);\r
+ break;\r
+ }\r
+\r
+ while (st.hasMoreElements())\r
+ {\r
+ text = st.nextToken();\r
+ token = st.nextToken();\r
+ if (!token.equals("ID_NOT_SPECIFIED"))\r
+ {\r
+ index = viewport.alignment.findIndex(viewport.alignment.findName(\r
+ token));\r
+ st.nextToken();\r
+ }\r
+ else\r
+ {\r
+ index = Integer.parseInt(st.nextToken());\r
+ }\r
+\r
+ start = Integer.parseInt(st.nextToken());\r
+ end = Integer.parseInt(st.nextToken());\r
+ ucs = new UserColourScheme(st.nextToken());\r
+\r
+ seq = viewport.alignment.getSequenceAt(index);\r
+ start = seq.findIndex(start) - 1;\r
+ end = seq.findIndex(end) - 1;\r
+\r
+ sg = new SequenceGroup(text, ucs, true, true, false, start, end);\r
+ sg.addSequence(seq, false);\r
+\r
+ viewport.alignment.addGroup(sg);\r
+\r
+ }\r
+ }\r
+\r
+ alignPanel.repaint();\r
+\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ System.out.println("Error parsing groups file: " + ex);\r
+ }\r
+ }\r
+\r
+\r
public void inputText_actionPerformed(ActionEvent e)\r
{\r
CutAndPasteTransfer cap = new CutAndPasteTransfer(true, applet);\r
jalview.bin.JalviewLite.addFrame(frame,\r
"Alignment output - " + e.getActionCommand(),\r
600, 500);\r
- cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),\r
+ cap.setText(new AppletFormatAdapter().formatSequences(e.getActionCommand(),\r
viewport.getAlignment().\r
getSequences()));\r
}\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
public void findMenuItem_actionPerformed(ActionEvent e)\r
{\r
- Finder finder = new Finder(alignPanel);\r
+ new Finder(alignPanel);\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 userDefinedColour_actionPerformed(ActionEvent e)\r
{\r
- UserDefinedColours chooser = new UserDefinedColours(alignPanel, null);\r
+ new UserDefinedColours(alignPanel, null);\r
}\r
\r
public void PIDColour_actionPerformed(ActionEvent e)\r
\r
try\r
{\r
- PCAPanel pcaPanel = new PCAPanel(viewport);\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