Vector selectedButtons;\r
ColourSchemeI oldColourScheme;\r
JInternalFrame frame;\r
+ MCview.PDBCanvas pdbcanvas;\r
\r
/**\r
* Creates a new UserDefinedColours object.\r
\r
if (System.getProperty("os.name").startsWith("Mac"))\r
{\r
- frame.setSize(450, 560);\r
+ frame.setSize(760, 370);\r
}\r
\r
if (sg != null)\r
makeButton("Gap", "-");\r
}\r
\r
+ public UserDefinedColours(MCview.PDBCanvas pdb, ColourSchemeI oldcs)\r
+ {\r
+ super();\r
+ frame = new JInternalFrame();\r
+ frame.setContentPane(this);\r
+ Desktop.addInternalFrame(frame, "User Defined Colours", 720, 370, true);\r
+ pdbcanvas = pdb;\r
+\r
+ if (System.getProperty("os.name").startsWith("Mac"))\r
+ {\r
+ frame.setSize(760, 370);\r
+ }\r
+\r
+ colorChooser.getSelectionModel().addChangeListener(this);\r
+\r
+ oldColourScheme = oldcs;\r
+\r
+ if (oldColourScheme instanceof UserColourScheme)\r
+ {\r
+ schemeName.setText( ( (UserColourScheme) oldColourScheme).getName());\r
+ }\r
+ for (int i = 0; i < 20; i++)\r
+ {\r
+ makeButton(ResidueProperties.aa2Triplet.get(ResidueProperties.aa[i]) +\r
+ "", ResidueProperties.aa[i]);\r
+ }\r
+\r
+ makeButton("B", "B");\r
+ makeButton("Z", "Z");\r
+ makeButton("X", "X");\r
+ makeButton("Gap", "-");\r
+ }\r
+\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
\r
if(e.isShiftDown())\r
{\r
- JButton start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);\r
- JButton end = (JButton) e.getSource();\r
+ JButton start, end = (JButton) e.getSource();\r
+ if(selectedButtons.size()>0)\r
+ start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);\r
+ else\r
+ start = (JButton) e.getSource();\r
+\r
int startIndex=0, endIndex=0;\r
for(int b=0; b<buttonPanel.getComponentCount(); b++)\r
{\r
seqGroup.cs = ucs;\r
ap.repaint();\r
}\r
- else\r
+ else if(ap!=null)\r
{\r
ap.alignFrame.changeColour(ucs);\r
}\r
+ else if(pdbcanvas!=null)\r
+ {\r
+ pdbcanvas.pdb.setColours(ucs);\r
+ pdbcanvas.updateSeqColours();\r
+ }\r
}\r
\r
UserColourScheme getSchemeFromGUI()\r
}\r
\r
UserColourScheme ucs = new UserColourScheme(newColours);\r
- ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());\r
+ if(ap!=null)\r
+ ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());\r
+\r
\r
return ucs;\r
}\r
*/\r
public static UserColourScheme loadDefaultColours()\r
{\r
+ UserColourScheme ret = null;\r
+\r
String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");\r
- if ( colours != null)\r
+ if ( colours != null )\r
{\r
if(colours.indexOf("|")>-1)\r
colours = colours.substring(0, colours.indexOf("|"));\r
\r
- return loadColours(colours);\r
+ ret = loadColours(colours);\r
}\r
- else\r
+\r
+ if(ret == null)\r
{\r
Color[] newColours = new Color[24];\r
for (int i = 0; i < 24; i++)\r
{\r
newColours[i] = Color.white;\r
}\r
- return new UserColourScheme(newColours);\r
+ ret = new UserColourScheme(newColours);\r
}\r
+\r
+ return ret;\r
}\r
\r
/**\r
InputStreamReader in = new InputStreamReader(new FileInputStream(\r
file), "UTF-8");\r
\r
- jalview.binding.JalviewUserColours jucs = new jalview.binding.JalviewUserColours();\r
- jucs = (jalview.binding.JalviewUserColours) jucs.unmarshal(in);\r
+ jalview.schemabinding.version2.JalviewUserColours jucs\r
+ = new jalview.schemabinding.version2.JalviewUserColours();\r
\r
- newColours = new Color[jucs.getColourCount()];\r
+ org.exolab.castor.xml.Unmarshaller unmar\r
+ = new org.exolab.castor.xml.Unmarshaller(jucs);\r
+ jucs = (jalview.schemabinding.version2.JalviewUserColours) unmar.unmarshal( in );\r
+\r
+ newColours = new Color[jucs.getColourCount()];\r
\r
for (int i = 0; i < 24; i++)\r
{\r
}\r
catch (Exception ex)\r
{\r
- System.out.println("Error loading User ColourFile\n"+ex);\r
+ //Could be Archive Jalview format\r
+ try{\r
+ InputStreamReader in = new InputStreamReader(new FileInputStream(\r
+ file), "UTF-8");\r
+\r
+ jalview.binding.JalviewUserColours jucs\r
+ = new jalview.binding.JalviewUserColours();\r
+\r
+ jucs = (jalview.binding.JalviewUserColours) jucs.unmarshal(in);\r
+\r
+ newColours = new Color[jucs.getColourCount()];\r
+\r
+ for (int i = 0; i < 24; i++)\r
+ {\r
+ newColours[i] = new Color(Integer.parseInt(\r
+ jucs.getColour(i).getRGB(), 16));\r
+ }\r
+ if (newColours != null)\r
+ {\r
+ ucs = new UserColourScheme(newColours);\r
+ ucs.setName(jucs.getSchemeName());\r
+ }\r
+ }catch(Exception ex2)\r
+ { ex2.printStackTrace(); }\r
+\r
+ if(newColours==null)\r
+ System.out.println("Error loading User ColourFile\n"+ex);\r
}\r
\r
-\r
return ucs;\r
}\r
\r
*/\r
protected void cancelButton_actionPerformed(ActionEvent e)\r
{\r
+ if (ap != null)\r
+ {\r
if (seqGroup != null)\r
{\r
- seqGroup.cs = oldColourScheme;\r
+ seqGroup.cs = oldColourScheme;\r
}\r
- else\r
+ else if (ap != null)\r
{\r
- ap.av.setGlobalColourScheme(oldColourScheme);\r
+ ap.av.setGlobalColourScheme(oldColourScheme);\r
}\r
-\r
ap.repaint();\r
+ }\r
+\r
+ if(pdbcanvas!=null)\r
+ {\r
+ pdbcanvas.pdb.setColours(oldColourScheme);\r
+ }\r
\r
try\r
{\r
{\r
userColourSchemes = new Hashtable();\r
\r
- if(files==null)\r
+ if(files==null || files.length()==0)\r
return;\r
\r
+\r
// In case colours can't be loaded, we'll remove them\r
// from the default list here.\r
StringBuffer coloursFound = new StringBuffer();\r
}\r
if (!files.equals(coloursFound.toString()))\r
{\r
- jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());\r
+ if (coloursFound.toString().length() > 1)\r
+ jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",\r
+ coloursFound.toString());\r
+ else\r
+ jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");\r
}\r
}\r
+\r
+ public static void removeColourFromDefaults(String target)\r
+ {\r
+ // The only way to find colours by name is to load them in\r
+ // In case colours can't be loaded, we'll remove them\r
+ // from the default list here.\r
+\r
+ userColourSchemes = new Hashtable();\r
+\r
+ StringBuffer coloursFound = new StringBuffer();\r
+ StringTokenizer st = new StringTokenizer(\r
+ jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");\r
+\r
+ while (st.hasMoreElements())\r
+ {\r
+ String file = st.nextToken();\r
+ try\r
+ {\r
+ UserColourScheme ucs = loadColours(file);\r
+ if (ucs != null && !ucs.getName().equals(target))\r
+ {\r
+ if (coloursFound.length() > 0)\r
+ coloursFound.append("|");\r
+ coloursFound.append(file);\r
+ userColourSchemes.put(ucs.getName(), ucs);\r
+ }\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ System.out.println("Error loading User ColourFile\n" + ex);\r
+ }\r
+ }\r
+\r
+ if (coloursFound.toString().length() > 1)\r
+ jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());\r
+ else\r
+ jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");\r
+\r
+ }\r
}\r
git://source.jalview.org / jalview.git / blobdiff