/*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)\r
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
* \r
* This file is part of Jalview.\r
* \r
}\r
\r
/**\r
- * DOCUMENT ME!\r
+ * Load a features file onto the alignment\r
* \r
- * @param String\r
- * DOCUMENT ME!\r
+ * @param file file URL, content, or other resolvable path\r
+ * @param type is protocol for accessing data referred to by file\r
*/\r
\r
public void parseFeaturesFile(String file, String type)\r
{\r
+ parseFeaturesFile(file, type, true);\r
+ }\r
+ \r
+ /**\r
+ * Load a features file onto the alignment\r
+ * \r
+ * @param file file URL, content, or other resolvable path\r
+ * @param type is protocol for accessing data referred to by file\r
+ * @param autoenabledisplay when true, display features flag will be automatically enabled if features are loaded\r
+ */\r
+ public void parseFeaturesFile(String file, String type, boolean autoenabledisplay)\r
+ { \r
Hashtable featureLinks = new Hashtable();\r
boolean featuresFile = false;\r
try\r
{\r
alignPanel.seqPanel.seqCanvas.getFeatureRenderer().featureLinks = featureLinks;\r
}\r
- viewport.showSequenceFeatures = true;\r
- sequenceFeatures.setState(true);\r
+ if (autoenabledisplay)\r
+ {\r
+ viewport.showSequenceFeatures = true;\r
+ sequenceFeatures.setState(true);\r
+ }\r
if (viewport.featureSettings != null)\r
{\r
viewport.featureSettings.refreshTable();\r
{\r
viewport.autocalculateConsensus = autoCalculate.getState();\r
}\r
+ else if (evt.getSource() == sortByTree)\r
+ {\r
+ viewport.sortByTree = sortByTree.getState();\r
+ }\r
else if (evt.getSource() == this.centreColumnLabelFlag)\r
{\r
centreColumnLabelFlag_stateChanged();\r
sortByTree(treePanel, title); // treePanel.getTitle());\r
}\r
});\r
-\r
+ \r
treePanel.addWindowListener(new WindowAdapter()\r
{\r
public void windowOpened(WindowEvent e)\r
alignPanel.paintAlignment(true);\r
return true;\r
}\r
+\r
protected void documentation_actionPerformed()\r
{\r
alignPanel.av.applet.openJalviewHelpUrl();\r
CheckboxMenuItem autoCalculate = new CheckboxMenuItem(\r
"Autocalculate Consensus", true);\r
\r
+ CheckboxMenuItem sortByTree = new CheckboxMenuItem(\r
+ "Sort Alignment With New Tree", true);\r
+\r
Menu sortByTreeMenu = new Menu();\r
\r
Menu sort = new Menu();\r
sort.setLabel("Sort");\r
calculate.setLabel("Calculate Tree");\r
autoCalculate.addItemListener(this);\r
+ sortByTree.addItemListener(this);\r
inputText.setLabel("Input from textbox");\r
inputText.addActionListener(this);\r
centreColumnLabelFlag.setLabel("Centre column labels");\r
calculateMenu.add(pairwiseAlignmentMenuItem);\r
calculateMenu.add(PCAMenuItem);\r
calculateMenu.add(autoCalculate);\r
+ calculateMenu.add(sortByTree);\r
this.add(statusBar, BorderLayout.SOUTH);\r
pasteMenu.add(pasteNew);\r
pasteMenu.add(pasteThis);\r