git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4307 View->Ligands submenu, implementation for Jmol and documentation
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
1fccdcb
..
fceb50c
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-20,10
+20,6
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
-import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.gui.ColourMenuHelper.ColourChangeListener;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
@@
-37,6
+33,12
@@
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
+import jalview.api.structures.JalviewStructureDisplayI;
+import jalview.gui.ColourMenuHelper.ColourChangeListener;
+import jalview.util.ImageMaker.TYPE;
+import jalview.util.MessageManager;
+
+@SuppressWarnings("serial")
public abstract class GStructureViewer extends JInternalFrame
implements JalviewStructureDisplayI, ColourChangeListener
{
public abstract class GStructureViewer extends JInternalFrame
implements JalviewStructureDisplayI, ColourChangeListener
{
@@
-50,6
+52,8
@@
public abstract class GStructureViewer extends JInternalFrame
protected JMenu chainMenu;
protected JMenu chainMenu;
+ protected JMenu hetatmMenu;
+
protected JMenu viewerActionMenu;
protected JMenuItem alignStructs;
protected JMenu viewerActionMenu;
protected JMenuItem alignStructs;
@@
-86,6
+90,9
@@
public abstract class GStructureViewer extends JInternalFrame
private void jbInit() throws Exception
{
private void jbInit() throws Exception
{
+ setFrameIcon(null);
+ setName("jalview-structureviewer");
+
JMenuBar menuBar = new JMenuBar();
this.setJMenuBar(menuBar);
JMenuBar menuBar = new JMenuBar();
this.setJMenuBar(menuBar);
@@
-115,7
+122,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- png_actionPerformed();
+ makePDBImage(TYPE.PNG);
}
});
}
});
@@
-126,7
+133,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- eps_actionPerformed();
+ makePDBImage(TYPE.EPS);
}
});
}
});
@@
-147,6
+154,9
@@
public abstract class GStructureViewer extends JInternalFrame
chainMenu = new JMenu();
chainMenu.setText(MessageManager.getString("action.show_chain"));
chainMenu = new JMenu();
chainMenu.setText(MessageManager.getString("action.show_chain"));
+ hetatmMenu = new JMenu();
+ hetatmMenu.setText(MessageManager.getString("action.show_hetatm"));
+
fitToWindow = new JMenuItem();
fitToWindow.setText(MessageManager.getString("label.fit_to_window"));
fitToWindow.addActionListener(new ActionListener()
fitToWindow = new JMenuItem();
fitToWindow.setText(MessageManager.getString("label.fit_to_window"));
fitToWindow.addActionListener(new ActionListener()
@@
-161,7
+171,6
@@
public abstract class GStructureViewer extends JInternalFrame
JMenu helpMenu = new JMenu();
helpMenu.setText(MessageManager.getString("action.help"));
helpItem = new JMenuItem();
JMenu helpMenu = new JMenu();
helpMenu.setText(MessageManager.getString("action.help"));
helpItem = new JMenuItem();
- helpItem.setText(MessageManager.getString("label.jmol_help"));
helpItem.addActionListener(new ActionListener()
{
@Override
helpItem.addActionListener(new ActionListener()
{
@Override
@@
-193,6
+202,7
@@
public abstract class GStructureViewer extends JInternalFrame
savemenu.add(png);
savemenu.add(eps);
viewMenu.add(chainMenu);
savemenu.add(png);
savemenu.add(eps);
viewMenu.add(chainMenu);
+ viewMenu.add(hetatmMenu);
helpMenu.add(helpItem);
menuBar.add(fileMenu);
helpMenu.add(helpItem);
menuBar.add(fileMenu);
@@
-210,6
+220,7
@@
public abstract class GStructureViewer extends JInternalFrame
protected void fitToWindow_actionPerformed()
{
protected void fitToWindow_actionPerformed()
{
+ getBinding().focusView();
}
protected void highlightSelection_actionPerformed()
}
protected void highlightSelection_actionPerformed()
@@
-227,12
+238,7
@@
public abstract class GStructureViewer extends JInternalFrame
}
}
- public void png_actionPerformed()
- {
-
- }
-
- public void eps_actionPerformed()
+ public void makePDBImage(TYPE imageType)
{
}
{
}