From 9a87f772b999bac0c81d858fffcdbc4a619ab508 Mon Sep 17 00:00:00 2001 From: jprocter Date: Tue, 22 Aug 2006 08:32:40 +0000 Subject: [PATCH] off by one bug in hiden column unmarshalling --- src/jalview/gui/Jalview2XML.java | 2924 +++++++++++++++++++------------------- 1 file changed, 1462 insertions(+), 1462 deletions(-) diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index 5b8f2dd..8cf676d 100755 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -1,1462 +1,1462 @@ -/* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2006 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 - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ -package jalview.gui; - - -import jalview.schemes.*; - -import jalview.gui.*; - -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.*; - - - - -/** - * DOCUMENT ME! - * - * @author $author$ - * @version $Revision$ - */ -public class Jalview2XML -{ - // SAVES SEVERAL ALIGNEMENT WINDOWS TO SAME JARFILE - public void SaveState(File statefile) - { - long creation = System.currentTimeMillis(); - 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")); - - Vector shortNames = new Vector(); - - //REVERSE ORDER - for (int i = frames.length - 1; i > -1; i--) - { - if (frames[i] instanceof AlignFrame) - { - AlignFrame af = (AlignFrame) frames[i]; - - String shortName = af.getTitle(); - - if (shortName.indexOf(File.separatorChar) > -1) - { - shortName = shortName.substring(shortName.lastIndexOf( - File.separatorChar) + 1); - } - - int count = 1; - - while (shortNames.contains(shortName)) - { - if (shortName.endsWith("_" + (count - 1))) - { - shortName = shortName.substring(0, - shortName.lastIndexOf("_")); - } - - shortName = shortName.concat("_" + count); - count++; - } - - shortNames.addElement(shortName); - - if (!shortName.endsWith(".xml")) - { - shortName = shortName + ".xml"; - } - - SaveState(af, creation, shortName, jout, out); - } - } - - out.close(); - jout.close(); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - } - - // USE THIS METHOD TO SAVE A SINGLE ALIGNMENT WINDOW - public void SaveAlignment(AlignFrame af, String jarFile, - String fileName) - { - try - { - FileOutputStream fos = new FileOutputStream(jarFile); - JarOutputStream jout = new JarOutputStream(fos); - - //NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS - //////////////////////////////////////////////////// - PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, - "UTF-8")); - - SaveState(af, System.currentTimeMillis(), fileName, jout, out); - out.close(); - jout.close(); - } - catch (Exception ex) - { - ex.printStackTrace(); - } - } - - /** - * DOCUMENT ME! - * - * @param af DOCUMENT ME! - * @param timeStamp DOCUMENT ME! - * @param fileName DOCUMENT ME! - * @param jout DOCUMENT ME! - * @param out DOCUMENT ME! - */ - public void SaveState(AlignFrame af, long timeStamp, - String fileName, JarOutputStream jout, PrintWriter out) - { - Vector seqids = new Vector(); - Vector userColours = new Vector(); - - AlignViewport av = af.viewport; - - JalviewModel object = new JalviewModel(); - object.setVamsasModel(new jalview.schemabinding.version2.VamsasModel()); - - object.setCreationDate(new java.util.Date(timeStamp)); - object.setVersion(jalview.bin.Cache.getProperty("VERSION")); - - jalview.datamodel.AlignmentI jal = af.viewport.alignment; - jalview.datamodel.AlignmentI jalhidden = null; - - if(av.hasHiddenRows) - { - jalhidden = jal; - jal = jal.getHiddenSequences().getFullAlignment(); - } - - - SequenceSet vamsasSet = new SequenceSet(); - Sequence vamsasSeq; - JalviewModelSequence jms = new JalviewModelSequence(); - - vamsasSet.setGapChar(jal.getGapCharacter() + ""); - - JSeq jseq; - Vector pdbfiles = null; - - //SAVE SEQUENCES - int id = 0; - for (int i = 0; i < jal.getHeight(); i++) - { - seqids.add(jal.getSequenceAt(i)); - vamsasSeq = new Sequence(); - vamsasSeq.setId(id + ""); - vamsasSeq.setName(jal.getSequenceAt(i).getName()); - vamsasSeq.setSequence(jal.getSequenceAt(i).getSequence()); - vamsasSeq.setDescription(jal.getSequenceAt(i).getDescription()); - - if(jal.getSequenceAt(i).getDatasetSequence().getDBRef()!=null) - { - jalview.datamodel.DBRefEntry [] dbrefs = - jal.getSequenceAt(i).getDatasetSequence().getDBRef(); - - for(int d=0; d0) - { - 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; - } - - 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 + - ""); - - if(aa[i].annotations[a].colour!=java.awt.Color.black) - ae.setColour(aa[i].annotations[a].colour.getRGB()); - - an.addAnnotationElement(ae); - } - - vamsasSet.addAnnotation(an); - } - } - - //SAVE GROUPS - if (jal.getGroups() != null) - { - JGroup[] groups = new JGroup[jal.getGroups().size()]; - - for (int i = 0; i < groups.length; i++) - { - 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()); - - for (int s = 0; s < sg.getSize(false); s++) - { - jalview.datamodel.Sequence seq = (jalview.datamodel.Sequence) sg.getSequenceAt(s); - int index = seqids.indexOf(seq); - groups[i].addSeq(index); - } - } - - jms.setJGroup(groups); - } - - - ///////////SAVE VIEWPORT - Viewport view = new Viewport(); - view.setTitle(af.getTitle()); - view.setXpos(af.getX()); - view.setYpos(af.getY()); - view.setWidth(af.getWidth()); - view.setHeight(af.getHeight()); - view.setStartRes(av.startRes); - view.setStartSeq(av.startSeq); - - if (av.getGlobalColourScheme() instanceof jalview.schemes.UserColourScheme) - { - view.setBgColour(SetUserColourScheme(av.getGlobalColourScheme(), - userColours, jms)); - } - 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 - { - view.setBgColour(ColourSchemeProperty.getColourName( - av.getGlobalColourScheme())); - } - - ColourSchemeI cs = av.getGlobalColourScheme(); - - if(cs!=null) - { - if (cs.conservationApplied()) - { - view.setConsThreshold(cs.getConservationInc()); - if (cs instanceof jalview.schemes.UserColourScheme) - view.setBgColour(SetUserColourScheme(cs, userColours, jms)); - } - - if (cs instanceof ResidueColourScheme) - { - view.setPidThreshold(cs.getThreshold()); - } - } - - 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.setShowConservation(av.showConservation); - view.setShowFullId(av.getShowJVSuffix()); - view.setShowIdentity(av.showIdentity); - view.setShowQuality(av.showQuality); - view.setShowSequenceFeatures(av.showSequenceFeatures); - view.setShowText(av.getShowText()); - view.setWrapAlignment(av.getWrapAlignment()); - - if(av.featuresDisplayed!=null) - { - jalview.schemabinding.version2.FeatureSettings fs - = new jalview.schemabinding.version2.FeatureSettings(); - - String [] renderOrder = - af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().renderOrder; - - Vector settingsAdded = new Vector(); - for(int ro=0; ro 0) - { - Features[] features = JSEQ[i].getFeatures(); - for (int f = 0; f < features.length; f++) - { - 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 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) - { - 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); - } - } - if(vamsasSeq[i].getDBRefCount()>0) - { - for(int d=0; d 0) - { - JGroup[] groups = jms.getJGroup(); - - for (int i = 0; i < groups.length; i++) - { - ColourSchemeI cs = null; - - 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(cs!=null) - cs.setThreshold(groups[i].getPidThreshold(), true); - } - - Vector seqs = new Vector(); - int[] ids = groups[i].getSeq(); - - for (int s = 0; s < ids.length; s++) - { - seqs.addElement((jalview.datamodel.SequenceI) seqids.elementAt( - ids[s])); - } - - 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()); - - sg.setOutlineColour(new java.awt.Color( - groups[i].getOutlineColour())); - - 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); - } - - al.addGroup(sg); - } - } - - - ///////////////////////////////// - // LOAD VIEWPORT - Viewport[] views = jms.getViewport(); - Viewport view = views[0]; // DEAL WITH MULTIPLE VIEWPORTS LATER - - - AlignFrame af = new AlignFrame(al); - - if(hiddenSeqs!=null) - { - for(int s=0; s 0) - { - for (int c = 0; c < view.getHiddenColumnsCount(); c++) - { - af.viewport.hideColumns( - view.getHiddenColumns(c).getStart(), - view.getHiddenColumns(c).getEnd()+1 - ); - } - } - - - Desktop.addInternalFrame(af, view.getTitle(), - view.getWidth(), view.getHeight()); - - //LOAD TREES - /////////////////////////////////////// - if (jms.getTreeCount() > 0) - { - try - { - for (int t = 0; t < jms.getTreeCount(); t++) - { - - Tree tree = jms.getTree(t); - - TreePanel tp = af.ShowNewickTree(new jalview.io.NewickFile( - tree.getNewick()), tree.getTitle(), - tree.getWidth(), tree.getHeight(), - tree.getXpos(), tree.getYpos()); - - tp.fitToWindow.setState(tree.getFitToWindow()); - tp.fitToWindow_actionPerformed(null); - - if(tree.getFontName()!=null) - tp.setTreeFont(new java.awt.Font(tree.getFontName(), - tree.getFontStyle(), - tree.getFontSize())); - else - tp.setTreeFont(new java.awt.Font(view.getFontName(), - view.getFontStyle(), - tree.getFontSize())); - - tp.showPlaceholders(tree.getMarkUnlinked()); - tp.showBootstrap(tree.getShowBootstrap()); - tp.showDistances(tree.getShowDistances()); - - tp.treeCanvas.threshold = tree.getThreshold(); - - if (tree.getCurrentTree()) - af.viewport.setCurrentTree(tp.getTree()); - } - - } - catch (Exception ex) - { - ex.printStackTrace(); - } - - } - - return af; - } -} - +/* + * Jalview - A Sequence Alignment Editor and Viewer + * Copyright (C) 2006 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 + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ +package jalview.gui; + + +import jalview.schemes.*; + +import jalview.gui.*; + +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.*; + + + + +/** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ +public class Jalview2XML +{ + // SAVES SEVERAL ALIGNEMENT WINDOWS TO SAME JARFILE + public void SaveState(File statefile) + { + long creation = System.currentTimeMillis(); + 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")); + + Vector shortNames = new Vector(); + + //REVERSE ORDER + for (int i = frames.length - 1; i > -1; i--) + { + if (frames[i] instanceof AlignFrame) + { + AlignFrame af = (AlignFrame) frames[i]; + + String shortName = af.getTitle(); + + if (shortName.indexOf(File.separatorChar) > -1) + { + shortName = shortName.substring(shortName.lastIndexOf( + File.separatorChar) + 1); + } + + int count = 1; + + while (shortNames.contains(shortName)) + { + if (shortName.endsWith("_" + (count - 1))) + { + shortName = shortName.substring(0, + shortName.lastIndexOf("_")); + } + + shortName = shortName.concat("_" + count); + count++; + } + + shortNames.addElement(shortName); + + if (!shortName.endsWith(".xml")) + { + shortName = shortName + ".xml"; + } + + SaveState(af, creation, shortName, jout, out); + } + } + + out.close(); + jout.close(); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + + // USE THIS METHOD TO SAVE A SINGLE ALIGNMENT WINDOW + public void SaveAlignment(AlignFrame af, String jarFile, + String fileName) + { + try + { + FileOutputStream fos = new FileOutputStream(jarFile); + JarOutputStream jout = new JarOutputStream(fos); + + //NOTE UTF-8 MUST BE USED FOR WRITING UNICODE CHARS + //////////////////////////////////////////////////// + PrintWriter out = new PrintWriter(new OutputStreamWriter(jout, + "UTF-8")); + + SaveState(af, System.currentTimeMillis(), fileName, jout, out); + out.close(); + jout.close(); + } + catch (Exception ex) + { + ex.printStackTrace(); + } + } + + /** + * DOCUMENT ME! + * + * @param af DOCUMENT ME! + * @param timeStamp DOCUMENT ME! + * @param fileName DOCUMENT ME! + * @param jout DOCUMENT ME! + * @param out DOCUMENT ME! + */ + public void SaveState(AlignFrame af, long timeStamp, + String fileName, JarOutputStream jout, PrintWriter out) + { + Vector seqids = new Vector(); + Vector userColours = new Vector(); + + AlignViewport av = af.viewport; + + JalviewModel object = new JalviewModel(); + object.setVamsasModel(new jalview.schemabinding.version2.VamsasModel()); + + object.setCreationDate(new java.util.Date(timeStamp)); + object.setVersion(jalview.bin.Cache.getProperty("VERSION")); + + jalview.datamodel.AlignmentI jal = af.viewport.alignment; + jalview.datamodel.AlignmentI jalhidden = null; + + if(av.hasHiddenRows) + { + jalhidden = jal; + jal = jal.getHiddenSequences().getFullAlignment(); + } + + + SequenceSet vamsasSet = new SequenceSet(); + Sequence vamsasSeq; + JalviewModelSequence jms = new JalviewModelSequence(); + + vamsasSet.setGapChar(jal.getGapCharacter() + ""); + + JSeq jseq; + Vector pdbfiles = null; + + //SAVE SEQUENCES + int id = 0; + for (int i = 0; i < jal.getHeight(); i++) + { + seqids.add(jal.getSequenceAt(i)); + vamsasSeq = new Sequence(); + vamsasSeq.setId(id + ""); + vamsasSeq.setName(jal.getSequenceAt(i).getName()); + vamsasSeq.setSequence(jal.getSequenceAt(i).getSequence()); + vamsasSeq.setDescription(jal.getSequenceAt(i).getDescription()); + + if(jal.getSequenceAt(i).getDatasetSequence().getDBRef()!=null) + { + jalview.datamodel.DBRefEntry [] dbrefs = + jal.getSequenceAt(i).getDatasetSequence().getDBRef(); + + for(int d=0; d0) + { + 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; + } + + 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 + + ""); + + if(aa[i].annotations[a].colour!=java.awt.Color.black) + ae.setColour(aa[i].annotations[a].colour.getRGB()); + + an.addAnnotationElement(ae); + } + + vamsasSet.addAnnotation(an); + } + } + + //SAVE GROUPS + if (jal.getGroups() != null) + { + JGroup[] groups = new JGroup[jal.getGroups().size()]; + + for (int i = 0; i < groups.length; i++) + { + 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()); + + for (int s = 0; s < sg.getSize(false); s++) + { + jalview.datamodel.Sequence seq = (jalview.datamodel.Sequence) sg.getSequenceAt(s); + int index = seqids.indexOf(seq); + groups[i].addSeq(index); + } + } + + jms.setJGroup(groups); + } + + + ///////////SAVE VIEWPORT + Viewport view = new Viewport(); + view.setTitle(af.getTitle()); + view.setXpos(af.getX()); + view.setYpos(af.getY()); + view.setWidth(af.getWidth()); + view.setHeight(af.getHeight()); + view.setStartRes(av.startRes); + view.setStartSeq(av.startSeq); + + if (av.getGlobalColourScheme() instanceof jalview.schemes.UserColourScheme) + { + view.setBgColour(SetUserColourScheme(av.getGlobalColourScheme(), + userColours, jms)); + } + 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 + { + view.setBgColour(ColourSchemeProperty.getColourName( + av.getGlobalColourScheme())); + } + + ColourSchemeI cs = av.getGlobalColourScheme(); + + if(cs!=null) + { + if (cs.conservationApplied()) + { + view.setConsThreshold(cs.getConservationInc()); + if (cs instanceof jalview.schemes.UserColourScheme) + view.setBgColour(SetUserColourScheme(cs, userColours, jms)); + } + + if (cs instanceof ResidueColourScheme) + { + view.setPidThreshold(cs.getThreshold()); + } + } + + 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.setShowConservation(av.showConservation); + view.setShowFullId(av.getShowJVSuffix()); + view.setShowIdentity(av.showIdentity); + view.setShowQuality(av.showQuality); + view.setShowSequenceFeatures(av.showSequenceFeatures); + view.setShowText(av.getShowText()); + view.setWrapAlignment(av.getWrapAlignment()); + + if(av.featuresDisplayed!=null) + { + jalview.schemabinding.version2.FeatureSettings fs + = new jalview.schemabinding.version2.FeatureSettings(); + + String [] renderOrder = + af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().renderOrder; + + Vector settingsAdded = new Vector(); + for(int ro=0; ro 0) + { + Features[] features = JSEQ[i].getFeatures(); + for (int f = 0; f < features.length; f++) + { + 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 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) + { + 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); + } + } + if(vamsasSeq[i].getDBRefCount()>0) + { + for(int d=0; d 0) + { + JGroup[] groups = jms.getJGroup(); + + for (int i = 0; i < groups.length; i++) + { + ColourSchemeI cs = null; + + 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(cs!=null) + cs.setThreshold(groups[i].getPidThreshold(), true); + } + + Vector seqs = new Vector(); + int[] ids = groups[i].getSeq(); + + for (int s = 0; s < ids.length; s++) + { + seqs.addElement((jalview.datamodel.SequenceI) seqids.elementAt( + ids[s])); + } + + 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()); + + sg.setOutlineColour(new java.awt.Color( + groups[i].getOutlineColour())); + + 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); + } + + al.addGroup(sg); + } + } + + + ///////////////////////////////// + // LOAD VIEWPORT + Viewport[] views = jms.getViewport(); + Viewport view = views[0]; // DEAL WITH MULTIPLE VIEWPORTS LATER + + + AlignFrame af = new AlignFrame(al); + + if(hiddenSeqs!=null) + { + for(int s=0; s 0) + { + for (int c = 0; c < view.getHiddenColumnsCount(); c++) + { + af.viewport.hideColumns( + view.getHiddenColumns(c).getStart(), + view.getHiddenColumns(c).getEnd() //+1 + ); + } + } + + + Desktop.addInternalFrame(af, view.getTitle(), + view.getWidth(), view.getHeight()); + + //LOAD TREES + /////////////////////////////////////// + if (jms.getTreeCount() > 0) + { + try + { + for (int t = 0; t < jms.getTreeCount(); t++) + { + + Tree tree = jms.getTree(t); + + TreePanel tp = af.ShowNewickTree(new jalview.io.NewickFile( + tree.getNewick()), tree.getTitle(), + tree.getWidth(), tree.getHeight(), + tree.getXpos(), tree.getYpos()); + + tp.fitToWindow.setState(tree.getFitToWindow()); + tp.fitToWindow_actionPerformed(null); + + if(tree.getFontName()!=null) + tp.setTreeFont(new java.awt.Font(tree.getFontName(), + tree.getFontStyle(), + tree.getFontSize())); + else + tp.setTreeFont(new java.awt.Font(view.getFontName(), + view.getFontStyle(), + tree.getFontSize())); + + tp.showPlaceholders(tree.getMarkUnlinked()); + tp.showBootstrap(tree.getShowBootstrap()); + tp.showDistances(tree.getShowDistances()); + + tp.treeCanvas.threshold = tree.getThreshold(); + + if (tree.getCurrentTree()) + af.viewport.setCurrentTree(tp.getTree()); + } + + } + catch (Exception ex) + { + ex.printStackTrace(); + } + + } + + return af; + } +} + -- 1.7.10.2