import java.awt.event.ActionListener;
import java.awt.image.BufferedImage;
import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List;
import javax.swing.ButtonGroup;
import javax.swing.JMenuItem;
import javax.swing.JRadioButtonMenuItem;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
import org.jibble.epsgraphics.EpsGraphics2D;
SimilarityParamsI similarityParams;
- TreeCanvas treeCanvas;
+ private TreeCanvas treeCanvas;
TreeModel tree;
- AlignViewport av;
+ private AlignViewport av;
/**
* Creates a new TreePanel object.
public AlignmentI getAlignment()
{
- return treeCanvas.av.getAlignment();
+ return getTreeCanvas().getViewport().getAlignment();
}
public AlignmentViewport getViewPort()
{
- return treeCanvas.av;
+ return getTreeCanvas().getViewport();
}
void initTreePanel(AlignmentPanel ap, String type, String modelName,
NewickFile newTree, AlignmentView inputData)
{
- av = ap.av;
+ setViewport(ap.av);
this.treeType = type;
this.scoreModelName = modelName;
treeCanvas = new TreeCanvas(this, ap, scrollPane);
- scrollPane.setViewportView(treeCanvas);
+ scrollPane.setViewportView(getTreeCanvas());
PaintRefresher.Register(this, ap.av.getSequenceSetId());
buildAssociatedViewMenu();
- av.addPropertyChangeListener(new java.beans.PropertyChangeListener()
+ final PropertyChangeListener listener = addAlignmentListener();
+
+ /*
+ * remove listener when window is closed, so that this
+ * panel can be garbage collected
+ */
+ addInternalFrameListener(new InternalFrameAdapter()
+ {
+ @Override
+ public void internalFrameClosed(InternalFrameEvent evt)
+ {
+ if (getViewport() != null)
+ {
+ getViewport().removePropertyChangeListener(listener);
+ }
+ }
+ });
+
+ TreeLoader tl = new TreeLoader(newTree, inputData);
+ tl.start();
+
+ }
+
+ /**
+ * @return
+ */
+ protected PropertyChangeListener addAlignmentListener()
+ {
+ final PropertyChangeListener listener = new PropertyChangeListener()
{
@Override
public void propertyChange(PropertyChangeEvent evt)
}
if (evt.getNewValue() == null)
{
- System.out
- .println("new alignment sequences vector value is null");
+ System.out.println(
+ "new alignment sequences vector value is null");
}
tree.updatePlaceHolders((List<SequenceI>) evt.getNewValue());
- treeCanvas.nameHash.clear(); // reset the mapping between canvas
+ getTreeCanvas().nameHash.clear(); // reset the mapping between canvas
// rectangles and leafnodes
repaint();
}
}
- });
-
- TreeLoader tl = new TreeLoader(newTree, inputData);
- tl.start();
-
+ };
+ getViewport().addPropertyChangeListener(listener);
+ return listener;
}
@Override
void buildAssociatedViewMenu()
{
- AlignmentPanel[] aps = PaintRefresher.getAssociatedPanels(av
- .getSequenceSetId());
- if (aps.length == 1 && treeCanvas.ap == aps[0])
+ AlignmentPanel[] aps = PaintRefresher
+ .getAssociatedPanels(getViewport().getSequenceSetId());
+ if (aps.length == 1 && getTreeCanvas().getAssociatedPanel() == aps[0])
{
associateLeavesMenu.setVisible(false);
return;
associateLeavesMenu.setVisible(true);
- if ((viewMenu.getItem(viewMenu.getItemCount() - 2) instanceof JMenuItem))
+ if ((viewMenu
+ .getItem(viewMenu.getItemCount() - 2) instanceof JMenuItem))
{
viewMenu.insertSeparator(viewMenu.getItemCount() - 1);
}
for (i = 0; i < iSize; i++)
{
final AlignmentPanel ap = aps[i];
- item = new JRadioButtonMenuItem(ap.av.viewName, ap == treeCanvas.ap);
+ item = new JRadioButtonMenuItem(ap.av.getViewName(), ap == getTreeCanvas().getAssociatedPanel());
buttonGroup.add(item);
item.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent evt)
{
- treeCanvas.applyToAllViews = false;
- treeCanvas.ap = ap;
- treeCanvas.av = ap.av;
+ getTreeCanvas().applyToAllViews = false;
+ getTreeCanvas().setAssociatedPanel(ap);
+ getTreeCanvas().setViewport(ap.av);
PaintRefresher.Register(thisTreePanel, ap.av.getSequenceSetId());
}
});
final JRadioButtonMenuItem itemf = new JRadioButtonMenuItem(
MessageManager.getString("label.all_views"));
buttonGroup.add(itemf);
- itemf.setSelected(treeCanvas.applyToAllViews);
+ itemf.setSelected(getTreeCanvas().applyToAllViews);
itemf.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent evt)
{
- treeCanvas.applyToAllViews = itemf.isSelected();
+ getTreeCanvas().applyToAllViews = itemf.isSelected();
}
});
associateLeavesMenu.add(itemf);
if (newtree != null)
{
- tree = new TreeModel(av.getAlignment().getSequencesArray(), odata,
+ tree = new TreeModel(getViewport().getAlignment().getSequencesArray(), odata,
newtree);
if (tree.getOriginalData() == null)
{
}
else
{
- ScoreModelI sm = ScoreModels.getInstance().getScoreModel(
- scoreModelName, treeCanvas.ap);
- TreeBuilder njtree = treeType.equals(TreeBuilder.NEIGHBOUR_JOINING) ? new NJTree(
- av, sm, similarityParams) : new AverageDistanceTree(av, sm,
- similarityParams);
+ ScoreModelI sm = ScoreModels.getInstance()
+ .getScoreModel(scoreModelName, getTreeCanvas().getAssociatedPanel());
+ TreeBuilder njtree = treeType.equals(TreeBuilder.NEIGHBOUR_JOINING)
+ ? new NJTree(getViewport(), sm, similarityParams)
+ : new AverageDistanceTree(getViewport(), sm, similarityParams);
tree = new TreeModel(njtree);
showDistances(true);
}
tree.reCount(tree.getTopNode());
tree.findHeight(tree.getTopNode());
- treeCanvas.setTree(tree);
- treeCanvas.repaint();
- av.setCurrentTree(tree);
- if (av.getSortByTree())
+ getTreeCanvas().setTree(tree);
+ getTreeCanvas().repaint();
+ getViewport().setCurrentTree(tree);
+ if (getViewport().getSortByTree())
{
sortByTree_actionPerformed();
}
public void showDistances(boolean b)
{
- treeCanvas.setShowDistances(b);
+ getTreeCanvas().setShowDistances(b);
distanceMenu.setSelected(b);
}
public void showBootstrap(boolean b)
{
- treeCanvas.setShowBootstrap(b);
+ getTreeCanvas().setShowBootstrap(b);
bootstrapMenu.setSelected(b);
}
public void showPlaceholders(boolean b)
{
placeholdersMenu.setState(b);
- treeCanvas.setMarkPlaceholders(b);
+ getTreeCanvas().setMarkPlaceholders(b);
}
/**
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle(MessageManager
- .getString("label.save_tree_as_newick"));
+ chooser.setDialogTitle(
+ MessageManager.getString("label.save_tree_as_newick"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(null);
if (value == JalviewFileChooser.APPROVE_OPTION)
{
String choice = chooser.getSelectedFile().getPath();
- jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
- .getSelectedFile().getParent());
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+ chooser.getSelectedFile().getParent());
try
{
jalview.io.NewickFile fout = new jalview.io.NewickFile(
tree.getTopNode());
- String output = fout.print(tree.hasBootstrap(),
- tree.hasDistances(), tree.hasRootDistance());
+ String output = fout.print(tree.hasBootstrap(), tree.hasDistances(),
+ tree.hasRootDistance());
java.io.PrintWriter out = new java.io.PrintWriter(
new java.io.FileWriter(choice));
out.println(output);
public void printMenu_actionPerformed(ActionEvent e)
{
// Putting in a thread avoids Swing painting problems
- treeCanvas.startPrinting();
+ getTreeCanvas().startPrinting();
}
@Override
AlignmentView originalData = tree.getOriginalData();
if (originalData == null)
{
- jalview.bin.Cache.log
- .info("Unexpected call to originalSeqData_actionPerformed - should have hidden this menu action.");
+ jalview.bin.Cache.log.info(
+ "Unexpected call to originalSeqData_actionPerformed - should have hidden this menu action.");
return;
}
// decide if av alignment is sufficiently different to original data to
{
// we try to get the associated view's gap character
// but this may fail if the view was closed...
- gc = av.getGapCharacter();
+ gc = getViewport().getGapCharacter();
} catch (Exception ex)
{
// AlignmentOrder origorder = new AlignmentOrder(alAndColsel[0]);
AlignmentI al = new Alignment((SequenceI[]) alAndColsel[0]);
- AlignmentI dataset = (av != null && av.getAlignment() != null) ? av
- .getAlignment().getDataset() : null;
+ AlignmentI dataset = (getViewport() != null && getViewport().getAlignment() != null)
+ ? getViewport().getAlignment().getDataset()
+ : null;
if (dataset != null)
{
al.setDataset(dataset);
{
// make a new frame!
AlignFrame af = new AlignFrame(al, (HiddenColumns) alAndColsel[1],
- AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT);
+ AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
// >>>This is a fix for the moment, until a better solution is
// found!!<<<
// msaorder);
Desktop.addInternalFrame(af, MessageManager.formatMessage(
- "label.original_data_for_params",
- new Object[] { this.title }), AlignFrame.DEFAULT_WIDTH,
+ "label.original_data_for_params", new Object[]
+ { this.title }), AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
}
}
@Override
public void fitToWindow_actionPerformed(ActionEvent e)
{
- treeCanvas.fitToWindow = fitToWindow.isSelected();
+ getTreeCanvas().fitToWindow = fitToWindow.isSelected();
repaint();
}
public void sortByTree_actionPerformed()
{
- if (treeCanvas.applyToAllViews)
+ if (getTreeCanvas().applyToAllViews)
{
- final ArrayList<CommandI> commands = new ArrayList<CommandI>();
- for (AlignmentPanel ap : PaintRefresher.getAssociatedPanels(av
- .getSequenceSetId()))
+ final ArrayList<CommandI> commands = new ArrayList<>();
+ for (AlignmentPanel ap : PaintRefresher
+ .getAssociatedPanels(getViewport().getSequenceSetId()))
{
commands.add(sortAlignmentIn(ap.av.getAlignPanel()));
}
- av.getAlignPanel().alignFrame.addHistoryItem(new CommandI()
+ getViewport().getAlignPanel().alignFrame.addHistoryItem(new CommandI()
{
@Override
}
}
});
- for (AlignmentPanel ap : PaintRefresher.getAssociatedPanels(av
- .getSequenceSetId()))
+ for (AlignmentPanel ap : PaintRefresher
+ .getAssociatedPanels(getViewport().getSequenceSetId()))
{
// ensure all the alignFrames refresh their GI after adding an undo item
ap.alignFrame.updateEditMenuBar();
}
else
{
- treeCanvas.ap.alignFrame
- .addHistoryItem(sortAlignmentIn(treeCanvas.ap));
+ getTreeCanvas().getAssociatedPanel().alignFrame
+ .addHistoryItem(sortAlignmentIn(getTreeCanvas().getAssociatedPanel()));
}
}
public CommandI sortAlignmentIn(AlignmentPanel ap)
{
+ // TODO: move to alignment view controller
AlignmentViewport viewport = ap.av;
SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
AlignmentSorter.sortByTree(viewport.getAlignment(), tree);
CommandI undo;
undo = new OrderCommand("Tree Sort", oldOrder, viewport.getAlignment());
- ap.paintAlignment(true);
+ ap.paintAlignment(true, false);
return undo;
}
@Override
public void font_actionPerformed(ActionEvent e)
{
- if (treeCanvas == null)
+ if (getTreeCanvas() == null)
{
return;
}
public Font getTreeFont()
{
- return treeCanvas.font;
+ return getTreeCanvas().font;
}
public void setTreeFont(Font f)
{
- if (treeCanvas != null)
+ if (getTreeCanvas() != null)
{
- treeCanvas.setFont(f);
+ getTreeCanvas().setFont(f);
}
}
@Override
public void distanceMenu_actionPerformed(ActionEvent e)
{
- treeCanvas.setShowDistances(distanceMenu.isSelected());
+ getTreeCanvas().setShowDistances(distanceMenu.isSelected());
}
/**
@Override
public void bootstrapMenu_actionPerformed(ActionEvent e)
{
- treeCanvas.setShowBootstrap(bootstrapMenu.isSelected());
+ getTreeCanvas().setShowBootstrap(bootstrapMenu.isSelected());
}
/**
@Override
public void placeholdersMenu_actionPerformed(ActionEvent e)
{
- treeCanvas.setMarkPlaceholders(placeholdersMenu.isSelected());
+ getTreeCanvas().setMarkPlaceholders(placeholdersMenu.isSelected());
}
/**
accurateText = false;
}
- int width = treeCanvas.getWidth();
- int height = treeCanvas.getHeight();
+ int width = getTreeCanvas().getWidth();
+ int height = getTreeCanvas().getHeight();
try
{
JalviewFileChooser chooser = new JalviewFileChooser(
ImageMaker.EPS_EXTENSION, ImageMaker.EPS_EXTENSION);
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle(MessageManager
- .getString("label.create_eps_from_tree"));
+ chooser.setDialogTitle(
+ MessageManager.getString("label.create_eps_from_tree"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
return;
}
- Cache.setProperty("LAST_DIRECTORY", chooser.getSelectedFile()
- .getParent());
+ Cache.setProperty("LAST_DIRECTORY",
+ chooser.getSelectedFile().getParent());
- FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
- EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width, height);
+ FileOutputStream out = new FileOutputStream(
+ chooser.getSelectedFile());
+ EpsGraphics2D pg = new EpsGraphics2D("Tree", out, 0, 0, width,
+ height);
pg.setAccurateTextMode(accurateText);
- treeCanvas.draw(pg, width, height);
+ getTreeCanvas().draw(pg, width, height);
pg.flush();
pg.close();
@Override
public void pngTree_actionPerformed(ActionEvent e)
{
- int width = treeCanvas.getWidth();
- int height = treeCanvas.getHeight();
+ int width = getTreeCanvas().getWidth();
+ int height = getTreeCanvas().getHeight();
try
{
ImageMaker.PNG_EXTENSION, ImageMaker.PNG_DESCRIPTION);
chooser.setFileView(new jalview.io.JalviewFileView());
- chooser.setDialogTitle(MessageManager
- .getString("label.create_png_from_tree"));
+ chooser.setDialogTitle(
+ MessageManager.getString("label.create_png_from_tree"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
return;
}
- jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
- .getSelectedFile().getParent());
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+ chooser.getSelectedFile().getParent());
- FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
+ FileOutputStream out = new FileOutputStream(
+ chooser.getSelectedFile());
BufferedImage bi = new BufferedImage(width, height,
BufferedImage.TYPE_INT_RGB);
Graphics png = bi.getGraphics();
- treeCanvas.draw(png, width, height);
+ getTreeCanvas().draw(png, width, height);
ImageIO.write(bi, "png", out);
out.close();
if (sq != null)
{
// search dbrefs, features and annotation
- DBRefEntry[] refs = jalview.util.DBRefUtils.selectRefs(
- sq.getDBRefs(),
- new String[] { labelClass.toUpperCase() });
+ DBRefEntry[] refs = jalview.util.DBRefUtils
+ .selectRefs(sq.getDBRefs(), new String[]
+ { labelClass.toUpperCase() });
if (refs != null)
{
for (int i = 0; i < refs.length; i++)
* Neighbour Joining Using BLOSUM62
* <p>
* For a tree loaded from file, just uses the file name
+ *
* @return
*/
public String getPanelTitle()
/*
* i18n description of Neighbour Joining or Average Distance method
*/
- String treecalcnm = MessageManager.getString("label.tree_calc_"
- + treeType.toLowerCase());
+ String treecalcnm = MessageManager
+ .getString("label.tree_calc_" + treeType.toLowerCase());
/*
* short score model name (long description can be too long)
treecalcnm, smn);
return ttl;
}
+
+ public AlignViewport getViewport()
+ {
+ return av;
+ }
+
+ public void setViewport(AlignViewport av)
+ {
+ this.av = av;
+ }
+
+ public TreeCanvas getTreeCanvas()
+ {
+ return treeCanvas;
+ }
}
git://source.jalview.org / jalview.git / blobdiff