import jalview.api.AlignmentViewPanel;
import jalview.api.ComplexAlignFile;
import jalview.api.FeatureRenderer;
+import jalview.api.FeatureSettingsModelI;
import jalview.api.FeaturesDisplayedI;
import jalview.bin.BuildDetails;
import jalview.datamodel.AlignmentAnnotation;
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.schemes.UserColourScheme;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
+import jalview.schemes.JalviewColourScheme;
+import jalview.schemes.ResidueColourScheme;
+import jalview.util.ColorUtils;
import jalview.viewmodel.seqfeatures.FeaturesDisplayed;
import java.awt.Color;
private String application = "Jalview";
- public static final String FILE_EXT = "json";
-
- public static final String FILE_DESC = "JSON";
-
private String globalColourScheme;
private boolean showSeqFeatures;
super(source);
}
- public JSONFile(String inFile, String type) throws IOException
+ public JSONFile(String inFile, DataSourceType sourceType)
+ throws IOException
{
- super(inFile, type);
+ super(inFile, sourceType);
}
@Override
}
@Override
- public String print()
+ public String print(SequenceI[] sqs, boolean jvsuffix)
{
String jsonOutput = null;
try
}
int count = 0;
- for (SequenceI seq : seqs)
+ for (SequenceI seq : sqs)
{
StringBuilder name = new StringBuilder();
name.append(seq.getName()).append("/").append(seq.getStart())
{
// These color schemes require annotation, disable them if annotations
// are not exported
- if (globalColourScheme.equalsIgnoreCase("RNA Helices")
- || globalColourScheme.equalsIgnoreCase("T-COFFEE SCORES"))
+ if (globalColourScheme
+ .equalsIgnoreCase(JalviewColourScheme.RNAHelices.toString())
+ || globalColourScheme
+ .equalsIgnoreCase(JalviewColourScheme.TCoffee
+ .toString()))
{
- jsonAlignmentPojo.setGlobalColorScheme("None");
+ jsonAlignmentPojo.setGlobalColorScheme(ResidueColourScheme.NONE);
}
}
if (exportSettings.isExportFeatures())
{
jsonAlignmentPojo
- .setSeqFeatures(sequenceFeatureToJsonPojo(seqs, fr));
+ .setSeqFeatures(sequenceFeatureToJsonPojo(sqs, fr));
}
if (exportSettings.isExportGroups() && seqGroups != null
{
SequenceGrpPojo seqGrpPojo = new SequenceGrpPojo();
seqGrpPojo.setGroupName(seqGrp.getName());
- seqGrpPojo.setColourScheme(ColourSchemeProperty
- .getColourName(seqGrp.cs));
+ seqGrpPojo.setColourScheme(seqGrp.getColourScheme()
+ .getSchemeName());
seqGrpPojo.setColourText(seqGrp.getColourText());
seqGrpPojo.setDescription(seqGrp.getDescription());
seqGrpPojo.setDisplayBoxes(seqGrp.getDisplayBoxes());
}
public List<SequenceFeaturesPojo> sequenceFeatureToJsonPojo(
- List<SequenceI> seqs, FeatureRenderer fr)
+ SequenceI[] sqs, FeatureRenderer fr)
{
displayedFeatures = (fr == null) ? null : fr.getFeaturesDisplayed();
List<SequenceFeaturesPojo> sequenceFeaturesPojo = new ArrayList<SequenceFeaturesPojo>();
- for (SequenceI seq : seqs)
+ if (sqs == null)
+ {
+ return sequenceFeaturesPojo;
+ }
+
+ FeatureColourFinder finder = new FeatureColourFinder(fr);
+
+ for (SequenceI seq : sqs)
{
SequenceI dataSetSequence = seq.getDatasetSequence();
SequenceFeature[] seqFeatures = (dataSetSequence == null) ? null
String.valueOf(seq.hashCode()));
String featureColour = (fr == null) ? null : jalview.util.Format
- .getHexString(fr.findFeatureColour(Color.white, seq,
+ .getHexString(finder.findFeatureColour(Color.white, seq,
seq.findIndex(sf.getBegin())));
jsonFeature.setXstart(seq.findIndex(sf.getBegin()) - 1);
jsonFeature.setXend(seq.findIndex(sf.getEnd()));
AlignmentAnnotationPojo alignAnnotPojo = new AlignmentAnnotationPojo();
alignAnnotPojo.setDescription(annot.description);
alignAnnotPojo.setLabel(annot.label);
- alignAnnotPojo.setScore(annot.score);
+ if (!Double.isNaN(annot.score))
+ {
+ alignAnnotPojo.setScore(annot.score);
+ }
alignAnnotPojo.setCalcId(annot.getCalcId());
alignAnnotPojo.setGraphType(annot.graph);
AnnotationDisplaySettingPojo annotSetting = new AnnotationDisplaySettingPojo();
annotSetting.setBelowAlignment(annot.belowAlignment);
annotSetting.setCentreColLabels(annot.centreColLabels);
- annotSetting.setScaleColLabel(annot.centreColLabels);
+ annotSetting.setScaleColLabel(annot.scaleColLabel);
annotSetting.setShowAllColLabels(annot.showAllColLabels);
annotSetting.setVisible(annot.visible);
+ annotSetting.setHasIcon(annot.hasIcons);
alignAnnotPojo.setAnnotationSettings(annotSetting);
SequenceI refSeq = annot.sequenceRef;
if (refSeq != null)
annotationPojo.setValue(annotation.value);
annotationPojo
.setSecondaryStructure(annotation.secondaryStructure);
- annotationPojo.setDisplayCharacter(annotation.displayCharacter);
+ String displayChar = annotation.displayCharacter == null ? null
+ : annotation.displayCharacter;
+ // System.out.println("--------------------->[" + displayChar + "]");
+ annotationPojo.setDisplayCharacter(displayChar);
if (annotation.colour != null)
{
annotationPojo.setColour(jalview.util.Format
seqMap.put(seqUniqueId, seq);
}
-
parseFeatures(jsonSeqArray);
for (Iterator<JSONObject> seqGrpIter = seqGrpJsonArray.iterator(); seqGrpIter
}
}
SequenceGroup seqGrp = new SequenceGroup(grpSeqs, grpName, null,
- displayBoxes, displayText, colourText,
- startRes, endRes);
- seqGrp.cs = ColourSchemeMapper.getJalviewColourScheme(colourScheme,
- seqGrp);
+ displayBoxes, displayText, colourText, startRes, endRes);
+ seqGrp.setColourScheme(ColourSchemeMapper.getJalviewColourScheme(
+ colourScheme, seqGrp));
seqGrp.setShowNonconserved(showNonconserved);
seqGrp.setDescription(description);
this.seqGroups.add(seqGrp);
.hasNext();)
{
JSONObject alAnnot = alAnnotIter.next();
- if (alAnnot == null)
- {
- continue;
- }
-
JSONArray annotJsonArray = (JSONArray) alAnnot.get("annotations");
Annotation[] annotations = new Annotation[annotJsonArray.size()];
int count = 0;
.get("secondaryStructure").toString().charAt(0);
String displayChar = annot.get("displayCharacter") == null ? ""
: annot.get("displayCharacter").toString();
- Color color = annot.get("colour") == null ? Color.white
- : UserColourScheme.getColourFromString(annot.get(
- "colour").toString());
- annotations[count] = new Annotation(displayChar, desc, ss, val,
- color);
+
+ annotations[count] = new Annotation(displayChar, desc, ss, val);
+ if (annot.get("colour") != null)
+ {
+ Color color = ColorUtils.parseColourString(annot.get(
+ "colour").toString());
+ annotations[count].colour = color;
+ }
}
++count;
}
.get("label").toString(), alAnnot.get("description")
.toString(), annotations);
alignAnnot.graph = (alAnnot.get("graphType") == null) ? 0 : Integer
- .valueOf(alAnnot.get("graphType")
- .toString());
+ .valueOf(alAnnot.get("graphType").toString());
JSONObject diplaySettings = (JSONObject) alAnnot
.get("annotationSettings");
alignAnnot.visible = (diplaySettings.get("visible") == null) ? true
: Boolean.valueOf(diplaySettings.get("visible")
.toString());
+ alignAnnot.hasIcons = (diplaySettings.get("hasIcon") == null) ? true
+ : Boolean.valueOf(diplaySettings.get("hasIcon")
+ .toString());
}
if (alAnnot.get("score") != null)
alignAnnot.adjustForAlignment();
}
}
+ alignAnnot.validateRangeAndDisplay();
this.annotations.add(alignAnnot);
+
}
} catch (Exception e)
{
}
}
+ @Override
public String getGlobalColourScheme()
{
return globalColourScheme;
this.displayedFeatures = displayedFeatures;
}
+ @Override
public void configureForView(AlignmentViewPanel avpanel)
{
+ if (avpanel == null)
+ {
+ return;
+ }
super.configureForView(avpanel);
AlignViewportI viewport = avpanel.getAlignViewport();
AlignmentI alignment = viewport.getAlignment();
fr = avpanel.cloneFeatureRenderer();
// Add non auto calculated annotation to AlignFile
- for (AlignmentAnnotation annot : annots)
+ if (annots != null)
{
- if (annot != null && !annot.autoCalculated)
+ for (AlignmentAnnotation annot : annots)
{
- annotations.add(annot);
+ if (annot != null && !annot.autoCalculated)
+ {
+ annotations.add(annot);
+ }
}
}
- globalColourScheme = ColourSchemeProperty.getColourName(viewport
- .getGlobalColourScheme());
+ globalColourScheme = (viewport.getGlobalColourScheme() == null) ? ResidueColourScheme.NONE
+ : viewport.getGlobalColourScheme().getSchemeName();
setDisplayedFeatures(viewport.getFeaturesDisplayed());
showSeqFeatures = viewport.isShowSequenceFeatures();
}
+ @Override
public boolean isShowSeqFeatures()
{
return showSeqFeatures;
return hiddenColumns;
}
+ @Override
public ColumnSelection getColumnSelection()
{
return columnSelection;
this.columnSelection = columnSelection;
}
+ @Override
public SequenceI[] getHiddenSequences()
{
if (hiddenSequences == null || hiddenSequences.isEmpty())
this.exportJalviewSettings = exportJalviewSettings;
}
}
+
+ /**
+ * Returns a descriptor for suitable feature display settings with
+ * <ul>
+ * <li>ResNums or insertions features visible</li>
+ * <li>insertions features coloured red</li>
+ * <li>ResNum features coloured by label</li>
+ * <li>Insertions displayed above (on top of) ResNums</li>
+ * </ul>
+ */
+ @Override
+ public FeatureSettingsModelI getFeatureColourScheme()
+ {
+ return new PDBFeatureSettings();
+ }
}