import jalview.api.ComplexAlignFile;
import jalview.api.FeatureRenderer;
import jalview.api.FeaturesDisplayedI;
+import jalview.bin.BuildDetails;
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Annotation;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
-import jalview.json.binding.v1.AlignmentAnnotationPojo;
-import jalview.json.binding.v1.AlignmentPojo;
-import jalview.json.binding.v1.AlignmentPojo.JalviewBioJsColorSchemeMapper;
-import jalview.json.binding.v1.AnnotationPojo;
-import jalview.json.binding.v1.SequenceFeaturesPojo;
-import jalview.json.binding.v1.SequenceGrpPojo;
-import jalview.json.binding.v1.SequencePojo;
-import jalview.schemes.ColourSchemeI;
+import jalview.json.binding.biojson.v1.AlignmentAnnotationPojo;
+import jalview.json.binding.biojson.v1.AlignmentPojo;
+import jalview.json.binding.biojson.v1.AnnotationPojo;
+import jalview.json.binding.biojson.v1.ColourSchemeMapper;
+import jalview.json.binding.biojson.v1.SequenceFeaturesPojo;
+import jalview.json.binding.biojson.v1.SequenceGrpPojo;
+import jalview.json.binding.biojson.v1.SequencePojo;
import jalview.schemes.ColourSchemeProperty;
import jalview.viewmodel.seqfeatures.FeaturesDisplayed;
public class JSONFile extends AlignFile implements ComplexAlignFile
{
- private ColourSchemeI colourScheme;
+ private static String version = new BuildDetails().getVersion();
- private String version = "2.9";
-
- private String webstartUrl = "www.jalview.org/services/launchApp";
+ private String webstartUrl = "http://www.jalview.org/services/launchApp";
private String application = "Jalview";
public static final String FILE_DESC = "JSON";
- private String globalColorScheme;
+ private String globalColourScheme;
private boolean showSeqFeatures;
private ArrayList<SequenceI> hiddenSequences;
-
public JSONFile()
{
super();
parse(getReader());
}
+
@Override
public String print()
{
{
return true;
}
+
+ @Override
+ public boolean isCancelled()
+ {
+ return false;
+ }
};
}
jsonSeqPojo.setSeq(seq.getSequenceAsString());
jsonAlignmentPojo.getSeqs().add(jsonSeqPojo);
}
-
- jsonAlignmentPojo.setGlobalColorScheme(globalColorScheme);
+ jsonAlignmentPojo.setGlobalColorScheme(globalColourScheme);
jsonAlignmentPojo.getAppSettings().put("application", application);
jsonAlignmentPojo.getAppSettings().put("version", version);
jsonAlignmentPojo.getAppSettings().put("webStartUrl", webstartUrl);
if (hiddenSections != null)
{
if (hiddenSections[0] != null
- && exportSettings
- .isExportHiddenColumns())
+ && exportSettings.isExportHiddenColumns())
{
jsonAlignmentPojo.getAppSettings().put("hiddenCols",
String.valueOf(hiddenSections[0]));
}
if (hiddenSections[1] != null
- && exportSettings
- .isExportHiddenSequences())
+ && exportSettings.isExportHiddenSequences())
{
jsonAlignmentPojo.getAppSettings().put("hiddenSeqs",
String.valueOf(hiddenSections[1]));
jsonAlignmentPojo
.setAlignAnnotation(annotationToJsonPojo(annotations));
}
+ else
+ {
+ if (globalColourScheme.equalsIgnoreCase("RNA Helices"))
+ {
+ jsonAlignmentPojo.setGlobalColorScheme("None");
+ }
+ }
if (exportSettings.isExportFeatures())
{
.setSeqFeatures(sequenceFeatureToJsonPojo(seqs, fr));
}
- if (exportSettings.isExportGroups()
- && seqGroups != null
+ if (exportSettings.isExportGroups() && seqGroups != null
&& seqGroups.size() > 0)
{
for (SequenceGroup seqGrp : seqGroups)
seqGrpPojo.setShowNonconserved(seqGrp.getShowNonconserved());
for (SequenceI seq : seqGrp.getSequences())
{
- seqGrpPojo.getSeqsHash().add(String.valueOf(seq.hashCode()));
+ seqGrpPojo.getSequenceRefs()
+ .add(String.valueOf(seq.hashCode()));
}
jsonAlignmentPojo.getSeqGroups().add(seqGrpPojo);
}
public List<SequenceFeaturesPojo> sequenceFeatureToJsonPojo(
List<SequenceI> seqs, FeatureRenderer fr)
{
- displayedFeatures = (fr == null) ? null : fr
- .getFeaturesDisplayed();
+ displayedFeatures = (fr == null) ? null : fr.getFeaturesDisplayed();
List<SequenceFeaturesPojo> sequenceFeaturesPojo = new ArrayList<SequenceFeaturesPojo>();
for (SequenceI seq : seqs)
{
String.valueOf(seq.hashCode()));
String featureColour = (fr == null) ? null : jalview.util.Format
- .getHexString(fr
- .findFeatureColour(Color.white, seq,
+ .getHexString(fr.findFeatureColour(Color.white, seq,
seq.findIndex(sf.getBegin())));
jsonFeature.setXstart(seq.findIndex(sf.getBegin()) - 1);
jsonFeature.setXend(seq.findIndex(sf.getEnd()));
if (jvSettingsJsonObj != null)
{
- String jsColourScheme = (String) jvSettingsJsonObj
+ globalColourScheme = (String) jvSettingsJsonObj
.get("globalColorScheme");
Boolean showFeatures = Boolean.valueOf(jvSettingsJsonObj.get(
"showSeqFeatures").toString());
- setColourScheme(getJalviewColorScheme(jsColourScheme));
setShowSeqFeatures(showFeatures);
parseHiddenSeqRefsAsList(jvSettingsJsonObj);
parseHiddenCols(jvSettingsJsonObj);
seqs.add(seq);
seqMap.put(seqUniqueId, seq);
}
+
+
parseFeatures(jsonSeqArray);
for (Iterator<JSONObject> seqGrpIter = seqGrpJsonArray.iterator(); seqGrpIter
int startRes = Integer
.valueOf(seqGrpObj.get("startRes").toString());
int endRes = Integer.valueOf(seqGrpObj.get("endRes").toString());
- JSONArray seqsHashArray = (JSONArray) seqGrpObj.get("seqsHash");
+ JSONArray sequenceRefs = (JSONArray) seqGrpObj.get("sequenceRefs");
ArrayList<SequenceI> grpSeqs = new ArrayList<SequenceI>();
- if (seqsHashArray.size() > 0)
+ if (sequenceRefs.size() > 0)
{
- Iterator<String> seqHashIter = seqsHashArray.iterator();
+ Iterator<String> seqHashIter = sequenceRefs.iterator();
while (seqHashIter.hasNext())
{
String seqHash = seqHashIter.next();
}
}
}
- ColourSchemeI grpColourScheme = getJalviewColorScheme(colourScheme);
- SequenceGroup seqGrp = new SequenceGroup(grpSeqs, grpName,
- grpColourScheme,
- displayBoxes, displayText, colourText, startRes, endRes);
+ SequenceGroup seqGrp = new SequenceGroup(grpSeqs, grpName, null,
+ displayBoxes, displayText, colourText,
+ startRes, endRes);
+ seqGrp.cs = ColourSchemeMapper.getJalviewColourScheme(colourScheme,
+ seqGrp);
seqGrp.setShowNonconserved(showNonconserved);
seqGrp.setDescription(description);
this.seqGroups.add(seqGrp);
.valueOf(annot.get("value").toString());
String desc = annot.get("description") == null ? null : annot
.get("description").toString();
-
- char ss = annot.get("secondaryStructure") == null ? ' '
- : annot.get("secondaryStructure").toString().charAt(0);
- String displayChar = annot.get("displayCharacter").toString();
+ char ss = annot.get("secondaryStructure") == null
+ || annot.get("secondaryStructure").toString()
+ .equalsIgnoreCase("u0000") ? ' ' : annot
+ .get("secondaryStructure").toString().charAt(0);
+ String displayChar = annot.get("displayCharacter") == null ? ""
+ : annot.get("displayCharacter").toString();
annotations[count] = new Annotation(displayChar, desc, ss, val);
}
.toString(), annotations);
this.annotations.add(alignAnnot);
}
-
} catch (Exception e)
{
e.printStackTrace();
{
hiddenSeqRefs = new ArrayList<String>();
String hiddenSeqs = (String) jvSettingsJson.get("hiddenSeqs");
- if(hiddenSeqs != null && !hiddenSeqs.isEmpty()){
+ if (hiddenSeqs != null && !hiddenSeqs.isEmpty())
+ {
String[] seqRefs = hiddenSeqs.split(";");
- for(String seqRef : seqRefs){
+ for (String seqRef : seqRefs)
+ {
hiddenSeqRefs.add(seqRef);
}
}
public void parseHiddenCols(JSONObject jvSettingsJson)
{
String hiddenCols = (String) jvSettingsJson.get("hiddenCols");
- if(hiddenCols != null && !hiddenCols.isEmpty()){
+ if (hiddenCols != null && !hiddenCols.isEmpty())
+ {
columnSelection = new ColumnSelection();
String[] rangeStrings = hiddenCols.split(";");
- for(String rangeString : rangeStrings){
+ for (String rangeString : rangeStrings)
+ {
String[] range = rangeString.split("-");
columnSelection.hideColumns(Integer.valueOf(range[0]),
Integer.valueOf(range[1]));
}
}
- public static ColourSchemeI getJalviewColorScheme(
- String bioJsColourSchemeName)
+ public String getGlobalColourScheme()
{
- ColourSchemeI jalviewColor = null;
- for (JalviewBioJsColorSchemeMapper cs : JalviewBioJsColorSchemeMapper
- .values())
- {
- if (cs.getBioJsName().equalsIgnoreCase(bioJsColourSchemeName))
- {
- jalviewColor = cs.getJvColourScheme();
- break;
- }
- }
- return jalviewColor;
+ return globalColourScheme;
}
- public String getGlobalColorScheme()
+ public void setGlobalColorScheme(String globalColourScheme)
{
- return globalColorScheme;
- }
-
- public void setGlobalColorScheme(String globalColorScheme)
- {
- this.globalColorScheme = globalColorScheme;
- }
-
- public ColourSchemeI getColourScheme()
- {
- return colourScheme;
- }
-
- public void setColourScheme(ColourSchemeI colourScheme)
- {
- this.colourScheme = colourScheme;
+ this.globalColourScheme = globalColourScheme;
}
@Override
this.displayedFeatures = displayedFeatures;
}
-
public void configureForView(AlignmentViewPanel avpanel)
{
super.configureForView(avpanel);
annotations.add(annot);
}
}
- globalColorScheme = ColourSchemeProperty.getColourName(viewport
+ globalColourScheme = ColourSchemeProperty.getColourName(viewport
.getGlobalColourScheme());
setDisplayedFeatures(viewport.getFeaturesDisplayed());
showSeqFeatures = viewport.isShowSequenceFeatures();
{
if (hiddenSequences == null || hiddenSequences.isEmpty())
{
- return new SequenceI[]
- {};
+ return new SequenceI[] {};
}
synchronized (hiddenSequences)
{
git://source.jalview.org / jalview.git / blobdiff