+/*\r
+ * Jalview - A Sequence Alignment Editor and Viewer\r
+ * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ *\r
+ * This program is distributed in the hope that it will be useful,\r
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+ * GNU General Public License for more details.\r
+ *\r
+ * You should have received a copy of the GNU General Public License\r
+ * along with this program; if not, write to the Free Software\r
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+ */\r
package jalview.gui;\r
\r
import java.io.*;\r
+import java.net.*;\r
import java.util.*;\r
import java.util.jar.*;\r
\r
+import javax.swing.*;\r
+\r
import jalview.binding.*;\r
+import jalview.io.*;\r
import jalview.schemes.*;\r
-import javax.swing.JInternalFrame;\r
-\r
\r
public class Jalview2XML\r
{\r
-\r
// SAVES SEVERAL ALIGNEMENT WINDOWS TO SAME JARFILE\r
public static void SaveState(File statefile)\r
{\r
- long creation = System.currentTimeMillis();\r
- JInternalFrame[] frames = Desktop.desktop.getAllFrames();\r
- try{\r
- FileOutputStream fos = new FileOutputStream(statefile);\r
- JarOutputStream jout = new JarOutputStream(fos);\r
- //NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS\r
- ////////////////////////////////////////////////////\r
- PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, "UTF-8"));\r
-\r
- Vector shortNames = new Vector();\r
- for (int i = 0; i < frames.length; i++)\r
+ long creation = System.currentTimeMillis();\r
+ JInternalFrame[] frames = Desktop.desktop.getAllFrames();\r
+\r
+ if (frames == null)\r
+ {\r
+ return;\r
+ }\r
+\r
+ try\r
+ {\r
+ FileOutputStream fos = new FileOutputStream(statefile);\r
+ JarOutputStream jout = new JarOutputStream(fos);\r
+\r
+ //NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS\r
+ ////////////////////////////////////////////////////\r
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(jout,\r
+ "UTF-8"));\r
+\r
+ Vector shortNames = new Vector();\r
+\r
+ //REVERSE ORDER\r
+ for (int i = frames.length - 1; i > -1; i--)\r
+ {\r
+ if (frames[i] instanceof AlignFrame)\r
{\r
- if (frames[i] instanceof AlignFrame)\r
- {\r
- AlignFrame af = (AlignFrame) frames[i];\r
+ AlignFrame af = (AlignFrame) frames[i];\r
\r
- String shortName = af.getTitle();\r
+ String shortName = af.getTitle();\r
\r
- shortName = shortName.replace('/', '_');\r
- shortName = shortName.replace('\\', '_');\r
+ if (shortName.indexOf(File.separatorChar) > -1)\r
+ {\r
+ shortName = shortName.substring(shortName.lastIndexOf(\r
+ File.separatorChar) + 1);\r
+ }\r
\r
- int count=1;\r
- while( shortNames.contains(shortName) )\r
- {\r
- if(shortName.endsWith("_"+(count-1)))\r
- shortName = shortName.substring(0, shortName.lastIndexOf("_"));\r
+ int count = 1;\r
\r
- shortName = shortName.concat("_"+count);\r
- count++;\r
+ while (shortNames.contains(shortName))\r
+ {\r
+ if (shortName.endsWith("_" + (count - 1)))\r
+ {\r
+ shortName = shortName.substring(0,\r
+ shortName.lastIndexOf("_"));\r
}\r
- shortNames.addElement(shortName);\r
\r
- if(!shortName.endsWith(".xml"))\r
- shortName = shortName+".xml";\r
+ shortName = shortName.concat("_" + count);\r
+ count++;\r
+ }\r
\r
- SaveState( af, creation, shortName, jout, out);\r
- }\r
+ shortNames.addElement(shortName);\r
+\r
+ if (!shortName.endsWith(".xml"))\r
+ {\r
+ shortName = shortName + ".xml";\r
+ }\r
+\r
+ SaveState(af, creation, shortName, jout, out);\r
}\r
- out.close();\r
- jout.close();\r
}\r
- catch(Exception ex){ex.printStackTrace();}\r
+\r
+ out.close();\r
+ jout.close();\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ ex.printStackTrace();\r
+ }\r
}\r
\r
// USE THIS METHOD TO SAVE A SINGLE ALIGNMENT WINDOW\r
- public static void SaveState( AlignFrame af, String jarFile, String fileName)\r
+ public static void SaveState(AlignFrame af, String jarFile, String fileName)\r
{\r
- try{\r
+ try\r
+ {\r
FileOutputStream fos = new FileOutputStream(jarFile);\r
JarOutputStream jout = new JarOutputStream(fos);\r
+\r
//NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS\r
////////////////////////////////////////////////////\r
- PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, "UTF-8"));\r
+ PrintWriter out = new PrintWriter(new OutputStreamWriter(jout,\r
+ "UTF-8"));\r
\r
SaveState(af, System.currentTimeMillis(), fileName, jout, out);\r
out.close();\r
jout.close();\r
- }catch(Exception ex){}\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ }\r
}\r
\r
- public static void SaveState( AlignFrame af, long timeStamp,\r
- String fileName, JarOutputStream jout, PrintWriter out)\r
+ public static void SaveState(AlignFrame af, long timeStamp,\r
+ String fileName, JarOutputStream jout,\r
+ PrintWriter out)\r
{\r
-\r
Vector seqids = new Vector();\r
+ Vector userColours = new Vector();\r
\r
AlignViewport av = af.viewport;\r
\r
JalviewModel object = new JalviewModel();\r
- object.setVamsasModel( new VamsasModel() );\r
+ object.setVamsasModel(new VamsasModel());\r
\r
- object.setCreationDate( new java.util.Date(timeStamp) );\r
+ object.setCreationDate(new java.util.Date(timeStamp));\r
\r
jalview.datamodel.AlignmentI jal = af.viewport.alignment;\r
\r
Sequence vamsasSeq;\r
JalviewModelSequence jms = new JalviewModelSequence();\r
\r
- vamsasSet.setGapChar(jal.getGapCharacter()+"");\r
+ vamsasSet.setGapChar(jal.getGapCharacter() + "");\r
\r
JSeq jseq;\r
\r
-\r
//SAVE SEQUENCES\r
int id = 0;\r
- for(int i=0; i<jal.getHeight(); i++)\r
+\r
+ for (int i = 0; i < jal.getHeight(); i++)\r
{\r
seqids.add(jal.getSequenceAt(i));\r
\r
- vamsasSeq = new Sequence( );\r
- vamsasSeq.setId(id+"");\r
+ vamsasSeq = new Sequence();\r
+ vamsasSeq.setId(id + "");\r
vamsasSeq.setName(jal.getSequenceAt(i).getName());\r
vamsasSeq.setSequence(jal.getSequenceAt(i).getSequence());\r
\r
\r
jseq.setColour(jal.getSequenceAt(i).getColor().getRGB());\r
\r
- jseq.setId( id );\r
+ jseq.setId(id);\r
\r
jms.addJSeq(jseq);\r
vamsasSet.addSequence(vamsasSeq);\r
}\r
\r
//SAVE TREES\r
- if(af.viewport.currentTree!=null)\r
+ if (af.viewport.currentTree != null)\r
{\r
object.getVamsasModel().addTree(af.viewport.currentTree.toString());\r
}\r
\r
//SAVE ANNOTATIONS\r
- if(jal.getAlignmentAnnotation()!=null)\r
+ if (jal.getAlignmentAnnotation() != null)\r
{\r
+ jalview.datamodel.AlignmentAnnotation[] aa = jal.getAlignmentAnnotation();\r
\r
- jalview.datamodel.AlignmentAnnotation [] aa = jal.getAlignmentAnnotation();\r
- for(int i=0; i<aa.length; i++)\r
+ for (int i = 0; i < aa.length; i++)\r
{\r
- if(aa[i].label.equals("Quality")\r
- || aa[i].label.equals("Conservation")\r
- || aa[i].label.equals("Consensus"))\r
- { continue;}\r
+ if (aa[i].label.equals("Quality") ||\r
+ aa[i].label.equals("Conservation") ||\r
+ aa[i].label.equals("Consensus"))\r
+ {\r
+ continue;\r
+ }\r
\r
Annotation an = new Annotation();\r
an.setDescription(aa[i].description);\r
\r
AnnotationElement ae;\r
\r
- for(int a=0; a<aa[i].annotations.length; a++)\r
+ for (int a = 0; a < aa[i].annotations.length; a++)\r
{\r
- if(aa[i]==null || aa[i].annotations[a]==null)\r
+ if ( (aa[i] == null) || (aa[i].annotations[a] == null))\r
+ {\r
continue;\r
+ }\r
\r
ae = new AnnotationElement();\r
ae.setDescription(aa[i].annotations[a].description);\r
ae.setDisplayCharacter(aa[i].annotations[a].displayCharacter);\r
ae.setValue(aa[i].annotations[a].value);\r
ae.setPosition(a);\r
- ae.setSecondaryStructure(aa[i].annotations[a].secondaryStructure+"");\r
+ ae.setSecondaryStructure(aa[i].annotations[a].secondaryStructure +\r
+ "");\r
an.addAnnotationElement(ae);\r
}\r
\r
vamsasSet.addAnnotation(an);\r
}\r
-\r
}\r
\r
//SAVE GROUPS\r
- if(jal.getGroups()!=null)\r
+ if (jal.getGroups() != null)\r
{\r
- JGroup [] groups = new JGroup[jal.getGroups().size()];\r
- for(int i=0; i<groups.length; i++)\r
+ JGroup[] groups = new JGroup[jal.getGroups().size()];\r
+\r
+ for (int i = 0; i < groups.length; i++)\r
{\r
groups[i] = new JGroup();\r
- jalview.datamodel.SequenceGroup sg\r
- = (jalview.datamodel.SequenceGroup)jal.getGroups().elementAt(i);\r
- groups[i].setStart( sg.getStartRes() );\r
- groups[i].setEnd( sg.getEndRes() );\r
- groups[i].setName( sg.getName());\r
\r
- if(sg.cs instanceof ConservationColourScheme)\r
- groups[i].setConsThreshold( ((ConservationColourScheme)sg.cs).inc);\r
+ jalview.datamodel.SequenceGroup sg = (jalview.datamodel.SequenceGroup)\r
+ jal.getGroups()\r
+ .elementAt(i);\r
+ groups[i].setStart(sg.getStartRes());\r
+ groups[i].setEnd(sg.getEndRes());\r
+ groups[i].setName(sg.getName());\r
+\r
+ if (sg.cs instanceof ConservationColourScheme)\r
+ {\r
+ groups[i].setConsThreshold( ( (ConservationColourScheme) sg.cs).inc);\r
+ }\r
\r
if (sg.cs instanceof ResidueColourScheme)\r
- groups[i].setPidThreshold( ( (ResidueColourScheme) sg.cs).getThreshold());\r
- else if (sg.cs instanceof ScoreColourScheme)\r
- groups[i].setPidThreshold( ( (ScoreColourScheme) sg.cs).getThreshold());\r
+ {\r
+ groups[i].setPidThreshold( ( (ResidueColourScheme) sg.cs).\r
+ getThreshold());\r
+ }\r
+ else if (sg.cs instanceof ScoreColourScheme)\r
+ {\r
+ groups[i].setPidThreshold( ( (ScoreColourScheme) sg.cs).getThreshold());\r
+ }\r
\r
+ if (sg.cs instanceof jalview.schemes.UserColourScheme)\r
+ {\r
+ groups[i].setColour(SetUserColourScheme(sg.cs, userColours,\r
+ jms));\r
+ }\r
+ else\r
+ {\r
+ groups[i].setColour(ColourSchemeProperty.getColourName(\r
+ sg.cs));\r
+ }\r
\r
- groups[i].setColour( ColourSchemeProperty.getColourName(sg.cs) );\r
groups[i].setOutlineColour(sg.getOutlineColour().getRGB());\r
groups[i].setDisplayBoxes(sg.getDisplayBoxes());\r
groups[i].setDisplayText(sg.getDisplayText());\r
groups[i].setColourText(sg.getColourText());\r
\r
- for(int s=0; s<sg.getSize(); s++)\r
+ for (int s = 0; s < sg.getSize(); s++)\r
{\r
- jalview.datamodel.Sequence seq = (jalview.datamodel.Sequence)sg.getSequenceAt(s);\r
+ jalview.datamodel.Sequence seq = (jalview.datamodel.Sequence) sg.\r
+ getSequenceAt(s);\r
int index = seqids.indexOf(seq);\r
groups[i].addSeq(index);\r
}\r
-\r
}\r
\r
jms.setJGroup(groups);\r
-\r
}\r
\r
///////////SAVE VIEWPORT\r
Viewport view = new Viewport();\r
- view.setTitle(af.getTitle());\r
- view.setXpos(af.getX());\r
- view.setYpos(af.getY());\r
- view.setWidth(af.getWidth());\r
- view.setHeight(af.getHeight());\r
- view.setStartRes(av.startRes);\r
- view.setStartSeq(av.startSeq);\r
- view.setBgColour( ColourSchemeProperty.getColourName\r
- ( av.getGlobalColourScheme()));\r
-\r
- ColourSchemeI cs = av.getGlobalColourScheme();\r
- if(cs instanceof ConservationColourScheme)\r
- view.setConsThreshold( ((ConservationColourScheme)cs).inc);\r
-\r
- if (cs instanceof ResidueColourScheme)\r
- view.setPidThreshold( ( (ResidueColourScheme) cs).getThreshold());\r
- else if (cs instanceof ScoreColourScheme)\r
- view.setPidThreshold( ( (ScoreColourScheme) cs).getThreshold());\r
-\r
-\r
- view.setConservationSelected(av.getConservationSelected());\r
- view.setPidSelected(av.getAbovePIDThreshold());\r
- view.setFontName(av.font.getFontName());\r
- view.setFontSize(av.font.getSize());\r
- view.setFontStyle(av.font.getStyle());\r
- view.setRenderGaps(av.renderGaps);\r
- view.setShowAnnotation(av.getShowAnnotation());\r
- view.setShowBoxes(av.getShowBoxes());\r
- view.setShowColourText(av.getColourText());\r
- view.setShowConservation(av.showConservation);\r
- view.setShowFullId(av.getShowFullId());\r
- view.setShowIdentity(av.showIdentity);\r
- view.setShowQuality(av.showQuality);\r
- view.setShowSequenceFeatures(av.showSequenceFeatures);\r
- view.setShowText(av.getShowText());\r
- view.setWrapAlignment(av.getWrapAlignment());\r
-\r
- jms.addViewport( view );\r
+ view.setTitle(af.getTitle());\r
+ view.setXpos(af.getX());\r
+ view.setYpos(af.getY());\r
+ view.setWidth(af.getWidth());\r
+ view.setHeight(af.getHeight());\r
+ view.setStartRes(av.startRes);\r
+ view.setStartSeq(av.startSeq);\r
+\r
+ if (av.getGlobalColourScheme() instanceof jalview.schemes.UserColourScheme)\r
+ {\r
+ view.setBgColour(SetUserColourScheme(av.getGlobalColourScheme(),\r
+ userColours, jms));\r
+ }\r
+ else\r
+ {\r
+ view.setBgColour(ColourSchemeProperty.getColourName(\r
+ av.getGlobalColourScheme()));\r
+ }\r
+\r
+ ColourSchemeI cs = av.getGlobalColourScheme();\r
+\r
+ if (cs instanceof ConservationColourScheme)\r
+ {\r
+ view.setConsThreshold( ( (ConservationColourScheme) cs).inc);\r
+ }\r
+\r
+ if (cs instanceof ResidueColourScheme)\r
+ {\r
+ view.setPidThreshold( ( (ResidueColourScheme) cs).getThreshold());\r
+ }\r
+ else if (cs instanceof ScoreColourScheme)\r
+ {\r
+ view.setPidThreshold( ( (ScoreColourScheme) cs).getThreshold());\r
+ }\r
+\r
+ view.setConservationSelected(av.getConservationSelected());\r
+ view.setPidSelected(av.getAbovePIDThreshold());\r
+ view.setFontName(av.font.getFontName());\r
+ view.setFontSize(av.font.getSize());\r
+ view.setFontStyle(av.font.getStyle());\r
+ view.setRenderGaps(av.renderGaps);\r
+ view.setShowAnnotation(av.getShowAnnotation());\r
+ view.setShowBoxes(av.getShowBoxes());\r
+ view.setShowColourText(av.getColourText());\r
+ view.setShowConservation(av.showConservation);\r
+ view.setShowFullId(av.getShowFullId());\r
+ view.setShowIdentity(av.showIdentity);\r
+ view.setShowQuality(av.showQuality);\r
+ view.setShowSequenceFeatures(av.showSequenceFeatures);\r
+ view.setShowText(av.getShowText());\r
+ view.setWrapAlignment(av.getWrapAlignment());\r
+\r
+ jms.addViewport(view);\r
\r
object.setJalviewModelSequence(jms);\r
object.getVamsasModel().addSequenceSet(vamsasSet);\r
\r
-\r
try\r
{\r
- if(!fileName.endsWith(".xml"))\r
- fileName = fileName+".xml";\r
+ if (!fileName.endsWith(".xml"))\r
+ {\r
+ fileName = fileName + ".xml";\r
+ }\r
\r
- JarEntry entry = new JarEntry(fileName);\r
- jout.putNextEntry(entry);\r
+ JarEntry entry = new JarEntry(fileName);\r
+ jout.putNextEntry(entry);\r
\r
object.marshal(out);\r
}\r
}\r
}\r
\r
+ static String SetUserColourScheme(jalview.schemes.ColourSchemeI cs,\r
+ Vector userColours,\r
+ JalviewModelSequence jms)\r
+ {\r
+ String id = null;\r
+ jalview.schemes.UserColourScheme ucs = (jalview.schemes.UserColourScheme)\r
+ cs;\r
+\r
+ if (!userColours.contains(ucs))\r
+ {\r
+ userColours.add(ucs);\r
+\r
+ java.awt.Color[] colours = ucs.getColours();\r
+ jalview.binding.UserColours uc = new jalview.binding.UserColours();\r
+ jalview.binding.UserColourScheme jbucs = new jalview.binding.\r
+ UserColourScheme();\r
+\r
+ for (int i = 0; i < colours.length; i++)\r
+ {\r
+ jalview.binding.Colour col = new jalview.binding.Colour();\r
+ col.setRGB(jalview.util.Format.getHexString(colours[i]));\r
+ jbucs.addColour(col);\r
+ }\r
+\r
+ id = "ucs" + userColours.indexOf(ucs);\r
+ uc.setId(id);\r
+ uc.setUserColourScheme(jbucs);\r
+ jms.addUserColours(uc);\r
+ }\r
+\r
+ return id;\r
+ }\r
+\r
+ static jalview.schemes.UserColourScheme GetUserColourScheme(\r
+ JalviewModelSequence jms, String id)\r
+ {\r
+ UserColours[] uc = jms.getUserColours();\r
+ UserColours colours = null;\r
+\r
+ for (int i = 0; i < uc.length; i++)\r
+ {\r
+ if (uc[i].getId().equals(id))\r
+ {\r
+ colours = uc[i];\r
+\r
+ break;\r
+ }\r
+ }\r
+\r
+ int csize = colours.getUserColourScheme().getColourCount();\r
+ java.awt.Color[] newColours = new java.awt.Color[csize];\r
+\r
+ for (int i = 0; i < csize; i++)\r
+ {\r
+ newColours[i] = new java.awt.Color(Integer.parseInt(\r
+ colours.getUserColourScheme().getColour(i).getRGB(), 16));\r
+ }\r
+\r
+ return new jalview.schemes.UserColourScheme(newColours);\r
+ }\r
\r
public static void LoadJalviewAlign(String file)\r
{\r
JalviewModel object = new JalviewModel();\r
- try{\r
+\r
+ try\r
+ {\r
//UNMARSHALLER SEEMS TO CLOSE JARINPUTSTREAM, MOST ANNOYING\r
- JarInputStream jin = new JarInputStream(new FileInputStream(file));\r
- JarEntry jarentry=null;\r
+ URL url = null;\r
+\r
+ if (file.startsWith("http://"))\r
+ {\r
+ url = new URL(file);\r
+ }\r
+\r
+ JarInputStream jin = null;\r
+ JarEntry jarentry = null;\r
int entryCount = 1;\r
- do{\r
- jin = new JarInputStream(new FileInputStream(file));\r
- for(int i=0; i<entryCount; i++)\r
+\r
+ do\r
+ {\r
+ if (url != null)\r
+ {\r
+ jin = new JarInputStream(url.openStream());\r
+ }\r
+ else\r
+ {\r
+ jin = new JarInputStream(new FileInputStream(file));\r
+ }\r
+\r
+ for (int i = 0; i < entryCount; i++)\r
+ {\r
jarentry = jin.getNextJarEntry();\r
+ }\r
\r
- if(jarentry!=null)\r
+ if (jarentry != null)\r
{\r
InputStreamReader in = new InputStreamReader(jin, "UTF-8");\r
object = (JalviewModel) object.unmarshal(in);\r
LoadFromObject(object);\r
entryCount++;\r
}\r
- }while(jarentry!=null);\r
-\r
+ }\r
+ while (jarentry != null);\r
}\r
- catch(Exception ex)\r
- { System.out.println("HERE"+ex); return; }\r
+ catch (Exception ex)\r
+ {\r
+ System.err.println("Exception whilst loading jalview XML file : " +\r
+ ex + "\n");\r
+ ex.printStackTrace();\r
\r
+ return;\r
+ }\r
}\r
\r
static void LoadFromObject(JalviewModel object)\r
{\r
- Vector seqids = new Vector();\r
- SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0);\r
- Sequence [] vamsasSeq = vamsasSet.getSequence();\r
-\r
- JalviewModelSequence jms = object.getJalviewModelSequence();\r
- //////////////////////////////////\r
- //LOAD SEQUENCES\r
- jalview.datamodel.Sequence [] jseqs = new jalview.datamodel.Sequence[vamsasSeq.length];\r
- JSeq [] JSEQ = object.getJalviewModelSequence().getJSeq();\r
- for(int i=0; i<vamsasSeq.length; i++)\r
- {\r
- jseqs[i] = new jalview.datamodel.Sequence(vamsasSeq[i].getName(),\r
- vamsasSeq[i].getSequence());\r
-\r
- jseqs[i].setStart( JSEQ[i].getStart());\r
- jseqs[i].setEnd( JSEQ[i].getEnd());\r
- jseqs[i].setColor( new java.awt.Color(JSEQ[i].getColour()) );\r
- seqids.add(jseqs[i]);\r
- }\r
-\r
- /////////////////////////////////\r
- jalview.datamodel.Alignment al = new jalview.datamodel.Alignment(jseqs);\r
- /////////////////////////////////\r
-\r
- //////////////////////////////////\r
- //LOAD ANNOTATIONS\r
- if(vamsasSet.getAnnotation()!=null)\r
- {\r
- Annotation[] an = vamsasSet.getAnnotation();\r
- for (int i = 0; i < an.length; i++)\r
- {\r
- AnnotationElement[] ae = an[i].getAnnotationElement();\r
- jalview.datamodel.Annotation anot[]\r
- = new jalview.datamodel.Annotation[al.getWidth()];\r
- for (int aa = 0; aa < ae.length; aa++)\r
- {\r
- anot[ae[aa].getPosition()]\r
- = new jalview.datamodel.Annotation(\r
- ae[aa].getDisplayCharacter(),\r
- ae[aa].getDescription(),\r
- ae[aa].getSecondaryStructure().charAt(0),\r
- ae[aa].getValue()\r
- );\r
- }\r
-\r
-\r
- jalview.datamodel.AlignmentAnnotation jaa = null;\r
- if(an[i].getGraph())\r
- jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(),\r
- an[i].getDescription(), anot,\r
- 0,0,1);\r
- else\r
- jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(),\r
- an[i].getDescription(), anot);\r
- al.addAnnotation(jaa);\r
- }\r
- }\r
-\r
- /////////////////////////////////\r
- // LOAD VIEWPORT\r
- Viewport[] views = jms.getViewport();\r
- Viewport view = views[0]; // DEAL WITH MULTIPLE VIEWPORTS LATER\r
-\r
- AlignFrame af = new AlignFrame(al);\r
- // af.changeColour() );\r
+ Vector seqids = new Vector();\r
+ SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0);\r
+ Sequence[] vamsasSeq = vamsasSet.getSequence();\r
\r
+ JalviewModelSequence jms = object.getJalviewModelSequence();\r
+\r
+ //////////////////////////////////\r
+ //LOAD SEQUENCES\r
+ jalview.datamodel.Sequence[] jseqs = new jalview.datamodel.Sequence[\r
+ vamsasSeq.length];\r
+ JSeq[] JSEQ = object.getJalviewModelSequence().getJSeq();\r
+\r
+ for (int i = 0; i < vamsasSeq.length; i++)\r
+ {\r
+ jseqs[i] = new jalview.datamodel.Sequence(vamsasSeq[i].getName(),\r
+ vamsasSeq[i].getSequence());\r
+\r
+ jseqs[i].setStart(JSEQ[i].getStart());\r
+ jseqs[i].setEnd(JSEQ[i].getEnd());\r
+ jseqs[i].setColor(new java.awt.Color(JSEQ[i].getColour()));\r
+ seqids.add(jseqs[i]);\r
+ }\r
+\r
+ /////////////////////////////////\r
+ jalview.datamodel.Alignment al = new jalview.datamodel.Alignment(jseqs);\r
+\r
+ /////////////////////////////////\r
+ //////////////////////////////////\r
+ //LOAD ANNOTATIONS\r
+ if (vamsasSet.getAnnotation() != null)\r
+ {\r
+ Annotation[] an = vamsasSet.getAnnotation();\r
+\r
+ for (int i = 0; i < an.length; i++)\r
+ {\r
+ AnnotationElement[] ae = an[i].getAnnotationElement();\r
+ jalview.datamodel.Annotation[] anot = new jalview.datamodel.Annotation[\r
+ al.getWidth()];\r
+\r
+ for (int aa = 0; aa < ae.length; aa++)\r
+ {\r
+ anot[ae[aa].getPosition()] = new jalview.datamodel.Annotation(ae[aa].\r
+ getDisplayCharacter(),\r
+ ae[aa].getDescription(),\r
+ ae[aa].getSecondaryStructure().charAt(0),\r
+ ae[aa].getValue());\r
+ }\r
+\r
+ jalview.datamodel.AlignmentAnnotation jaa = null;\r
+\r
+ if (an[i].getGraph())\r
+ {\r
+ jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(),\r
+ an[i].getDescription(), anot, 0, 0, 1);\r
+ }\r
+ else\r
+ {\r
+ jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(),\r
+ an[i].getDescription(), anot);\r
+ }\r
+\r
+ al.addAnnotation(jaa);\r
+ }\r
+ }\r
+\r
+ /////////////////////////////////\r
+ // LOAD VIEWPORT\r
+ Viewport[] views = jms.getViewport();\r
+ Viewport view = views[0]; // DEAL WITH MULTIPLE VIEWPORTS LATER\r
+\r
+ AlignFrame af = new AlignFrame(al);\r
+\r
+ // af.changeColour() );\r
/////////////////////////\r
//LOAD GROUPS\r
- if (jms.getJGroupCount()>0)\r
+ if (jms.getJGroupCount() > 0)\r
{\r
JGroup[] groups = jms.getJGroup();\r
+\r
for (int i = 0; i < groups.length; i++)\r
{\r
- ColourSchemeI cs = ColourSchemeProperty.getColour(al, groups[i].getColour() );\r
- if (cs instanceof ResidueColourScheme)\r
- ( (ResidueColourScheme) cs).setThreshold(groups[i].getPidThreshold());\r
- else if (cs instanceof ScoreColourScheme)\r
- ( (ScoreColourScheme) cs).setThreshold(groups[i].getPidThreshold());\r
-\r
- jalview.datamodel.SequenceGroup sg = new jalview.datamodel.SequenceGroup\r
- (groups[i].getName(),\r
- cs,\r
- groups[i].getDisplayBoxes(),\r
- groups[i].getDisplayText(),\r
- groups[i].getColourText(),\r
- groups[i].getStart(),\r
- groups[i].getEnd()) ;\r
- sg.setOutlineColour( new java.awt.Color(groups[i].getOutlineColour()));\r
- int [] ids = groups[i].getSeq();\r
- for(int s=0; s<ids.length; s++)\r
- sg.addSequence( (jalview.datamodel.SequenceI)seqids.elementAt( ids[s] ));\r
-\r
- if(groups[i].getConsThreshold()!=0)\r
+ ColourSchemeI cs = null;\r
+\r
+ if (groups[i].getColour() != null)\r
+ {\r
+ if (groups[i].getColour().startsWith("ucs"))\r
+ {\r
+ cs = GetUserColourScheme(jms, groups[i].getColour());\r
+ }\r
+ else\r
+ {\r
+ cs = ColourSchemeProperty.getColour(al,\r
+ groups[i].getColour());\r
+ }\r
+\r
+ if (cs instanceof ResidueColourScheme)\r
+ {\r
+ ( (ResidueColourScheme) cs).setThreshold(groups[i].getPidThreshold());\r
+ }\r
+ else if (cs instanceof ScoreColourScheme)\r
+ {\r
+ ( (ScoreColourScheme) cs).setThreshold(groups[i].getPidThreshold());\r
+ }\r
+ }\r
+\r
+ jalview.datamodel.SequenceGroup sg = new jalview.datamodel.\r
+ SequenceGroup(groups[i].getName(),\r
+ cs, groups[i].getDisplayBoxes(),\r
+ groups[i].getDisplayText(), groups[i].getColourText(),\r
+ groups[i].getStart(), groups[i].getEnd());\r
+ sg.setOutlineColour(new java.awt.Color(\r
+ groups[i].getOutlineColour()));\r
+\r
+ int[] ids = groups[i].getSeq();\r
+\r
+ for (int s = 0; s < ids.length; s++)\r
{\r
- jalview.analysis.Conservation c = new jalview.analysis.Conservation("All",\r
- ResidueProperties.propHash, 3,\r
- sg.sequences, 0,\r
+ sg.addSequence( (jalview.datamodel.SequenceI) seqids.elementAt(\r
+ ids[s]));\r
+ }\r
+\r
+ if (groups[i].getConsThreshold() != 0)\r
+ {\r
+ jalview.analysis.Conservation c = new jalview.analysis.Conservation(\r
+ "All",\r
+ ResidueProperties.propHash, 3, sg.sequences, 0,\r
sg.getWidth() - 1);\r
c.calculate();\r
c.verdict(false, 25);\r
sg.cs = cs;\r
}\r
\r
-\r
al.addGroup(sg);\r
}\r
}\r
\r
-\r
- Desktop.addInternalFrame(af, view.getTitle(), AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
- af.setBounds(view.getXpos(), view.getYpos(), view.getWidth(), view.getHeight());\r
- af.viewport.setStartRes( view.getStartRes() );\r
- af.viewport.setStartSeq( view.getStartSeq() );\r
+ Desktop.addInternalFrame(af, view.getTitle(),\r
+ AlignFrame.NEW_WINDOW_WIDTH,\r
+ AlignFrame.NEW_WINDOW_HEIGHT);\r
+ af.setBounds(view.getXpos(), view.getYpos(), view.getWidth(),\r
+ view.getHeight());\r
+ af.viewport.setStartRes(view.getStartRes());\r
+ af.viewport.setStartSeq(view.getStartSeq());\r
af.viewport.showConservation = view.getShowConservation();\r
af.viewport.showQuality = view.getShowQuality();\r
- af.viewport.showIdentity= view.getShowIdentity();\r
- af.viewport.setAbovePIDThreshold( view.getPidSelected() );\r
- af.viewport.setColourText( view.getShowColourText() );\r
- af.viewport.setConservationSelected( view.getConservationSelected());\r
- af.viewport.setShowFullId( view.getShowFullId());\r
- af.viewport.setFont( new java.awt.Font( view.getFontName(),\r
- view.getFontStyle(),\r
- view.getFontSize()));\r
+ af.viewport.showIdentity = view.getShowIdentity();\r
+ af.viewport.setAbovePIDThreshold(view.getPidSelected());\r
+ af.viewport.setColourText(view.getShowColourText());\r
+ af.viewport.setConservationSelected(view.getConservationSelected());\r
+ af.viewport.setShowFullId(view.getShowFullId());\r
+ af.viewport.setFont(new java.awt.Font(view.getFontName(),\r
+ view.getFontStyle(), view.getFontSize()));\r
af.alignPanel.fontChanged();\r
- af.viewport.setRenderGaps( view.getRenderGaps() );\r
\r
- af.viewport.setWrapAlignment( view.getWrapAlignment() );\r
- if(view.getWrapAlignment())\r
+ af.sequenceFeatures_actionPerformed(null);\r
+ af.viewport.setRenderGaps(view.getRenderGaps());\r
+\r
+ af.viewport.setWrapAlignment(view.getWrapAlignment());\r
+\r
+ if (view.getWrapAlignment())\r
{\r
af.alignPanel.setWrapAlignment(view.getWrapAlignment());\r
}\r
af.alignPanel.setAnnotationVisible(view.getShowAnnotation());\r
}\r
\r
- af.viewport.setShowBoxes( view.getShowBoxes() );\r
- af.viewport.setShowText( view.getShowText() );\r
+ af.viewport.setShowBoxes(view.getShowBoxes());\r
+ af.viewport.setShowText(view.getShowText());\r
+\r
+ ColourSchemeI cs = null;\r
+\r
+ if (view.getBgColour() != null)\r
+ {\r
+ if (view.getBgColour().startsWith("ucs"))\r
+ {\r
+ cs = GetUserColourScheme(jms, view.getBgColour());\r
+ }\r
+ else\r
+ {\r
+ cs = ColourSchemeProperty.getColour(al, view.getBgColour());\r
+ }\r
+\r
+ if (cs instanceof ConservationColourScheme)\r
+ {\r
+ ( (ConservationColourScheme) cs).inc = view.getConsThreshold();\r
+ }\r
+\r
+ if (cs instanceof ResidueColourScheme)\r
+ {\r
+ ( (ResidueColourScheme) cs).setThreshold(view.getPidThreshold());\r
+ }\r
+ else if (cs instanceof ScoreColourScheme)\r
+ {\r
+ ( (ScoreColourScheme) cs).setThreshold(view.getPidThreshold());\r
+ }\r
+ }\r
+\r
+ af.viewport.setGlobalColourScheme(cs);\r
\r
- af.viewport.setGlobalColourScheme( ColourSchemeProperty.getColour(al, view.getBgColour()));\r
af.viewport.setColourAppliesToAllGroups(false);\r
- af.changeColour( af.viewport.getGlobalColourScheme() );\r
+ af.changeColour(af.viewport.getGlobalColourScheme());\r
af.viewport.setColourAppliesToAllGroups(true);\r
\r
- ColourSchemeI cs = af.viewport.getGlobalColourScheme();\r
- if(cs instanceof ConservationColourScheme)\r
- ( (ConservationColourScheme) cs).inc = view.getConsThreshold();\r
+ System.out.println(view.getShowSequenceFeatures());\r
\r
- if (cs instanceof ResidueColourScheme)\r
- ( (ResidueColourScheme) cs).setThreshold(view.getPidThreshold());\r
- else if (cs instanceof ScoreColourScheme)\r
- ( (ScoreColourScheme) cs).setThreshold(view.getPidThreshold());\r
+ if (view.getShowSequenceFeatures())\r
+ {\r
+ ;\r
+ }\r
+\r
+ {\r
+ SequenceFeatureFetcher sft = new SequenceFeatureFetcher(al,\r
+ af.alignPanel);\r
+ }\r
\r
//LOAD TREES - THIS RELEASE ONLY ALLOWS 1 TREE\r
- if(object.getVamsasModel().getTreeCount()>0)\r
+ if (object.getVamsasModel().getTreeCount() > 0)\r
{\r
- try{\r
+ try\r
+ {\r
af.ShowNewickTree(new jalview.io.NewickFile(\r
- (String)object.getVamsasModel().getTree(0)), "Tree");\r
- }catch(Exception ex){ex.printStackTrace();}\r
+ (String) object.getVamsasModel().getTree(0)), "Tree");\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ ex.printStackTrace();\r
+ }\r
}\r
-\r
}\r
}\r
-\r
-\r
-\r
git://source.jalview.org / jalview.git / blobdiff