}\r
}\r
\r
+\r
+ public TreePanel ShowNewickTree(NewickFile nf, String title)\r
+ {\r
+ return ShowNewickTree(nf,title,600,500,4,5);\r
+ }\r
/**\r
* DOCUMENT ME!\r
*\r
*\r
* @return DOCUMENT ME!\r
*/\r
- public TreePanel ShowNewickTree(NewickFile nf, String title)\r
+ public TreePanel ShowNewickTree(NewickFile nf, String title, int w,int h,int x, int y)\r
{\r
TreePanel tp = null;\r
\r
viewport.getAlignment().getSequences(), nf,\r
"FromFile",\r
title);\r
- Desktop.addInternalFrame(tp, title, 600, 500);\r
+\r
+ tp.setSize(w,h);\r
+\r
+ if(x>0 && y>0)\r
+ tp.setLocation(x,y);\r
+\r
+\r
+ Desktop.addInternalFrame(tp, title, w, h);\r
addTreeMenuItem(tp, title);\r
}\r
}\r
SplashScreen splash = new SplashScreen(frame, image);
frame.setContentPane(splash);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
- addInternalFrame(frame, "", 750, 160, false);
frame.setLocation((int) ((getWidth() - 750) / 2),
(int) ((getHeight() - 160) / 2));
- discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+ addInternalFrame(frame, "", 750, 160, false);
+
+ discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
}
/**
{
frame.setTitle(title);
- if(w!=AlignFrame.NEW_WINDOW_WIDTH &&
- h!=AlignFrame.NEW_WINDOW_HEIGHT)
- frame.setSize(w, h);
-
+ if(frame.getWidth()<1 || frame.getHeight()<1)
+ {
+ frame.setSize(w, h);
+ }
// THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN
// A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
// IF JALVIEW IS RUNNING HEADLESS
frame.setMaximizable(resizable);
frame.setIconifiable(resizable);
frame.setFrameIcon(null);
- if (w != AlignFrame.NEW_WINDOW_WIDTH &&
- h != AlignFrame.NEW_WINDOW_HEIGHT)
- frame.setLocation(xOffset * openFrameCount, yOffset * openFrameCount);
- frame.toFront();
+ if (frame.getX()<1 && frame.getY()<1)
+ {
+ frame.setLocation(xOffset * openFrameCount, yOffset * (openFrameCount%10)+yOffset);
+ }
+
+ frame.toFront();
final JMenuItem menuItem = new JMenuItem(title);
frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
{
{\r
for (int t = 0; t < jms.getTreeCount(); t++)\r
{\r
+\r
Tree tree = jms.getTree(t);\r
\r
TreePanel tp = af.ShowNewickTree(new jalview.io.NewickFile(\r
- tree.getNewick()), tree.getTitle());\r
-\r
- tp.setBounds(tree.getXpos(), tree.getYpos(),\r
- tree.getWidth(), tree.getHeight());\r
+ tree.getNewick()), tree.getTitle(),\r
+ tree.getWidth(), tree.getHeight(),\r
+ tree.getXpos(), tree.getYpos());\r
\r
tp.fitToWindow.setState(tree.getFitToWindow());\r
tp.fitToWindow_actionPerformed(null);\r
}\r
\r
Desktop.addInternalFrame(af, view.getTitle(),\r
- AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
+ view.getWidth(), view.getHeight());\r
\r
return af;\r
}\r