ColourSchemeI oldColourScheme;\r
JInternalFrame frame;\r
\r
+\r
public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)\r
{\r
super();\r
frame = new JInternalFrame();\r
frame.setContentPane(this);\r
- Desktop.addInternalFrame(frame, "User defined colours", 450,530, false );\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
\r
if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)\r
{\r
- loadColour(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));\r
+ loadColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));\r
}\r
}\r
\r
\r
protected void applyButton_actionPerformed(ActionEvent e)\r
{\r
-\r
Color [] newColours = new Color[24];\r
for(int i=0; i<24; i++)\r
{\r
newColours[i] = button.getBackground();\r
}\r
\r
- UserColourScheme ucs = new UserColourScheme();\r
+ UserColourScheme ucs = new UserColourScheme(newColours);\r
ucs.setThreshold(0);\r
- ucs.setColourScheme( newColours );\r
\r
if(seqGroup!=null)\r
+ {\r
seqGroup.cs = ucs;\r
+ ap.repaint();\r
+ }\r
else\r
- ap.av.setGlobalColourScheme(ucs);\r
+ ap.alignFrame.changeColour(ucs);\r
\r
- ap.repaint();\r
}\r
\r
protected void loadbutton_actionPerformed(ActionEvent e)\r
{\r
JalviewFileChooser chooser = new JalviewFileChooser(\r
jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
- new String[]{".jc"},\r
+ new String[]{"jc"},\r
new String[]{"Jalview User Colours"},\r
"Jalview User Colours");\r
chooser.setFileView(new jalview.io.JalviewFileView());\r
{\r
File choice = chooser.getSelectedFile();\r
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());\r
- loadColour(choice.getAbsolutePath());\r
+ jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice.getPath());\r
+ Color[] colors = loadColours(choice.getAbsolutePath());\r
+ for (int i = 0; i < colors.length; i++)\r
+ {\r
+ JButton button = (JButton) buttonPanel.getComponent(i);\r
+ button.setBackground(colors[i]);\r
+ }\r
+\r
}\r
+ }\r
\r
+ public static UserColourScheme loadDefaultColours()\r
+ {\r
+ if(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR")!=null)\r
+ return loadDefaultColours(jalview.bin.Cache.getProperty("USER_DEFINED_COLOUR"));\r
+ else\r
+ return null;\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
+ UserColourScheme ucs = null;\r
+ Color cols[] = loadColours(file);\r
+ if(cols!=null)\r
{\r
- newColours[i] = new Color(Integer.parseInt(in.readLine()));\r
+ ucs = new UserColourScheme(cols);\r
+ ucs.setThreshold(0);\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
+ return ucs;\r
}\r
\r
- void loadColour(String file)\r
+ static Color [] loadColours(String file)\r
{\r
+ Color [] newColours=null;\r
try\r
{\r
- BufferedReader in = new BufferedReader(new FileReader(file));\r
+ InputStreamReader in = new InputStreamReader(\r
+ new FileInputStream(file), "UTF-8");\r
+\r
+ jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours();\r
+ ucs = (jalview.binding.JalviewUserColours)ucs.unmarshal(in);\r
+\r
+ newColours = new Color[ucs.getColourCount()];\r
for (int i = 0; i < 24; i++)\r
- {\r
- JButton button = (JButton) buttonPanel.getComponent(i);\r
- Color c = new Color(Integer.parseInt(in.readLine()));\r
- button.setBackground(c);\r
- }\r
+ newColours[i] = new Color(Integer.parseInt(ucs.getColour(i).getRGB(), 16));\r
\r
- jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", file);\r
}\r
catch (Exception ex)\r
- {}\r
+ {System.out.println("Error loading UserColourFile "+file);}\r
\r
+ return newColours;\r
}\r
\r
protected void savebutton_actionPerformed(ActionEvent e)\r
{\r
JalviewFileChooser chooser = new JalviewFileChooser(\r
jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
- new String[]{".jc"},\r
+ new String[]{"jc"},\r
new String[]{"Jalview User Colours"},\r
"Jalview User Colours");\r
\r
{\r
String choice = chooser.getSelectedFile().getPath();\r
jalview.bin.Cache.setProperty("USER_DEFINED_COLOUR", choice);\r
+ jalview.binding.JalviewUserColours ucs = new jalview.binding.JalviewUserColours();\r
\r
try{\r
- PrintWriter out = new PrintWriter(new FileWriter(choice));\r
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(\r
+ new FileOutputStream(choice), "UTF-8"));\r
for(int i=0; i<24; i++)\r
{\r
- JButton button = (JButton)buttonPanel.getComponent(i);\r
- out.println(button.getBackground().getRGB() + "");\r
+ JButton button = (JButton)buttonPanel.getComponent(i);\r
+ jalview.binding.Colour col = new jalview.binding.Colour();\r
+ col.setName(button.getText());\r
+ col.setRGB( jalview.util.Format.getHexString( button.getBackground() ));\r
+ ucs.addColour(col);\r
}\r
\r
+ ucs.marshal(out);\r
out.close();\r
}\r
catch(Exception ex)\r
\r
protected void cancelButton_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
buttonPanel.getComponent(i).setBackground(newColours[i]);\r
}\r
\r
- ucs.setColourScheme( newColours );\r
+ UserColourScheme ucs = new UserColourScheme( newColours );\r
+\r
if (seqGroup != null)\r
seqGroup.cs = ucs;\r
else\r
git://source.jalview.org / jalview.git / blobdiff