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:
c5db2e1
)
Allow userdefined colours for groups
author
amwaterhouse
<Andrew Waterhouse>
Tue, 14 Dec 2004 14:51:11 +0000
(14:51 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Tue, 14 Dec 2004 14:51:11 +0000
(14:51 +0000)
src/jalview/gui/PopupMenu.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/PopupMenu.java
b/src/jalview/gui/PopupMenu.java
index
4928189
..
458a6be
100755
(executable)
--- a/
src/jalview/gui/PopupMenu.java
+++ b/
src/jalview/gui/PopupMenu.java
@@
-364,6
+364,13
@@
frame.setMaximizable(false);
\r
protected void userDefinedColour_actionPerformed(ActionEvent e)
\r
{
\r
\r
protected void userDefinedColour_actionPerformed(ActionEvent e)
\r
{
\r
+ JInternalFrame frame = new JInternalFrame();
\r
+ UserDefinedColours chooser = new UserDefinedColours( frame, seqPanel.parent, getGroup());
\r
+ frame.setContentPane(chooser);
\r
+ Desktop.addInternalFrame(frame,"User defined colours", 450,540 );
\r
+ frame.setResizable(false);
\r
+ frame.setIconifiable(false);
\r
+ frame.setMaximizable(false);
\r
\r
}
\r
\r
\r
}
\r
\r
@@
-389,8
+396,7
@@
frame.setMaximizable(false);
{
\r
SequenceGroup sg = getGroup();
\r
\r
{
\r
SequenceGroup sg = getGroup();
\r
\r
- Alignment al = (Alignment)av.getAlignment();
\r
- Conservation c = new Conservation("Group", al.cons,
\r
+ Conservation c = new Conservation("Group",
\r
ResidueProperties.propHash, 3, sg.sequences, sg.getStartRes(),
\r
sg.getEndRes() );
\r
\r
ResidueProperties.propHash, 3, sg.sequences, sg.getStartRes(),
\r
sg.getEndRes() );
\r
\r