X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML.java;h=3ac453fe3e3fe84011a2ce368627fa487bf77a16;hb=01f25e260a8c336119462420a1c2a11512293b41;hp=83936936a7cf3acacf635e012b697b9f569f759f;hpb=fd7eebe6dcf2346692d718ef91bb468cc12ebf44;p=jalview.git diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index 8393693..3ac453f 100644 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -39,6 +39,7 @@ import jalview.ext.varna.RnaModel; import jalview.gui.StructureViewer.ViewerType; import jalview.io.DataSourceType; import jalview.io.FileFormat; +import jalview.renderer.ResidueShaderI; import jalview.schemabinding.version2.AlcodMap; import jalview.schemabinding.version2.AlcodonFrame; import jalview.schemabinding.version2.Annotation; @@ -73,7 +74,6 @@ import jalview.schemabinding.version2.Tree; import jalview.schemabinding.version2.UserColours; import jalview.schemabinding.version2.Viewport; import jalview.schemes.AnnotationColourGradient; -import jalview.schemes.CollectionColourSchemeI; import jalview.schemes.ColourSchemeI; import jalview.schemes.ColourSchemeProperty; import jalview.schemes.FeatureColour; @@ -1178,7 +1178,7 @@ public class Jalview2XML ColourSchemeI colourScheme = sg.getColourScheme(); if (colourScheme != null) { - CollectionColourSchemeI groupColourScheme = sg + ResidueShaderI groupColourScheme = sg .getGroupColourScheme(); if (groupColourScheme.conservationApplied()) { @@ -1294,7 +1294,7 @@ public class Jalview2XML .getGlobalColourScheme())); } - CollectionColourSchemeI vcs = av.getViewportColourScheme(); + ResidueShaderI vcs = av.getResidueShading(); ColourSchemeI cs = av.getGlobalColourScheme(); if (cs != null) @@ -4474,15 +4474,15 @@ public class Jalview2XML } af.viewport.setGlobalColourScheme(cs); - af.viewport.getViewportColourScheme().setThreshold( + af.viewport.getResidueShading().setThreshold( view.getPidThreshold(), true); - af.viewport.getViewportColourScheme().setConsensus( + af.viewport.getResidueShading().setConsensus( af.viewport.getSequenceConsensusHash()); af.viewport.setColourAppliesToAllGroups(false); if (view.getConservationSelected() && cs != null) { - af.viewport.getViewportColourScheme().setConservationInc( + af.viewport.getResidueShading().setConservationInc( view.getConsThreshold()); }