git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ddf5e62
)
Jmol calls user colours
author
amwaterhouse
<Andrew Waterhouse>
Mon, 26 Mar 2007 17:29:37 +0000
(17:29 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Mon, 26 Mar 2007 17:29:37 +0000
(17:29 +0000)
src/jalview/appletgui/UserDefinedColours.java
patch
|
blob
|
history
diff --git
a/src/jalview/appletgui/UserDefinedColours.java
b/src/jalview/appletgui/UserDefinedColours.java
index
de1cff7
..
ecb3265
100755
(executable)
--- a/
src/jalview/appletgui/UserDefinedColours.java
+++ b/
src/jalview/appletgui/UserDefinedColours.java
@@
-38,8
+38,9
@@
public class UserDefinedColours
ColourSchemeI oldColourScheme;
\r
Frame frame;
\r
MCview.AppletPDBCanvas pdbcanvas;
\r
ColourSchemeI oldColourScheme;
\r
Frame frame;
\r
MCview.AppletPDBCanvas pdbcanvas;
\r
+ AppletJmol jmol;
\r
\r
\r
- Component caller;
\r
+ Object caller;
\r
String originalLabel;
\r
Color originalColour;
\r
\r
String originalLabel;
\r
Color originalColour;
\r
\r
@@
-74,7
+75,13
@@
public class UserDefinedColours
init();
\r
}
\r
\r
init();
\r
}
\r
\r
- public UserDefinedColours(Component caller,
\r
+ public UserDefinedColours(AppletJmol jmol)
\r
+ {
\r
+ this.jmol = jmol;
\r
+ init();
\r
+ }
\r
+
\r
+ public UserDefinedColours(Object caller,
\r
String label,
\r
Color colour)
\r
{
\r
String label,
\r
Color colour)
\r
{
\r
@@
-345,6
+352,10
@@
public class UserDefinedColours
ap.seqPanel.seqCanvas.img = null;
\r
ap.paintAlignment(true);
\r
}
\r
ap.seqPanel.seqCanvas.img = null;
\r
ap.paintAlignment(true);
\r
}
\r
+ else if(jmol!=null)
\r
+ {
\r
+ jmol.setJalviewColourScheme(ucs);
\r
+ }
\r
else if (pdbcanvas != null)
\r
{
\r
pdbcanvas.setColours(ucs);
\r
else if (pdbcanvas != null)
\r
{
\r
pdbcanvas.setColours(ucs);
\r
@@
-398,6
+409,10
@@
public class UserDefinedColours
}
\r
ap.paintAlignment(true);
\r
}
\r
}
\r
ap.paintAlignment(true);
\r
}
\r
+ else if(jmol !=null)
\r
+ {
\r
+ jmol.setJalviewColourScheme(ucs);
\r
+ }
\r
else if (pdbcanvas != null)
\r
{
\r
pdbcanvas.pdb.setColours(ucs);
\r
else if (pdbcanvas != null)
\r
{
\r
pdbcanvas.pdb.setColours(ucs);
\r