X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML.java;h=81a68871e39025419c14d0b850f5b30c29d0690f;hb=cc4553c3b742463f2b325b2219480b304ce662cb;hp=a449d7f0e15136e9ba17199bdce34f6a5b073d8e;hpb=f7bcceb4efd723c25d5169fd2fa139b3610eb84e;p=jalview.git diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index a449d7f..81a6887 100755 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -18,8 +18,6 @@ */ package jalview.gui; -import jalview.binding.*; - import jalview.io.*; import jalview.schemes.*; @@ -29,10 +27,13 @@ import java.io.*; import java.net.*; import java.util.*; + import java.util.jar.*; import javax.swing.*; +import jalview.binding.*; + /** * DOCUMENT ME! @@ -156,7 +157,7 @@ public class Jalview2XML AlignViewport av = af.viewport; JalviewModel object = new JalviewModel(); - object.setVamsasModel(new VamsasModel()); + object.setVamsasModel(new jalview.binding.VamsasModel()); object.setCreationDate(new java.util.Date(timeStamp)); object.setVersion(jalview.bin.Cache.getProperty("VERSION")); @@ -191,6 +192,56 @@ public class Jalview2XML jseq.setId(id); + if(jal.getSequenceAt(i).getDatasetSequence().getSequenceFeatures()!=null) + { + Enumeration en = jal.getSequenceAt(i).getDatasetSequence().getSequenceFeatures().elements(); + while(en.hasMoreElements()) + { + Features features = new Features(); + jalview.datamodel.SequenceFeature sf + = (jalview.datamodel.SequenceFeature)en.nextElement(); + + features.setBegin(sf.getBegin()); + features.setEnd(sf.getEnd()); + features.setDescription(sf.getDescription()); + features.setStatus(sf.getStatus()); + features.setType(sf.getType()); + jseq.addFeatures(features); + } + } + + if(jal.getSequenceAt(i).getDatasetSequence().getPDBId()!=null) + { + Enumeration en = jal.getSequenceAt(i).getDatasetSequence().getPDBId().elements(); + while(en.hasMoreElements()) + { + Pdbids pdb = new Pdbids(); + jalview.datamodel.PDBEntry entry + = (jalview.datamodel.PDBEntry)en.nextElement(); + + pdb.setId(entry.getId()); + pdb.setType(entry.getType()); + + if(entry.getProperty()!=null) + { + 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); + } + + jseq.addPdbids(pdb); + } + } + jms.addJSeq(jseq); vamsasSet.addSequence(vamsasSeq); id++; @@ -221,8 +272,11 @@ public class Jalview2XML tree.setThreshold(tp.treeCanvas.threshold); tree.setFitToWindow(tp.fitToWindow.getState()); - tree.setFontSize(tp.treeCanvas.fontSize); + 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()); @@ -254,7 +308,11 @@ public class Jalview2XML Annotation an = new Annotation(); an.setDescription(aa[i].description); - an.setGraph(aa[i].isGraph); + if(aa[i].graph>0) + { + an.setGraph(true); + an.setGraphType(aa[i].graph); + } an.setLabel(aa[i].label); AnnotationElement ae; @@ -294,38 +352,38 @@ public class Jalview2XML groups[i].setStart(sg.getStartRes()); groups[i].setEnd(sg.getEndRes()); groups[i].setName(sg.getName()); - - if (sg.cs instanceof ConservationColourScheme) + if(sg.cs!=null) { - ConservationColourScheme ccs = (ConservationColourScheme) sg.cs; - groups[i].setConsThreshold(ccs.inc); - - if (ccs.cs instanceof jalview.schemes.UserColourScheme) + if (sg.cs.conservationApplied()) { - groups[i].setColour(SetUserColourScheme(ccs.cs, userColours, - jms)); - } - - } + groups[i].setConsThreshold(sg.cs.getConservationInc()); - else if (sg.cs instanceof jalview.schemes.UserColourScheme) - { + 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.UserColourScheme) + { groups[i].setColour(SetUserColourScheme(sg.cs, userColours, - jms)); - } - else - { - groups[i].setColour(ColourSchemeProperty.getColourName( - sg.cs)); - } + jms)); + } + else + { + groups[i].setColour(ColourSchemeProperty.getColourName( + sg.cs)); + } - if (sg.cs instanceof ResidueColourScheme) - { - groups[i].setPidThreshold(((ResidueColourScheme) sg.cs).getThreshold()); + groups[i].setPidThreshold(sg.cs.getThreshold()); } - - groups[i].setOutlineColour(sg.getOutlineColour().getRGB()); groups[i].setDisplayBoxes(sg.getDisplayBoxes()); groups[i].setDisplayText(sg.getDisplayText()); @@ -342,6 +400,7 @@ public class Jalview2XML jms.setJGroup(groups); } + ///////////SAVE VIEWPORT Viewport view = new Viewport(); view.setTitle(af.getTitle()); @@ -365,17 +424,19 @@ public class Jalview2XML ColourSchemeI cs = av.getGlobalColourScheme(); - if (cs instanceof ConservationColourScheme) + if(cs!=null) { - ConservationColourScheme ccs = (ConservationColourScheme)cs; - view.setConsThreshold(ccs.inc); - if(ccs.cs instanceof jalview.schemes.UserColourScheme) - view.setBgColour(SetUserColourScheme(ccs.cs, userColours, jms)); - } + 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(((ResidueColourScheme) cs).getThreshold()); + if (cs instanceof ResidueColourScheme) + { + view.setPidThreshold(cs.getThreshold()); + } } view.setConservationSelected(av.getConservationSelected()); @@ -388,15 +449,40 @@ public class Jalview2XML view.setShowBoxes(av.getShowBoxes()); view.setShowColourText(av.getColourText()); view.setShowConservation(av.showConservation); - view.setShowFullId(av.getShowFullId()); + 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(af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed!=null) + { + jalview.binding.FeatureSettings fs = new jalview.binding.FeatureSettings(); + + Enumeration e = af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().featureColours.keys(); + while (e.hasMoreElements()) + { + String type = e.nextElement().toString(); + Setting setting = new Setting(); + setting.setType(type); + setting.setColour( + af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().getColour(type).getRGB() + ); + setting.setDisplay( + af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed.contains(type) + ); + + fs.addSetting(setting); + + } + jms.setFeatureSettings(fs); + + } + jms.addViewport(view); + object.setJalviewModelSequence(jms); object.getVamsasModel().addSequenceSet(vamsasSet); @@ -526,14 +612,25 @@ public class Jalview2XML } while (jarentry != null); } + catch(java.net.UnknownHostException ex) + { + ex.printStackTrace(); + System.err.println("Couldn't locate Jalview XML file : " + + ex + "\n"); + JOptionPane.showInternalMessageDialog(Desktop.desktop, + "Couldn't locate " + file, + "URL not found", + JOptionPane.WARNING_MESSAGE); + + } catch (Exception ex) { ex.printStackTrace(); System.err.println("Exception whilst loading jalview XML file : " + ex + "\n"); JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Couldn't locate " + file, - "URL not found", + "Error loading " + file, + "Error loading Jalview file", JOptionPane.WARNING_MESSAGE); } @@ -553,7 +650,6 @@ public class Jalview2XML //LOAD SEQUENCES jalview.datamodel.Sequence[] jseqs = new jalview.datamodel.Sequence[vamsasSeq.length]; JSeq[] JSEQ = object.getJalviewModelSequence().getJSeq(); - for (int i = 0; i < vamsasSeq.length; i++) { jseqs[i] = new jalview.datamodel.Sequence(vamsasSeq[i].getName(), @@ -565,9 +661,41 @@ public class Jalview2XML seqids.add(jseqs[i]); } + ///SequenceFeatures are added to the DatasetSequence, + // so we must create the dataset before loading features ///////////////////////////////// jalview.datamodel.Alignment al = new jalview.datamodel.Alignment(jseqs); + al.setDataset(null); + ///////////////////////////////// + + for (int i = 0; i < vamsasSeq.length; i++) + { + if (JSEQ[i].getFeaturesCount() > 0) + { + Features[] features = JSEQ[i].getFeatures(); + for (int f = 0; f < features.length; f++) + { + //features[f].getBegin() + jalview.datamodel.SequenceFeature sf + = new jalview.datamodel.SequenceFeature(features[f].getType(), + features[f].getDescription(), features[f].getStatus(), + features[f].getBegin(), features[f].getEnd()); + 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()); + al.getSequenceAt(i).getDatasetSequence().addPDBId(entry); + } + } + } ///////////////////////////////// ////////////////////////////////// //LOAD ANNOTATIONS @@ -593,7 +721,8 @@ public class Jalview2XML if (an[i].getGraph()) { jaa = new jalview.datamodel.AlignmentAnnotation(an[i].getLabel(), - an[i].getDescription(), anot, 0, 0, 1); + an[i].getDescription(), anot, 0, 0, + an[i].getGraphType()); } else { @@ -612,6 +741,7 @@ public class Jalview2XML AlignFrame af = new AlignFrame(al); + // af.changeColour() ); ///////////////////////// //LOAD GROUPS @@ -635,10 +765,7 @@ public class Jalview2XML groups[i].getColour()); } - if (cs instanceof ResidueColourScheme) - { - ((ResidueColourScheme) cs).setThreshold(groups[i].getPidThreshold(), true); - } + cs.setThreshold(groups[i].getPidThreshold(), true); } Vector seqs = new Vector(); @@ -665,20 +792,19 @@ public class Jalview2XML sg.getWidth() - 1); c.calculate(); c.verdict(false, 25); - cs = new ConservationColourScheme(c, cs); - sg.cs = cs; + sg.cs.setConservation(c); } al.addGroup(sg); } } - Desktop.addInternalFrame(af, view.getTitle(), - AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT); + af.setBounds(view.getXpos(), view.getYpos(), view.getWidth(), view.getHeight()); af.viewport.setStartRes(view.getStartRes()); af.viewport.setStartSeq(view.getStartSeq()); + af.viewport.setShowAnnotation(view.getShowAnnotation()); af.viewport.showConservation = view.getShowConservation(); af.viewport.showQuality = view.getShowQuality(); af.viewport.showIdentity = view.getShowIdentity(); @@ -689,8 +815,8 @@ public class Jalview2XML af.viewport.setConservationSelected(view.getConservationSelected()); af.conservationMenuItem.setSelected(view.getConservationSelected()); - af.viewport.setShowFullId(view.getShowFullId()); - af.fullSeqId.setSelected(view.getShowFullId()); + af.viewport.setShowJVSuffix(view.getShowFullId()); + af.seqLimits.setSelected(view.getShowFullId()); af.viewport.setFont(new java.awt.Font(view.getFontName(), view.getFontStyle(), view.getFontSize())); @@ -731,34 +857,50 @@ public class Jalview2XML cs = ColourSchemeProperty.getColour(al, view.getBgColour()); } - if (cs instanceof ResidueColourScheme) - { - ((ResidueColourScheme) cs).setThreshold(view.getPidThreshold(), true); - } - if(cs!=null) + { + cs.setThreshold(view.getPidThreshold(), true); cs.setConsensus(af.viewport.vconsensus); + } } af.setColourSelected(view.getBgColour()); af.viewport.setGlobalColourScheme(cs); af.viewport.setColourAppliesToAllGroups(false); - af.changeColour(af.viewport.getGlobalColourScheme()); - if (view.getConservationSelected()) + af.changeColour(cs); + if (view.getConservationSelected() && cs!=null) { - ( (ConservationColourScheme) af.viewport.getGlobalColourScheme()).inc = view.getConsThreshold(); + cs.setConservationInc(view.getConsThreshold()); } af.viewport.setColourAppliesToAllGroups(true); if (view.getShowSequenceFeatures()) { - af.viewport.showSequenceFeatures = true; - af.sequenceFeatures.setSelected(true); - new SequenceFeatureFetcher(al, af.alignPanel); - al.featuresAdded = true; + af.featureSettings.setEnabled(true); + af.viewport.showSequenceFeatures = true; + af.sequenceFeatures.setSelected(true); + } + + if(jms.getFeatureSettings()!=null) + { + af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed = new Vector(); + // af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed!=null) + // jalview.binding.FeatureSettings fs = new jalview.binding.FeatureSettings(); + for(int fs=0; fs 0) @@ -767,35 +909,44 @@ public class Jalview2XML { 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()); - - tp.setBounds(tree.getXpos(), tree.getYpos(), - tree.getWidth(), tree.getHeight()); + tree.getNewick()), tree.getTitle(), + tree.getWidth(), tree.getHeight(), + tree.getXpos(), tree.getYpos()); tp.fitToWindow.setState(tree.getFitToWindow()); tp.fitToWindow_actionPerformed(null); - tp.treeCanvas.fontSize = tree.getFontSize(); - tp.fontSize.setText("Font Size - " + tree.getFontSize()); - tp.placeholdersMenu.setState(tree.getMarkUnlinked()); - tp.placeholdersMenu_actionPerformed(null); - tp.bootstrapMenu.setState(tree.getShowBootstrap()); - tp.bootstrapMenu_actionPerformed(null); - tp.distanceMenu.setState(tree.getShowDistances()); - tp.distanceMenu_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; } }