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:
aee942d
)
JInternalFrame is within class. Method to load default added
author
amwaterhouse
<Andrew Waterhouse>
Thu, 28 Apr 2005 15:29:54 +0000
(15:29 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Thu, 28 Apr 2005 15:29:54 +0000
(15:29 +0000)
src/jalview/gui/UserDefinedColours.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
25820c9
..
cd30543
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-22,13
+22,21
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
ColourSchemeI oldColourScheme;
\r
JInternalFrame frame;
\r
\r
ColourSchemeI oldColourScheme;
\r
JInternalFrame frame;
\r
\r
-
\r
- public UserDefinedColours(JInternalFrame f, AlignmentPanel ap, SequenceGroup sg)
\r
+ public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)
\r
{
\r
super();
\r
{
\r
super();
\r
+ frame = new JInternalFrame();
\r
+ frame.setContentPane(this);
\r
+ Desktop.addInternalFrame(frame, "User defined colours", 450,530, false );
\r
+ if(System.getProperty("os.name").startsWith("Mac"))
\r
+ frame.setSize(450,560);
\r
+
\r
+ if(sg!=null)
\r
+ frame.setTitle( frame.getTitle()+ " ("+sg.getName()+")");
\r
+
\r
colorChooser.getSelectionModel().addChangeListener(this);
\r
colorChooser.getSelectionModel().addChangeListener(this);
\r
+
\r
this.ap = ap;
\r
this.ap = ap;
\r
- frame = f;
\r
seqGroup = sg;
\r
\r
\r
seqGroup = sg;
\r
\r
\r
@@
-44,14
+52,12
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
makeButton("B", "B");
\r
makeButton("Z", "Z");
\r
makeButton("X", "X");
\r
makeButton("B", "B");
\r
makeButton("Z", "Z");
\r
makeButton("X", "X");
\r
- makeButton("'.','-',' '", "-");
\r
+ makeButton("Gap", "'.','-',' '");
\r
\r
if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
\r
{
\r
loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
\r
}
\r
\r
if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)
\r
{
\r
loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));
\r
}
\r
-
\r
-
\r
}
\r
\r
public void stateChanged(ChangeEvent evt)
\r
}
\r
\r
public void stateChanged(ChangeEvent evt)
\r
@@
-89,7
+95,7
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
}
\r
});
\r
\r
}
\r
});
\r
\r
- buttonPanel.add(button);
\r
+ buttonPanel.add(button, null);
\r
}
\r
\r
\r
}
\r
\r
\r
@@
-103,7
+109,7
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
\r
protected void applyButton_actionPerformed(ActionEvent e)
\r
{
\r
\r
protected void applyButton_actionPerformed(ActionEvent e)
\r
{
\r
- UserColourScheme ucs = new UserColourScheme();
\r
+
\r
Color [] newColours = new Color[24];
\r
for(int i=0; i<24; i++)
\r
{
\r
Color [] newColours = new Color[24];
\r
for(int i=0; i<24; i++)
\r
{
\r
@@
-111,6
+117,7
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
newColours[i] = button.getBackground();
\r
}
\r
\r
newColours[i] = button.getBackground();
\r
}
\r
\r
+ UserColourScheme ucs = new UserColourScheme();
\r
ucs.setThreshold(0);
\r
ucs.setColourScheme( newColours );
\r
\r
ucs.setThreshold(0);
\r
ucs.setColourScheme( newColours );
\r
\r
@@
-139,6
+146,29
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
\r
}
\r
\r
\r
}
\r
\r
+ public static UserColourScheme loadDefaultColours(String file)
\r
+ {
\r
+ UserColourScheme ucs = null;
\r
+ try
\r
+ {
\r
+ BufferedReader in = new BufferedReader(new FileReader(file));
\r
+ Color [] newColours = new Color[24];
\r
+ for (int i = 0; i < 24; i++)
\r
+ {
\r
+ newColours[i] = new Color(Integer.parseInt(in.readLine()));
\r
+ }
\r
+
\r
+ ucs = new UserColourScheme();
\r
+ ucs.setThreshold(0);
\r
+ ucs.setColourScheme(newColours);
\r
+
\r
+ }
\r
+ catch (Exception ex)
\r
+ {}
\r
+
\r
+ return ucs;
\r
+ }
\r
+
\r
void loadColour(String file)
\r
{
\r
try
\r
void loadColour(String file)
\r
{
\r
try
\r
@@
-150,6
+180,8
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
Color c = new Color(Integer.parseInt(in.readLine()));
\r
button.setBackground(c);
\r
}
\r
Color c = new Color(Integer.parseInt(in.readLine()));
\r
button.setBackground(c);
\r
}
\r
+
\r
+ jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", file);
\r
}
\r
catch (Exception ex)
\r
{}
\r
}
\r
catch (Exception ex)
\r
{}
\r
@@
-202,6
+234,9
@@
public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
\r
ap.repaint();
\r
\r
\r
ap.repaint();
\r
\r
+ try{
\r
+ frame.setClosed(true);
\r
+ }catch(Exception ex){}
\r
}
\r
\r
\r
}
\r
\r
\r