X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML.java;h=f0551e89fa6f4a7f7ed9701b036d470be54aeffa;hb=6951479b7dc56bd022ce2c370b7f88b5571004fd;hp=f1f7db19d93985d2172c77d728052518f351e99b;hpb=451619e33c0a90c8130c7d79ffa38161af1c6e0f;p=jalview.git diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index f1f7db1..f0551e8 100755 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -18,25 +18,17 @@ */ package jalview.gui; - -import jalview.schemes.*; - import java.io.*; - import java.net.*; - import java.util.*; - import java.util.jar.*; import javax.swing.*; import org.exolab.castor.xml.*; - import jalview.schemabinding.version2.*; - - - +import jalview.schemes.*; +import jalview.structure.StructureSelectionManager; /** * DOCUMENT ME! @@ -56,1627 +48,1884 @@ public class Jalview2XML */ Hashtable viewportsAdded; + Hashtable annotationIds = new Hashtable(); + String uniqueSetSuffix = ""; + /** + * List of pdbfiles added to Jar + */ + Vector pdbfiles = null; + // SAVES SEVERAL ALIGNMENT WINDOWS TO SAME JARFILE + public void SaveState(File statefile) + { + JInternalFrame[] frames = Desktop.desktop.getAllFrames(); - // SAVES SEVERAL ALIGNMENT WINDOWS TO SAME JARFILE - public void SaveState(File statefile) + if (frames == null) { - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); - - if (frames == null) - { - return; - } - - try - { - FileOutputStream fos = new FileOutputStream(statefile); - JarOutputStream jout = new JarOutputStream(fos); - - //NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS - //////////////////////////////////////////////////// - PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, - "UTF-8")); + return; + } - Vector shortNames = new Vector(); + try + { + FileOutputStream fos = new FileOutputStream(statefile); + JarOutputStream jout = new JarOutputStream(fos); - //REVERSE ORDER - for (int i = frames.length - 1; i > -1; i--) - { - if (frames[i] instanceof AlignFrame) - { - AlignFrame af = (AlignFrame) frames[i]; + //NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS + //////////////////////////////////////////////////// + PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, + "UTF-8")); - String shortName = af.getTitle(); + Vector shortNames = new Vector(); - if (shortName.indexOf(File.separatorChar) > -1) - { - shortName = shortName.substring(shortName.lastIndexOf( - File.separatorChar) + 1); - } + //REVERSE ORDER + for (int i = frames.length - 1; i > -1; i--) + { + if (frames[i] instanceof AlignFrame) + { + AlignFrame af = (AlignFrame) frames[i]; - int count = 1; + String shortName = af.getTitle(); - while (shortNames.contains(shortName)) - { - if (shortName.endsWith("_" + (count - 1))) - { - shortName = shortName.substring(0, - shortName.lastIndexOf("_")); - } - - shortName = shortName.concat("_" + count); - count++; - } + if (shortName.indexOf(File.separatorChar) > -1) + { + shortName = shortName.substring(shortName.lastIndexOf( + File.separatorChar) + 1); + } - shortNames.addElement(shortName); + int count = 1; - if (!shortName.endsWith(".xml")) - { - shortName = shortName + ".xml"; - } + while (shortNames.contains(shortName)) + { + if (shortName.endsWith("_" + (count - 1))) + { + shortName = shortName.substring(0, + shortName.lastIndexOf("_")); + } - int ap, apSize= af.alignPanels.size(); - for (ap = 0; ap < apSize; ap++) - { - AlignmentPanel apanel = (AlignmentPanel) af.alignPanels. - elementAt(ap); + shortName = shortName.concat("_" + count); + count++; + } - SaveState(apanel, - apSize == 1 ? shortName : ap+shortName, - jout, out); - } - } - } + shortNames.addElement(shortName); - out.close(); - jout.close(); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - } + if (!shortName.endsWith(".xml")) + { + shortName = shortName + ".xml"; + } - // USE THIS METHOD TO SAVE A SINGLE ALIGNMENT WINDOW - public boolean SaveAlignment(AlignFrame af, String jarFile, - String fileName) - { - try - { - int ap, apSize= af.alignPanels.size(); - FileOutputStream fos = new FileOutputStream(jarFile); - JarOutputStream jout = new JarOutputStream(fos); - PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, - "UTF-8")); - for( ap=0; ap -1; f--) + { + if (frames[f] instanceof AppJMol) + { + jmol = (AppJMol) frames[f]; + if (!jmol.pdbentry.getId().equals(entry.getId())) + continue; - if(!pdbfiles.contains(entry.getId())) - { - pdbfiles.addElement(entry.getId()); - try - { - File file = new File(entry.getFile()); - if(file.exists() && jout!=null) - { - byte[] data = new byte[ (int) file.length()]; - jout.putNextEntry(new JarEntry(entry.getId())); - DataInputStream dis = new DataInputStream(new - FileInputStream(file)); - dis.readFully(data); - - DataOutputStream dout = new DataOutputStream(jout); - dout.write(data, 0, data.length); - jout.closeEntry(); - } - } - catch (Exception ex) - { - ex.printStackTrace(); - } - } - } + StructureState state = new StructureState(); + state.setVisible(true); + state.setXpos(jmol.getX()); + state.setYpos(jmol.getY()); + state.setWidth(jmol.getWidth()); + state.setHeight(jmol.getHeight()); + state.setContent(jmol.viewer.getStateInfo().replaceAll("\n", "")); - if(entry.getProperty()!=null) + for (int s = 0; s < jmol.sequence.length; s++) + { + if (jal.findIndex(jmol.sequence[s]) > -1) { - PdbentryItem item = new PdbentryItem(); - Hashtable properties = entry.getProperty(); - Enumeration en2 = properties.keys(); - while(en2.hasMoreElements()) - { - Property prop = new Property(); - String key = en2.nextElement().toString(); - prop.setName(key); - prop.setValue( properties.get(key).toString() ); - item.addProperty(prop); - } - pdb.addPdbentryItem(item); + pdb.addStructureState(state); } - - jseq.addPdbids(pdb); } } - - jms.addJSeq(jseq); - } - - if(av.hasHiddenRows) - jal = av.alignment; + } - //SAVE TREES - /////////////////////////////////// - if (av.currentTree != null) - { - // FIND ANY ASSOCIATED TREES - // NOT IMPLEMENTED FOR HEADLESS STATE AT PRESENT - if (Desktop.desktop != null) + if (entry.getFile() != null) { - JInternalFrame[] frames = Desktop.desktop.getAllFrames(); + pdb.setFile(entry.getFile()); + if (pdbfiles == null) + { + pdbfiles = new Vector(); + } - for (int t = 0; t < frames.length; t++) + if (!pdbfiles.contains(entry.getId())) { - if (frames[t] instanceof TreePanel) + pdbfiles.addElement(entry.getId()); + try { - TreePanel tp = (TreePanel) frames[t]; - - if (tp.treeCanvas.av.alignment == jal) + File file = new File(entry.getFile()); + if (file.exists() && jout != null) { - Tree tree = new Tree(); - tree.setTitle(tp.getTitle()); - tree.setCurrentTree( (av.currentTree == tp.getTree())); - tree.setNewick(tp.getTree().toString()); - tree.setThreshold(tp.treeCanvas.threshold); - - tree.setFitToWindow(tp.fitToWindow.getState()); - tree.setFontName(tp.getTreeFont().getName()); - tree.setFontSize(tp.getTreeFont().getSize()); - tree.setFontStyle(tp.getTreeFont().getStyle()); - tree.setMarkUnlinked(tp.placeholdersMenu.getState()); - - tree.setShowBootstrap(tp.bootstrapMenu.getState()); - tree.setShowDistances(tp.distanceMenu.getState()); - - tree.setHeight(tp.getHeight()); - tree.setWidth(tp.getWidth()); - tree.setXpos(tp.getX()); - tree.setYpos(tp.getY()); - - jms.addTree(tree); + byte[] data = new byte[ (int) file.length()]; + jout.putNextEntry(new JarEntry(entry.getId())); + DataInputStream dis = new DataInputStream(new + FileInputStream(file)); + dis.readFully(data); + + DataOutputStream dout = new DataOutputStream(jout); + dout.write(data, 0, data.length); + jout.closeEntry(); } } + catch (Exception ex) + { + ex.printStackTrace(); + } + } } - } - - //SAVE ANNOTATIONS - if (jal.getAlignmentAnnotation() != null) - { - jalview.datamodel.AlignmentAnnotation[] aa = jal.getAlignmentAnnotation(); - for (int i = 0; i < aa.length; i++) + if (entry.getProperty() != null) + { + PdbentryItem item = new PdbentryItem(); + Hashtable properties = entry.getProperty(); + Enumeration en2 = properties.keys(); + while (en2.hasMoreElements()) { - Annotation an = new Annotation(); - - if (aa[i].label.equals("Quality") || - aa[i].label.equals("Conservation") || - aa[i].label.equals("Consensus")) - { - an.setLabel(aa[i].label); - an.setGraph(true); - vamsasSet.addAnnotation(an); - continue; - } - - - an.setDescription(aa[i].description); - - if(aa[i].sequenceRef!=null) - { - an.setSequenceRef(aa[i].sequenceRef.getName()); - } - - if(aa[i].graph>0) - { - an.setGraph(true); - an.setGraphType(aa[i].graph); - an.setGraphGroup(aa[i].graphGroup); - if(aa[i].getThreshold()!=null) - { - ThresholdLine line = new ThresholdLine(); - line.setLabel(aa[i].getThreshold().label); - line.setValue(aa[i].getThreshold().value); - line.setColour(aa[i].getThreshold().colour.getRGB()); - an.setThresholdLine(line); - } - } - else - an.setGraph(false); - - an.setLabel(aa[i].label); - - AnnotationElement ae; - - for (int a = 0; a < aa[i].annotations.length; a++) - { - if ((aa[i] == null) || (aa[i].annotations[a] == null)) - { - continue; - } + Property prop = new Property(); + String key = en2.nextElement().toString(); + prop.setName(key); + prop.setValue(properties.get(key).toString()); + item.addProperty(prop); + } + pdb.addPdbentryItem(item); + } - ae = new AnnotationElement(); - ae.setDescription(aa[i].annotations[a].description); - ae.setDisplayCharacter(aa[i].annotations[a].displayCharacter); - ae.setValue(aa[i].annotations[a].value); - ae.setPosition(a); - ae.setSecondaryStructure(aa[i].annotations[a].secondaryStructure + - ""); + jseq.addPdbids(pdb); + } + } - if(aa[i].annotations[a].colour!=java.awt.Color.black) - ae.setColour(aa[i].annotations[a].colour.getRGB()); + jms.addJSeq(jseq); + } - an.addAnnotationElement(ae); - } + if (av.hasHiddenRows) + { + jal = av.alignment; + } - vamsasSet.addAnnotation(an); - } - } + //SAVE TREES + /////////////////////////////////// + if (av.currentTree != null) + { + // FIND ANY ASSOCIATED TREES + // NOT IMPLEMENTED FOR HEADLESS STATE AT PRESENT + if (Desktop.desktop != null) + { + JInternalFrame[] frames = Desktop.desktop.getAllFrames(); - //SAVE GROUPS - if (jal.getGroups() != null) + for (int t = 0; t < frames.length; t++) { - JGroup[] groups = new JGroup[jal.getGroups().size()]; + if (frames[t] instanceof TreePanel) + { + TreePanel tp = (TreePanel) frames[t]; - for (int i = 0; i < groups.length; i++) + if (tp.treeCanvas.av.alignment == jal) { - groups[i] = new JGroup(); - - jalview.datamodel.SequenceGroup sg = (jalview.datamodel.SequenceGroup) jal.getGroups() - .elementAt(i); - groups[i].setStart(sg.getStartRes()); - groups[i].setEnd(sg.getEndRes()); - groups[i].setName(sg.getName()); - if(sg.cs!=null) - { - if (sg.cs.conservationApplied()) - { - groups[i].setConsThreshold(sg.cs.getConservationInc()); - - if (sg.cs instanceof jalview.schemes.UserColourScheme) - { - groups[i].setColour(SetUserColourScheme(sg.cs, - userColours, - jms)); - } - else - { - groups[i].setColour(ColourSchemeProperty.getColourName(sg. - cs)); - } - } - else if(sg.cs instanceof jalview.schemes.AnnotationColourGradient) - { - groups[i].setColour( - ColourSchemeProperty.getColourName( - ( (jalview.schemes.AnnotationColourGradient) sg.cs).getBaseColour())); - } - else if (sg.cs instanceof jalview.schemes.UserColourScheme) - { - groups[i].setColour(SetUserColourScheme(sg.cs, userColours, - jms)); - } - else - { - groups[i].setColour(ColourSchemeProperty.getColourName( - sg.cs)); - } - - groups[i].setPidThreshold(sg.cs.getThreshold()); - } - - groups[i].setOutlineColour(sg.getOutlineColour().getRGB()); - groups[i].setDisplayBoxes(sg.getDisplayBoxes()); - groups[i].setDisplayText(sg.getDisplayText()); - groups[i].setColourText(sg.getColourText()); - groups[i].setTextCol1(sg.textColour.getRGB()); - groups[i].setTextCol2(sg.textColour2.getRGB()); - groups[i].setTextColThreshold(sg.thresholdTextColour); - - for (int s = 0; s < sg.getSize(false); s++) - { - jalview.datamodel.Sequence seq = - (jalview.datamodel.Sequence) sg.getSequenceAt(s); - groups[i].addSeq(seq.hashCode()); - } + Tree tree = new Tree(); + tree.setTitle(tp.getTitle()); + tree.setCurrentTree( (av.currentTree == tp.getTree())); + tree.setNewick(tp.getTree().toString()); + tree.setThreshold(tp.treeCanvas.threshold); + + tree.setFitToWindow(tp.fitToWindow.getState()); + tree.setFontName(tp.getTreeFont().getName()); + tree.setFontSize(tp.getTreeFont().getSize()); + tree.setFontStyle(tp.getTreeFont().getStyle()); + tree.setMarkUnlinked(tp.placeholdersMenu.getState()); + + tree.setShowBootstrap(tp.bootstrapMenu.getState()); + tree.setShowDistances(tp.distanceMenu.getState()); + + tree.setHeight(tp.getHeight()); + tree.setWidth(tp.getWidth()); + tree.setXpos(tp.getX()); + tree.setYpos(tp.getY()); + + jms.addTree(tree); } - - jms.setJGroup(groups); + } } + } + } + //SAVE ANNOTATIONS + if (jal.getAlignmentAnnotation() != null) + { + jalview.datamodel.AlignmentAnnotation[] aa = jal.getAlignmentAnnotation(); - ///////////SAVE VIEWPORT - Viewport view = new Viewport(); - view.setTitle(ap.alignFrame.getTitle()); - view.setSequenceSetId(av.getSequenceSetId()); - view.setViewName(av.viewName); - view.setGatheredViews(av.gatherViewsHere); - + for (int i = 0; i < aa.length; i++) + { + Annotation an = new Annotation(); - if (ap.av.explodedPosition != null) - { - view.setXpos(av.explodedPosition.x); - view.setYpos(av.explodedPosition.y); - view.setWidth(av.explodedPosition.width); - view.setHeight(av.explodedPosition.height); - } - else + if (aa[i].annotationId != null) { - view.setXpos(ap.alignFrame.getBounds().x); - view.setYpos(ap.alignFrame.getBounds().y); - view.setWidth(ap.alignFrame.getBounds().width); - view.setHeight(ap.alignFrame.getBounds().height); + annotationIds.put(aa[i].annotationId, aa[i]); } - view.setStartRes(av.startRes); - view.setStartSeq(av.startSeq); + an.setId(aa[i].annotationId); - if (av.getGlobalColourScheme() instanceof jalview.schemes.UserColourScheme) + if (aa[i] == av.quality || + aa[i] == av.conservation || + aa[i] == av.consensus) { - view.setBgColour(SetUserColourScheme(av.getGlobalColourScheme(), - userColours, jms)); + an.setLabel(aa[i].label); + an.setGraph(true); + vamsasSet.addAnnotation(an); + continue; } - else if(av.getGlobalColourScheme() instanceof jalview.schemes.AnnotationColourGradient) - { - jalview.schemes.AnnotationColourGradient acg - = (jalview.schemes.AnnotationColourGradient)av.getGlobalColourScheme(); - - AnnotationColours ac = new AnnotationColours(); - ac.setAboveThreshold(acg.getAboveThreshold()); - ac.setThreshold(acg.getAnnotationThreshold()); - ac.setAnnotation(acg.getAnnotation()); - if(acg.getBaseColour() instanceof jalview.schemes.UserColourScheme) - ac.setColourScheme(SetUserColourScheme(acg.getBaseColour(), - userColours, jms)); - else - ac.setColourScheme(ColourSchemeProperty.getColourName(acg.getBaseColour())); - ac.setMaxColour(acg.getMaxColour().getRGB()); - ac.setMinColour(acg.getMinColour().getRGB()); - view.setAnnotationColours(ac); - view.setBgColour("AnnotationColourGradient"); - } - else + an.setDescription(aa[i].description); + + if (aa[i].sequenceRef != null) { - view.setBgColour(ColourSchemeProperty.getColourName( - av.getGlobalColourScheme())); + an.setSequenceRef(aa[i].sequenceRef.getName()); } - ColourSchemeI cs = av.getGlobalColourScheme(); - - if(cs!=null) + if (aa[i].graph > 0) { - if (cs.conservationApplied()) - { - view.setConsThreshold(cs.getConservationInc()); - if (cs instanceof jalview.schemes.UserColourScheme) - view.setBgColour(SetUserColourScheme(cs, userColours, jms)); - } - - if (cs instanceof ResidueColourScheme) + an.setGraph(true); + an.setGraphType(aa[i].graph); + an.setGraphGroup(aa[i].graphGroup); + if (aa[i].getThreshold() != null) { - view.setPidThreshold(cs.getThreshold()); + ThresholdLine line = new ThresholdLine(); + line.setLabel(aa[i].getThreshold().label); + line.setValue(aa[i].getThreshold().value); + line.setColour(aa[i].getThreshold().colour.getRGB()); + an.setThresholdLine(line); } } - - view.setConservationSelected(av.getConservationSelected()); - view.setPidSelected(av.getAbovePIDThreshold()); - view.setFontName(av.font.getName()); - view.setFontSize(av.font.getSize()); - view.setFontStyle(av.font.getStyle()); - view.setRenderGaps(av.renderGaps); - view.setShowAnnotation(av.getShowAnnotation()); - view.setShowBoxes(av.getShowBoxes()); - view.setShowColourText(av.getColourText()); - view.setShowFullId(av.getShowJVSuffix()); - view.setRightAlignIds(av.rightAlignIds); - view.setShowSequenceFeatures(av.showSequenceFeatures); - view.setShowText(av.getShowText()); - view.setWrapAlignment(av.getWrapAlignment()); - view.setTextCol1(av.textColour.getRGB()); - view.setTextCol2(av.textColour2.getRGB()); - view.setTextColThreshold(av.thresholdTextColour); - - - if(av.featuresDisplayed!=null) + else { - jalview.schemabinding.version2.FeatureSettings fs - = new jalview.schemabinding.version2.FeatureSettings(); - - String [] renderOrder = - ap.seqPanel.seqCanvas.getFeatureRenderer().renderOrder; - - Vector settingsAdded = new Vector(); - for(int ro=0; ro-1) { + setting.setOrder(rorder); + } + fs.addSetting(setting); + settingsAdded.addElement(renderOrder[ro]); + } + + //Make sure we save none displayed feature settings + Enumeration en = + ap.seqPanel.seqCanvas.getFeatureRenderer().featureColours.keys(); + while (en.hasMoreElements()) + { + String key = en.nextElement().toString(); + if (settingsAdded.contains(key)) { - newColours[i] = new java.awt.Color(Integer.parseInt( - colours.getUserColourScheme().getColour(i).getRGB(), 16)); + continue; } - jalview.schemes.UserColourScheme ucs = - new jalview.schemes.UserColourScheme(newColours); + Setting setting = new Setting(); + setting.setType(key); + setting.setColour( + ap.seqPanel.seqCanvas.getFeatureRenderer().getColour(key).getRGB() + ); - if (colours.getUserColourScheme().getColourCount() > 24) + setting.setDisplay(false); + float rorder = ap.seqPanel.seqCanvas.getFeatureRenderer().getOrder(key); + if (rorder>-1) { - newColours = new java.awt.Color[23]; - for (int i = 0; i < 23; i++) - { - newColours[i] = new java.awt.Color(Integer.parseInt( - colours.getUserColourScheme().getColour(i+24).getRGB(), 16)); - } - ucs.setLowerCaseColours(newColours); + setting.setOrder(rorder); + } + fs.addSetting(setting); + settingsAdded.addElement(key); + } + en = ap.seqPanel.seqCanvas.getFeatureRenderer().featureGroups.keys(); + Vector groupsAdded=new Vector(); + while (en.hasMoreElements()) + { + String grp = en.nextElement().toString(); + if (groupsAdded.contains(grp)) + { + continue; } + Group g = new Group(); + g.setName(grp); + g.setDisplay(((Boolean)ap.seqPanel.seqCanvas.getFeatureRenderer().featureGroups.get(grp)).booleanValue()); + fs.addGroup(g); + groupsAdded.addElement(grp); + } + jms.setFeatureSettings(fs); + + } - return ucs; + if (av.hasHiddenColumns) + { + for (int c = 0; c < av.getColumnSelection().getHiddenColumns().size(); c++) + { + int[] region = (int[]) av.getColumnSelection().getHiddenColumns(). + elementAt(c); + HiddenColumns hc = new HiddenColumns(); + hc.setStart(region[0]); + hc.setEnd(region[1]); + view.addHiddenColumns(hc); + } } + jms.addViewport(view); - /** - * DOCUMENT ME! - * - * @param file DOCUMENT ME! - */ - public AlignFrame LoadJalviewAlign(final String file) + object.setJalviewModelSequence(jms); + object.getVamsasModel().addSequenceSet(vamsasSet); + + if (out != null) { - uniqueSetSuffix = System.currentTimeMillis()%100000 +""; + //We may not want to right the object to disk, + //eg we can copy the alignViewport to a new view object + //using save and then load + try + { + if (!fileName.endsWith(".xml")) + { + fileName = fileName + ".xml"; + } + + JarEntry entry = new JarEntry(fileName); + jout.putNextEntry(entry); + + object.marshal(out); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + return object; + } - jalview.gui.AlignFrame af = null; + String SetUserColourScheme(jalview.schemes.ColourSchemeI cs, + Vector userColours, JalviewModelSequence jms) + { + String id = null; + jalview.schemes.UserColourScheme ucs = (jalview.schemes.UserColourScheme) + cs; - seqRefIds = new Hashtable(); - viewportsAdded = new Hashtable(); + if (!userColours.contains(ucs)) + { + userColours.add(ucs); - Vector gatherToThisFrame= new Vector(); + java.awt.Color[] colours = ucs.getColours(); + jalview.schemabinding.version2.UserColours uc = new jalview.schemabinding. + version2.UserColours(); + jalview.schemabinding.version2.UserColourScheme jbucs = new jalview. + schemabinding.version2.UserColourScheme(); - try + for (int i = 0; i < colours.length; i++) + { + jalview.schemabinding.version2.Colour col = new jalview.schemabinding. + version2.Colour(); + col.setName(ResidueProperties.aa[i]); + col.setRGB(jalview.util.Format.getHexString(colours[i])); + jbucs.addColour(col); + } + if (ucs.getLowerCaseColours() != null) + { + colours = ucs.getLowerCaseColours(); + for (int i = 0; i < colours.length; i++) { - //UNMARSHALLER SEEMS TO CLOSE JARINPUTSTREAM, MOST ANNOYING - URL url = null; + jalview.schemabinding.version2.Colour col = new jalview.schemabinding. + version2.Colour(); + col.setName(ResidueProperties.aa[i].toLowerCase()); + col.setRGB(jalview.util.Format.getHexString(colours[i])); + jbucs.addColour(col); + } + } - if (file.startsWith("http://")) - { - url = new URL(file); - } + id = "ucs" + userColours.indexOf(ucs); + uc.setId(id); + uc.setUserColourScheme(jbucs); + jms.addUserColours(uc); + } - JarInputStream jin = null; - JarEntry jarentry = null; - int entryCount = 1; + return id; + } - do - { - if (url != null) - { - jin = new JarInputStream(url.openStream()); - } - else - { - jin = new JarInputStream(new FileInputStream(file)); - } + jalview.schemes.UserColourScheme GetUserColourScheme( + JalviewModelSequence jms, String id) + { + UserColours[] uc = jms.getUserColours(); + UserColours colours = null; - for (int i = 0; i < entryCount; i++) - { - jarentry = jin.getNextJarEntry(); - } + for (int i = 0; i < uc.length; i++) + { + if (uc[i].getId().equals(id)) + { + colours = uc[i]; - if (jarentry != null && jarentry.getName().endsWith(".xml")) - { - InputStreamReader in = new InputStreamReader(jin, "UTF-8"); - JalviewModel object = new JalviewModel(); + break; + } + } - Unmarshaller unmar = new Unmarshaller(object); - unmar.setValidation(false); - object = (JalviewModel) unmar.unmarshal( in ); + java.awt.Color[] newColours = new java.awt.Color[24]; - af = LoadFromObject(object, file, true); - if(af.viewport.gatherViewsHere) - { - gatherToThisFrame.add(af); - } - entryCount++; - } - else if (jarentry != null) - { - //Some other file here. - entryCount++; - } - } - while (jarentry != null); - } - catch(java.net.UnknownHostException ex) - { - ex.printStackTrace(); - System.err.println("Couldn't locate Jalview XML file : " + - ex + "\n"); + for (int i = 0; i < 24; i++) + { + newColours[i] = new java.awt.Color(Integer.parseInt( + colours.getUserColourScheme().getColour(i).getRGB(), 16)); + } - javax.swing.SwingUtilities.invokeLater(new Runnable() - { - public void run() - { - JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Couldn't locate " + file, - "URL not found", - JOptionPane.WARNING_MESSAGE); - } - }); - } - catch (Exception ex) - { - //Is Version 1 Jar file? - af = new Jalview2XML_V1().LoadJalviewAlign(file); + jalview.schemes.UserColourScheme ucs = + new jalview.schemes.UserColourScheme(newColours); - if(af!=null) - { - System.out.println("Successfully loaded archive file"); - return af; - } + if (colours.getUserColourScheme().getColourCount() > 24) + { + newColours = new java.awt.Color[23]; + for (int i = 0; i < 23; i++) + { + newColours[i] = new java.awt.Color(Integer.parseInt( + colours.getUserColourScheme().getColour(i + 24).getRGB(), 16)); + } + ucs.setLowerCaseColours(newColours); + } - System.err.println("Exception whilst loading jalview XML file : " + - ex + "\n"); - javax.swing.SwingUtilities.invokeLater(new Runnable() - { - public void run() - { + return ucs; + } - JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Error loading " + file, - "Error loading Jalview file", - JOptionPane.WARNING_MESSAGE); - }}); - } + /** + * DOCUMENT ME! + * + * @param file DOCUMENT ME! + */ + public AlignFrame LoadJalviewAlign(final String file) + { + uniqueSetSuffix = System.currentTimeMillis() % 100000 + ""; - if (Desktop.instance != null) - Desktop.instance.stopLoading(); + jalview.gui.AlignFrame af = null; - for (int i = 0; i < gatherToThisFrame.size(); i++) - { - Desktop.instance.gatherViews( - (AlignFrame) gatherToThisFrame.elementAt(i)); - } + seqRefIds = new Hashtable(); + viewportsAdded = new Hashtable(); - return af; - } + Hashtable gatherToThisFrame = new Hashtable(); - String loadPDBFile(String file, String pdbId) + try { - System.out.println(file +" "+pdbId); - try + //UNMARSHALLER SEEMS TO CLOSE JARINPUTSTREAM, MOST ANNOYING + URL url = null; + + if (file.startsWith("http://")) { - JarInputStream jin = null; + url = new URL(file); + } + + JarInputStream jin = null; + JarEntry jarentry = null; + int entryCount = 1; - if (file.startsWith("http://")) + do + { + if (url != null) { - jin = new JarInputStream(new URL(file).openStream()); + jin = new JarInputStream(url.openStream()); } else { jin = new JarInputStream(new FileInputStream(file)); } - JarEntry entry = null; - do + for (int i = 0; i < entryCount; i++) { - entry = jin.getNextJarEntry(); + jarentry = jin.getNextJarEntry(); } - while (!entry.getName().equals(pdbId)); - BufferedReader in = new BufferedReader(new InputStreamReader(jin)); - File outFile = File.createTempFile("jalview_pdb", ".txt"); - outFile.deleteOnExit(); - PrintWriter out = new PrintWriter(new FileOutputStream(outFile)); - String data; + if (jarentry != null && jarentry.getName().endsWith(".xml")) + { + InputStreamReader in = new InputStreamReader(jin, "UTF-8"); + JalviewModel object = new JalviewModel(); + + Unmarshaller unmar = new Unmarshaller(object); + unmar.setValidation(false); + object = (JalviewModel) unmar.unmarshal(in); - while ( (data = in.readLine()) != null) + af = LoadFromObject(object, file, true); + if (af.viewport.gatherViewsHere) + { + gatherToThisFrame.put(af.viewport.getSequenceSetId(), af); + } + entryCount++; + } + else if (jarentry != null) { - out.println(data); + //Some other file here. + entryCount++; } - out.close(); - return outFile.getAbsolutePath(); - } - catch (Exception ex) + while (jarentry != null); + } + catch (java.net.UnknownHostException ex) + { + ex.printStackTrace(); + System.err.println("Couldn't locate Jalview XML file : " + + ex + "\n"); + + javax.swing.SwingUtilities.invokeLater(new Runnable() { - ex.printStackTrace(); + public void run() + { + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "Couldn't locate " + file, + "URL not found", + JOptionPane.WARNING_MESSAGE); + } + }); + } + catch (Exception ex) + { + //Is Version 1 Jar file? + af = new Jalview2XML_V1().LoadJalviewAlign(file); + + if (af != null) + { + System.out.println("Successfully loaded archive file"); + return af; } + ex.printStackTrace(); - return null; + System.err.println("Exception whilst loading jalview XML file : " + + ex + "\n"); + javax.swing.SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "Error loading " + file, + "Error loading Jalview file", + JOptionPane.WARNING_MESSAGE); + } + }); } + if (Desktop.instance != null) + { + Desktop.instance.stopLoading(); + } - AlignFrame LoadFromObject(JalviewModel object, - String file, - boolean loadTrees ) + Enumeration en = gatherToThisFrame.elements(); + while(en.hasMoreElements()) { - SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0); - Sequence[] vamsasSeq = vamsasSet.getSequence(); + Desktop.instance.gatherViews( + (AlignFrame) en.nextElement()); + } - JalviewModelSequence jms = object.getJalviewModelSequence(); + return af; + } - Viewport view = jms.getViewport(0); + Hashtable alreadyLoadedPDB; + String loadPDBFile(String file, String pdbId) + { + if (alreadyLoadedPDB == null) + alreadyLoadedPDB = new Hashtable(); - ////////////////////////////////// - //LOAD SEQUENCES + if (alreadyLoadedPDB.containsKey(pdbId)) + return alreadyLoadedPDB.get(pdbId).toString(); - Vector hiddenSeqs = null; - jalview.datamodel.Sequence jseq; + try + { + JarInputStream jin = null; - ArrayList tmpseqs = new ArrayList(); + if (file.startsWith("http://")) + { + jin = new JarInputStream(new URL(file).openStream()); + } + else + { + jin = new JarInputStream(new FileInputStream(file)); + } - boolean multipleView = false; + JarEntry entry = null; + do + { + entry = jin.getNextJarEntry(); + } + while (!entry.getName().equals(pdbId)); - JSeq[] JSEQ = object.getJalviewModelSequence().getJSeq(); - for (int i = 0; i < JSEQ.length; i++) - { - String seqId = JSEQ[i].getId() + ""; + BufferedReader in = new BufferedReader(new InputStreamReader(jin)); + File outFile = File.createTempFile("jalview_pdb", ".txt"); + outFile.deleteOnExit(); + PrintWriter out = new PrintWriter(new FileOutputStream(outFile)); + String data; - if (seqRefIds.get(seqId) != null) - { - tmpseqs.add( (jalview.datamodel.Sequence) seqRefIds.get(seqId)); - multipleView = true; - } - else - { - jseq = new jalview.datamodel.Sequence(vamsasSeq[i].getName(), - vamsasSeq[i].getSequence()); - jseq.setDescription(vamsasSeq[i].getDescription()); - jseq.setStart(JSEQ[i].getStart()); - jseq.setEnd(JSEQ[i].getEnd()); - seqRefIds.put(vamsasSeq[i].getId(), jseq); - tmpseqs.add( jseq ); - } + while ( (data = in.readLine()) != null) + { + out.println(data); + } + out.close(); + alreadyLoadedPDB.put(pdbId, outFile.getAbsolutePath()); + return outFile.getAbsolutePath(); + } + catch (Exception ex) + { + ex.printStackTrace(); + } - if (JSEQ[i].getHidden()) - { - if (hiddenSeqs == null) - hiddenSeqs = new Vector(); + return null; + } + AlignFrame LoadFromObject(JalviewModel object, + String file, + boolean loadTreesAndStructures) + { + SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0); + Sequence[] vamsasSeq = vamsasSet.getSequence(); - hiddenSeqs.addElement( - (jalview.datamodel.Sequence) seqRefIds.get(seqId)); - } + JalviewModelSequence jms = object.getJalviewModelSequence(); + + Viewport view = jms.getViewport(0); + + ////////////////////////////////// + //LOAD SEQUENCES + + Vector hiddenSeqs = null; + jalview.datamodel.Sequence jseq; + + ArrayList tmpseqs = new ArrayList(); + + boolean multipleView = false; + JSeq[] JSEQ = object.getJalviewModelSequence().getJSeq(); + for (int i = 0; i < JSEQ.length; i++) + { + String seqId = JSEQ[i].getId() + ""; + + if (seqRefIds.get(seqId) != null) + { + tmpseqs.add( (jalview.datamodel.Sequence) seqRefIds.get(seqId)); + multipleView = true; + } + else + { + jseq = new jalview.datamodel.Sequence(vamsasSeq[i].getName(), + vamsasSeq[i].getSequence()); + jseq.setDescription(vamsasSeq[i].getDescription()); + jseq.setStart(JSEQ[i].getStart()); + jseq.setEnd(JSEQ[i].getEnd()); + seqRefIds.put(vamsasSeq[i].getId(), jseq); + tmpseqs.add(jseq); + } + + if (JSEQ[i].getHidden()) + { + if (hiddenSeqs == null) + { + hiddenSeqs = new Vector(); } - ///SequenceFeatures are added to the DatasetSequence, - // so we must create the dataset before loading features - ///////////////////////////////// + hiddenSeqs.addElement( + (jalview.datamodel.Sequence) seqRefIds.get(seqId)); + } + + } + + ///SequenceFeatures are added to the DatasetSequence, + // so we must create the dataset before loading features + ///////////////////////////////// - jalview.datamodel.Sequence[] orderedSeqs = new jalview.datamodel.Sequence[ - tmpseqs.size()]; + jalview.datamodel.Sequence[] orderedSeqs = new jalview.datamodel.Sequence[ + tmpseqs.size()]; - tmpseqs.toArray(orderedSeqs) ; + tmpseqs.toArray(orderedSeqs); + jalview.datamodel.Alignment al = + new jalview.datamodel.Alignment(orderedSeqs); - jalview.datamodel.Alignment al = - new jalview.datamodel.Alignment(orderedSeqs); + al.setDataset(null); + ///////////////////////////////// - al.setDataset(null); - ///////////////////////////////// + Hashtable pdbloaded = new Hashtable(); - Hashtable pdbloaded = new Hashtable(); - if(!multipleView) + if (!multipleView) + { + for (int i = 0; i < vamsasSeq.length; i++) + { + if (JSEQ[i].getFeaturesCount() > 0) { - for (int i = 0; i < vamsasSeq.length; i++) + Features[] features = JSEQ[i].getFeatures(); + for (int f = 0; f < features.length; f++) { - if (JSEQ[i].getFeaturesCount() > 0) + jalview.datamodel.SequenceFeature sf + = new jalview.datamodel.SequenceFeature(features[f].getType(), + features[f].getDescription(), features[f].getStatus(), + features[f].getBegin(), features[f].getEnd(), + features[f].getFeatureGroup()); + + sf.setScore(features[f].getScore()); + for (int od = 0; od < features[f].getOtherDataCount(); od++) { - Features[] features = JSEQ[i].getFeatures(); - for (int f = 0; f < features.length; f++) + OtherData keyValue = features[f].getOtherData(od); + if (keyValue.getKey().startsWith("LINK")) { - jalview.datamodel.SequenceFeature sf - = new jalview.datamodel.SequenceFeature(features[f].getType(), - features[f].getDescription(), features[f].getStatus(), - features[f].getBegin(), features[f].getEnd(), - features[f].getFeatureGroup()); - - sf.setScore(features[f].getScore()); - for (int od = 0; od < features[f].getOtherDataCount(); od++) - { - OtherData keyValue = features[f].getOtherData(od); - if (keyValue.getKey().startsWith("LINK")) - sf.addLink(keyValue.getValue()); - else - sf.setValue(keyValue.getKey(), keyValue.getValue()); - - } - - al.getSequenceAt(i).getDatasetSequence().addSequenceFeature(sf); + sf.addLink(keyValue.getValue()); } - } - if (JSEQ[i].getPdbidsCount() > 0) - { - Pdbids[] ids = JSEQ[i].getPdbids(); - for (int p = 0; p < ids.length; p++) + else { - jalview.datamodel.PDBEntry entry = new jalview.datamodel. - PDBEntry(); - entry.setId(ids[p].getId()); - entry.setType(ids[p].getType()); - if (ids[p].getFile() != null) - { - if (!pdbloaded.containsKey(ids[p].getFile())) - { - String tmppdb = loadPDBFile(file, ids[p].getId()); - entry.setFile(tmppdb); - pdbloaded.put(ids[p].getId(), tmppdb); - } - else - entry.setFile(pdbloaded.get(ids[p].getId()).toString()); - } - - al.getSequenceAt(i).getDatasetSequence().addPDBId(entry); + sf.setValue(keyValue.getKey(), keyValue.getValue()); } + } - if (vamsasSeq[i].getDBRefCount() > 0) + + al.getSequenceAt(i).getDatasetSequence().addSequenceFeature(sf); + } + } + + if (JSEQ[i].getPdbidsCount() > 0) + { + Pdbids[] ids = JSEQ[i].getPdbids(); + for (int p = 0; p < ids.length; p++) + { + jalview.datamodel.PDBEntry entry = new jalview.datamodel. + PDBEntry(); + entry.setId(ids[p].getId()); + entry.setType(ids[p].getType()); + if (ids[p].getFile() != null) { - for (int d = 0; d < vamsasSeq[i].getDBRefCount(); d++) + if (!pdbloaded.containsKey(ids[p].getFile())) { - jalview.datamodel.DBRefEntry entry = - new jalview.datamodel.DBRefEntry( - vamsasSeq[i].getDBRef(d).getSource(), - vamsasSeq[i].getDBRef(d).getVersion(), - vamsasSeq[i].getDBRef(d).getAccessionId() - ); - al.getSequenceAt(i).getDatasetSequence().addDBRef(entry); + entry.setFile(loadPDBFile(file, ids[p].getId())); + } + else + { + entry.setFile(pdbloaded.get(ids[p].getId()).toString()); } - } + + al.getSequenceAt(i).getDatasetSequence().addPDBId(entry); } } + if (vamsasSeq[i].getDBRefCount() > 0) + { + for (int d = 0; d < vamsasSeq[i].getDBRefCount(); d++) + { + jalview.datamodel.DBRefEntry entry = + new jalview.datamodel.DBRefEntry( + vamsasSeq[i].getDBRef(d).getSource(), + vamsasSeq[i].getDBRef(d).getVersion(), + vamsasSeq[i].getDBRef(d).getAccessionId() + ); + al.getSequenceAt(i).getDatasetSequence().addDBRef(entry); + } + + } + } + } + ///////////////////////////////// + ////////////////////////////////// + //LOAD ANNOTATIONS + boolean hideQuality = true, + hideConservation = true, + hideConsensus = true; - ///////////////////////////////// - ////////////////////////////////// - //LOAD ANNOTATIONS - boolean hideQuality = true, - hideConservation = true, - hideConsensus = true; + if (vamsasSet.getAnnotationCount() > 0) + { + Annotation[] an = vamsasSet.getAnnotation(); - if (vamsasSet.getAnnotationCount()>0) + for (int i = 0; i < an.length; i++) + { + if (an[i].getLabel().equals("Quality")) + { + hideQuality = false; + continue; + } + else if (an[i].getLabel().equals("Conservation")) + { + hideConservation = false; + continue; + } + else if (an[i].getLabel().equals("Consensus")) { - Annotation[] an = vamsasSet.getAnnotation(); + hideConsensus = false; + continue; + } - for (int i = 0; i < an.length; i++) - { - if (an[i].getLabel().equals("Quality")) - { - hideQuality = false; - continue; - } - else if(an[i].getLabel().equals("Conservation")) - { - hideConservation = false; - continue; - } - else if(an[i].getLabel().equals("Consensus")) - { - hideConsensus = false; - continue; - } - - AnnotationElement[] ae = an[i].getAnnotationElement(); - jalview.datamodel.Annotation[] anot = new jalview.datamodel.Annotation[al.getWidth()]; - - for (int aa = 0; aa < ae.length; aa++) - { - anot[ae[aa].getPosition()] = new jalview.datamodel.Annotation(ae[aa].getDisplayCharacter(), - ae[aa].getDescription(), - ae[aa].getSecondaryStructure().length()==0?' ':ae[aa].getSecondaryStructure().charAt(0), - ae[aa].getValue()); - anot[ae[aa].getPosition()].colour = new java.awt.Color( ae[aa].getColour() ); - } + if (an[i].getId() != null + && annotationIds.containsKey(an[i].getId())) + { + al.addAnnotation( + (jalview.datamodel.AlignmentAnnotation) annotationIds.get(an[i]. + getId()) + ); - jalview.datamodel.AlignmentAnnotation jaa = null; + continue; + } - if (an[i].getGraph()) - { - jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(), - an[i].getDescription(), anot, 0, 0, - an[i].getGraphType()); + AnnotationElement[] ae = an[i].getAnnotationElement(); + jalview.datamodel.Annotation[] anot = null; + if (!an[i].getScoreOnly()) + { + anot = new jalview.datamodel.Annotation[ + al.getWidth()]; - jaa.graphGroup = an[i].getGraphGroup(); + for (int aa = 0; aa < ae.length && aa < anot.length; aa++) + { + anot[ae[aa].getPosition()] = new jalview.datamodel.Annotation(ae[aa]. + getDisplayCharacter(), + ae[aa].getDescription(), + ae[aa].getSecondaryStructure().length() == 0 ? ' ' : + ae[aa].getSecondaryStructure().charAt(0), + ae[aa].getValue()); + anot[ae[aa].getPosition()].colour = new java.awt.Color(ae[aa]. + getColour()); + } + } + jalview.datamodel.AlignmentAnnotation jaa = null; - if (an[i].getThresholdLine() != null) - { - jaa.setThreshold(new jalview.datamodel.GraphLine( - an[i].getThresholdLine().getValue(), - an[i].getThresholdLine().getLabel(), - new java.awt.Color(an[i].getThresholdLine().getColour())) - ); + if (an[i].getGraph()) + { + jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(), + an[i].getDescription(), anot, 0, 0, + an[i].getGraphType()); - } + jaa.graphGroup = an[i].getGraphGroup(); - } - else - { - jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(), - an[i].getDescription(), anot); - } + if (an[i].getThresholdLine() != null) + { + jaa.setThreshold(new jalview.datamodel.GraphLine( + an[i].getThresholdLine().getValue(), + an[i].getThresholdLine().getLabel(), + new java.awt.Color(an[i].getThresholdLine().getColour())) + ); - if(an[i].getSequenceRef()!=null) - { - jaa.createSequenceMapping( - al.findName(an[i].getSequenceRef()), 1, true - ); - al.findName(an[i].getSequenceRef()).addAlignmentAnnotation(jaa); - } + } - al.addAnnotation(jaa); - } } - - ///////////////////////// - //LOAD GROUPS - if (jms.getJGroupCount() > 0) + else { - JGroup[] groups = jms.getJGroup(); - - for (int i = 0; i < groups.length; i++) - { - ColourSchemeI cs = null; + jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(), + an[i].getDescription(), anot); + } - if (groups[i].getColour() != null) - { - if (groups[i].getColour().startsWith("ucs")) - { - cs = GetUserColourScheme(jms, groups[i].getColour()); - } - else - { - cs = ColourSchemeProperty.getColour(al, - groups[i].getColour()); - } + if (an[i].getId() != null) + { + annotationIds.put(an[i].getId(), jaa); + jaa.annotationId = an[i].getId(); + } - if(cs!=null) - cs.setThreshold(groups[i].getPidThreshold(), true); - } + if (an[i].getSequenceRef() != null) + { + jaa.createSequenceMapping( + al.findName(an[i].getSequenceRef()), 1, true + ); + al.findName(an[i].getSequenceRef()).addAlignmentAnnotation(jaa); + } + if (an[i].hasScore()) + { + jaa.setScore(an[i].getScore()); + } + al.addAnnotation(jaa); + } + } - Vector seqs = new Vector(); + ///////////////////////// + //LOAD GROUPS + if (jms.getJGroupCount() > 0) + { + JGroup[] groups = jms.getJGroup(); - for (int s = 0; s < groups[i].getSeqCount(); s++) - { - String seqId = groups[i].getSeq(s)+""; - seqs.addElement((jalview.datamodel.SequenceI) seqRefIds.get(seqId)); - } + for (int i = 0; i < groups.length; i++) + { + ColourSchemeI cs = null; - jalview.datamodel.SequenceGroup sg = new jalview.datamodel.SequenceGroup(seqs, - groups[i].getName(), cs, groups[i].getDisplayBoxes(), - groups[i].getDisplayText(), groups[i].getColourText(), - groups[i].getStart(), groups[i].getEnd()); + if (groups[i].getColour() != null) + { + if (groups[i].getColour().startsWith("ucs")) + { + cs = GetUserColourScheme(jms, groups[i].getColour()); + } + else + { + cs = ColourSchemeProperty.getColour(al, + groups[i].getColour()); + } - sg.setOutlineColour(new java.awt.Color( - groups[i].getOutlineColour())); + if (cs != null) + { + cs.setThreshold(groups[i].getPidThreshold(), true); + } + } - sg.textColour = new java.awt.Color(groups[i].getTextCol1()); - sg.textColour2 = new java.awt.Color(groups[i].getTextCol2()); - sg.thresholdTextColour = groups[i].getTextColThreshold(); + Vector seqs = new Vector(); - if (groups[i].getConsThreshold() != 0) - { - jalview.analysis.Conservation c = new jalview.analysis.Conservation("All", - ResidueProperties.propHash, 3, sg.getSequences(false), 0, - sg.getWidth() - 1); - c.calculate(); - c.verdict(false, 25); - sg.cs.setConservation(c); - } + for (int s = 0; s < groups[i].getSeqCount(); s++) + { + String seqId = groups[i].getSeq(s) + ""; + jalview.datamodel.SequenceI ts = (jalview.datamodel.SequenceI) + seqRefIds.get(seqId); - al.addGroup(sg); - } + if (ts != null) + { + seqs.addElement(ts); + } } + if (seqs.size() < 1) + { + continue; + } - ///////////////////////////////// - // LOAD VIEWPORT + jalview.datamodel.SequenceGroup sg = new jalview.datamodel. + SequenceGroup(seqs, + groups[i].getName(), cs, groups[i].getDisplayBoxes(), + groups[i].getDisplayText(), groups[i].getColourText(), + groups[i].getStart(), groups[i].getEnd()); - AlignFrame af = new AlignFrame(al, - view.getWidth(), - view.getHeight() ); + sg.setOutlineColour(new java.awt.Color( + groups[i].getOutlineColour())); - af.setFileName(file, "Jalview"); + sg.textColour = new java.awt.Color(groups[i].getTextCol1()); + sg.textColour2 = new java.awt.Color(groups[i].getTextCol2()); + sg.thresholdTextColour = groups[i].getTextColThreshold(); - for (int i = 0; i < JSEQ.length; i++) + if (groups[i].getConsThreshold() != 0) { - af.viewport.setSequenceColour( - af.viewport.alignment.getSequenceAt(i), - new java.awt.Color( - JSEQ[i].getColour())); + jalview.analysis.Conservation c = new jalview.analysis.Conservation( + "All", + ResidueProperties.propHash, 3, sg.getSequences(null), 0, + sg.getWidth() - 1); + c.calculate(); + c.verdict(false, 25); + sg.cs.setConservation(c); } - //If we just load in the same jar file again, the sequenceSetId - //will be the same, and we end up with multiple references - //to the same sequenceSet. We must modify this id on load - //so that each load of the file gives a unique id - String uniqueSeqSetId = view.getSequenceSetId()+uniqueSetSuffix; + al.addGroup(sg); + } + } - af.viewport.gatherViewsHere = view.getGatheredViews(); + ///////////////////////////////// + // LOAD VIEWPORT - if (view.getSequenceSetId() != null) - { - jalview.gui.AlignViewport av = - (jalview.gui.AlignViewport) - viewportsAdded.get(uniqueSeqSetId); + AlignFrame af = new AlignFrame(al, + view.getWidth(), + view.getHeight()); - af.viewport.sequenceSetID = uniqueSeqSetId; - if(av!=null) - { + af.setFileName(file, "Jalview"); - af.viewport.historyList = av.historyList; - af.viewport.redoList = av.redoList; - } - else - { - viewportsAdded.put(uniqueSeqSetId, af.viewport); - } + for (int i = 0; i < JSEQ.length; i++) + { + af.viewport.setSequenceColour( + af.viewport.alignment.getSequenceAt(i), + new java.awt.Color( + JSEQ[i].getColour())); + } - PaintRefresher.Register(af.alignPanel, uniqueSeqSetId); - } - if(hiddenSeqs!=null) - { - for(int s=0; s