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-889) ensure annotation row is revalidated after an edit occurs
[jalview.git]
/
src
/
jalview
/
appletgui
/
AppletJmol.java
diff --git
a/src/jalview/appletgui/AppletJmol.java
b/src/jalview/appletgui/AppletJmol.java
index
7bf21a8
..
afaedb8
100644
(file)
--- a/
src/jalview/appletgui/AppletJmol.java
+++ b/
src/jalview/appletgui/AppletJmol.java
@@
-1,6
+1,6
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-71,6
+71,8
@@
public class AppletJmol extends EmbmenuFrame implements
MenuItem turn = new MenuItem("Turn Propensity");
MenuItem buried = new MenuItem("Buried Index");
MenuItem turn = new MenuItem("Turn Propensity");
MenuItem buried = new MenuItem("Buried Index");
+
+ MenuItem purinepyrimidine = new MenuItem("Purine/Pyrimidine");
MenuItem user = new MenuItem("User Defined Colours");
MenuItem user = new MenuItem("User Defined Colours");
@@
-187,6
+189,7
@@
public class AppletJmol extends EmbmenuFrame implements
strand.addActionListener(this);
turn.addActionListener(this);
buried.addActionListener(this);
strand.addActionListener(this);
turn.addActionListener(this);
buried.addActionListener(this);
+ purinepyrimidine.addActionListener(this);
user.addActionListener(this);
jmolHelp.addActionListener(this);
user.addActionListener(this);
jmolHelp.addActionListener(this);
@@
-201,6
+204,7
@@
public class AppletJmol extends EmbmenuFrame implements
coloursMenu.add(strand);
coloursMenu.add(turn);
coloursMenu.add(buried);
coloursMenu.add(strand);
coloursMenu.add(turn);
coloursMenu.add(buried);
+ coloursMenu.add(purinepyrimidine);
coloursMenu.add(user);
coloursMenu.add(jmolColour);
helpMenu.add(jmolHelp);
coloursMenu.add(user);
coloursMenu.add(jmolColour);
helpMenu.add(jmolHelp);
@@
-444,6
+448,10
@@
public class AppletJmol extends EmbmenuFrame implements
setEnabled(buried);
jmb.setJalviewColourScheme(new BuriedColourScheme());
}
setEnabled(buried);
jmb.setJalviewColourScheme(new BuriedColourScheme());
}
+ else if(evt.getSource() == purinepyrimidine)
+ {
+ jmb.setJalviewColourScheme(new PurinePyrimidineColourScheme());
+ }
else if (evt.getSource() == user)
{
setEnabled(user);
else if (evt.getSource() == user)
{
setEnabled(user);