initTreePanel(av, type, pwtype, null);\r
\r
// We know this tree has distances. JBPNote TODO: prolly should add this as a userdefined default\r
- showDistances(true);\r
+ // showDistances(true);\r
}\r
\r
/**\r
class TreeLoader extends Thread\r
{\r
NewickFile newtree;\r
-\r
+ jalview.datamodel.CigarArray odata=null;\r
public TreeLoader(NewickFile newtree)\r
{\r
this.newtree = newtree;\r
public void run()\r
{\r
\r
- if(newtree!=null)\r
- tree = new NJTree(av.alignment.getSequencesArray(),\r
- newtree);\r
+ if(newtree!=null) {\r
+\r
+ if (odata==null) {\r
+ tree = new NJTree(av.alignment.getSequencesArray(),\r
+ newtree);\r
+ } else {\r
+ tree = new NJTree(av.alignment.getSequencesArray(), odata, newtree);\r
+ }\r
+ if (!tree.hasOriginalSequenceData())\r
+ allowOriginalSeqData(false);\r
+ }\r
else\r
{\r
int start, end;\r
SequenceI [] seqs;\r
- String [] seqStrings = null;\r
- if (av.hasHiddenColumns)\r
- {\r
- seqStrings = av.getViewAsString(true);\r
- }\r
-\r
+ CigarArray seqStrings = av.getViewAsCigars(av.getSelectionGroup()!=null);\r
if(av.getSelectionGroup()==null)\r
{\r
start = 0;\r
}\r
\r
tree = new NJTree(seqs, seqStrings, type, pwtype, start, end);\r
+ showDistances(true);\r
}\r
\r
\r
tree.reCount(tree.getTopNode());\r
tree.findHeight(tree.getTopNode());\r
treeCanvas.setTree(tree);\r
-\r
treeCanvas.repaint();\r
-\r
av.setCurrentTree(tree);\r
\r
}\r
placeholdersMenu.setState(b);\r
treeCanvas.setMarkPlaceholders(b);\r
}\r
-\r
+ private void allowOriginalSeqData(boolean b) {\r
+ originalSeqData.setVisible(b);\r
+ }\r
\r
\r
\r
\r
public void originalSeqData_actionPerformed(ActionEvent e)\r
{\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
- cap.setText(tree.printOriginalSequenceData());\r
- Desktop.addInternalFrame(cap, "Original Data",\r
- 400, 400);\r
+ String originalData = tree.printOriginalSequenceData();\r
+ if (originalData!=null) {\r
+ CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
+ cap.setText(originalData);\r
+ Desktop.addInternalFrame(cap, "Original Data",\r
+ 400, 400);\r
+ } else {\r
+ System.err.println("IMPLEMENTATION BUG! originalSeqData is not available.");\r
+ }\r
+\r
}\r
\r
\r