Skip to content
GitLab
Commit 1bdd52fc authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '500-gene-variants-in-molart' into 'master' 

Resolve "gene variants in molart"

Closes #500

See merge request !420
parents b7c2d52b 728cbe10
Pipeline #6556 passed with stage
in 7 minutes and 26 seconds
Expand all Hide whitespace changes
Inline Side-by-side
frontend-js/src/main/js/map/data/GeneVariant.js
View file @ 1bdd52fc
......@@ -9,7 +9,8 @@
* @param {string} javaObject.referenceGenomeType
* @param {string} javaObject.referenceGenomeVersion
* @param {string} javaObject.contig
* @param {null|number} [javaObject.allelFrequency]
* @param {string} [javaObject.aminoAcidChange]
* @param {null|string} [javaObject.allelFrequency]
* @param {null|string} [javaObject.variantIdentifier]
*
* @constructor
......@@ -23,8 +24,25 @@ function GeneVariant(javaObject) {
this.setContig(javaObject.contig);
this.setAllelFrequency(javaObject.allelFrequency);
this.setVariantIdentifier(javaObject.variantIdentifier);
this.setAminoAcidChange(javaObject.aminoAcidChange);
}
/**
*
* @param {string} aminoAcidChange
*/
GeneVariant.prototype.setAminoAcidChange = function (aminoAcidChange) {
this._aminoAcidChange = aminoAcidChange;
};
/**
*
* @returns {string}
*/
GeneVariant.prototype.getAminoAcidChange = function () {
return this._aminoAcidChange;
};
/**
*
* @param {number} position
......@@ -91,13 +109,13 @@ GeneVariant.prototype.getContig = function () {
/**
*
* @param {number} allelFrequency
* @param {string} allelFrequency
*/
GeneVariant.prototype.setAllelFrequency = function (allelFrequency) {
if (allelFrequency === null) {
this._allelFrequency = undefined;
} else {
this._allelFrequency = allelFrequency;
this._allelFrequency = parseFloat(allelFrequency);
}
};
......
frontend-js/src/test/js/map/data/GeneVariant-test.js
View file @ 1bdd52fc
......@@ -5,6 +5,7 @@ var assert = require('assert');
describe('GeneVariant', function () {
it("constructor", function () {
// noinspection SpellCheckingInspection
var data = {
position: 12,
originalDna: "A",
......@@ -13,7 +14,8 @@ describe('GeneVariant', function () {
referenceGenomeVersion: "v1",
contig: "1",
allelFrequency: "0.2",
variantIdentifier: "id"
variantIdentifier: "id",
aminoAcidChange: "LRRK2:NM_198578:exon1:c.T45C:p.T15T"
};
var variant = new GeneVariant(data);
assert.equal(variant.getPosition(), data.position);
......@@ -24,5 +26,6 @@ describe('GeneVariant', function () {
assert.equal(variant.getAllelFrequency(), data.allelFrequency);
assert.equal(variant.getVariantIdentifier(), data.variantIdentifier);
assert.equal(variant.getReferenceGenomeVersion(), data.referenceGenomeVersion);
assert.equal(variant.getAminoAcidChange(), data.aminoAcidChange);
});
});
model/src/main/java/lcsb/mapviewer/model/map/layout/GeneVariation.java
View file @ 1bdd52fc
......@@ -5,6 +5,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.log4j.Logger;
import lcsb.mapviewer.common.exception.NotImplementedException;
import lcsb.mapviewer.model.map.MiriamData;
......@@ -16,262 +18,289 @@ import lcsb.mapviewer.model.map.MiriamData;
*/
public class GeneVariation implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* Variation position in the genome.
*/
private Long position;
/**
* Original dna (from the reference genome).
*/
private String originalDna;
/**
* Alternative dna (suggested by the variant).
*/
private String modifiedDna;
/**
* Contig where variant was observed.
*/
private String contig;
private String allelFrequency;
private String variantIdentifier;
/**
* Reference genome type.
*/
private ReferenceGenomeType referenceGenomeType;
/**
* Version of the reference genome.
*/
private String referenceGenomeVersion;
/**
* List of references connected to this variant.
*/
private List<MiriamData> references = new ArrayList<>();
/**
* Constructor that creates copy of the {@link GeneVariation}.
*
* @param original
* original {@link GeneVariation}
*/
protected GeneVariation(GeneVariation original) {
this.setPosition(original.getPosition());
this.setOriginalDna(original.getOriginalDna());
this.setModifiedDna(original.getModifiedDna());
this.setReferenceGenomeType(original.getReferenceGenomeType());
this.setReferenceGenomeVersion(original.getReferenceGenomeVersion());
this.addReferences(original.getReferences());
this.setContig(original.getContig());
this.setAllelFrequency(original.getAllelFrequency());
this.setVariantIdentifier(original.getVariantIdentifier());
}
/**
* Default constructor.
*/
public GeneVariation() {
}
/**
* Adds references.
*
* @param references
* references to add
* @see #references
*/
private void addReferences(Collection<MiriamData> references) {
for (MiriamData reference : references) {
addReference(reference);
}
}
/**
* @return the position
* @see #position
*/
public Long getPosition() {
return position;
}
/**
* @param position
* the position to set
* @see #position
*/
public void setPosition(Long position) {
this.position = position;
}
/**
* @return the originalDna
* @see #originalDna
*/
public String getOriginalDna() {
return originalDna;
}
/**
* @param originalDna
* the originalDna to set
* @see #originalDna
*/
public void setOriginalDna(String originalDna) {
this.originalDna = originalDna;
}
/**
* @return the modifiedDna
* @see #modifiedDna
*/
public String getModifiedDna() {
return modifiedDna;
}
/**
* @param modifiedDna
* the modifiedDna to set
* @see #modifiedDna
*/
public void setModifiedDna(String modifiedDna) {
this.modifiedDna = modifiedDna;
}
/**
* @return the referenceGenomeType
* @see #referenceGenomeType
*/
public ReferenceGenomeType getReferenceGenomeType() {
return referenceGenomeType;
}
/**
* @param referenceGenomeType
* the referenceGenomeType to set
* @see #referenceGenomeType
*/
public void setReferenceGenomeType(ReferenceGenomeType referenceGenomeType) {
this.referenceGenomeType = referenceGenomeType;
}
/**
* @return the references
* @see #references
*/
public List<MiriamData> getReferences() {
return references;
}
/**
* @return the referenceGenomeVersion
* @see #referenceGenomeVersion
*/
public String getReferenceGenomeVersion() {
return referenceGenomeVersion;
}
/**
* @param referenceGenomeVersion
* the referenceGenomeVersion to set
* @see #referenceGenomeVersion
*/
public void setReferenceGenomeVersion(String referenceGenomeVersion) {
this.referenceGenomeVersion = referenceGenomeVersion;
}
/**
* Adds reference.
*
* @param reference
* reference to add
* @see #references
*/
public void addReference(MiriamData reference) {
this.references.add(reference);
}
/**
* Creates copy of the object.
*
* @return copy of the object
*/
public GeneVariation copy() {
if (this.getClass().equals(GeneVariation.class)) {
return new GeneVariation(this);
} else {
throw new NotImplementedException("Copy method not implemented for class: " + this.getClass());
}
}
/**
* @return the contig
* @see #contig
*/
public String getContig() {
return contig;
}
/**
* @param contig
* the contig to set
* @see #contig
*/
public void setContig(String contig) {
this.contig = contig;
}
/**
* Sets {@link #position}.
*
* @param position
* new position value
*/
public void setPosition(int position) {
this.position = (long) position;
}
/**
* @return the allelFrequency
* @see #allelFrequency
*/
public String getAllelFrequency() {
return allelFrequency;
}
/**
* @param allelFrequency
* the allelFrequency to set
* @see #allelFrequency
*/
public void setAllelFrequency(String allelFrequency) {
this.allelFrequency = allelFrequency;
}
/**
* @return the variantIdentifier
* @see #variantIdentifier
*/
public String getVariantIdentifier() {
return variantIdentifier;
}
/**
* @param variantIdentifier
* the variantIdentifier to set
* @see #variantIdentifier
*/
public void setVariantIdentifier(String variantIdentifier) {
this.variantIdentifier = variantIdentifier;
}
/**
* Default class logger.
*/
@SuppressWarnings("unused")
private static Logger logger = Logger.getLogger(GeneVariation.class);
/**
*
*/
private static final long serialVersionUID = 1L;
/**
* Variation position in the genome.
*/
private Long position;
/**
* Original DNA (from the reference genome).
*/
private String originalDna;
/**
* Alternative DNA (suggested by the variant).
*/
private String modifiedDna;
/**
* Contig where variant was observed.
*/
private String contig;
/**
* Allel frequency of the variant.
*/
private String allelFrequency;
/**
* Amino acid change for corresponding protein.
*/
private String aminoAcidChange;
/**
* Gene variant id.
*/
private String variantIdentifier;
/**
* Reference genome type.
*/
private ReferenceGenomeType referenceGenomeType;
/**
* Version of the reference genome.
*/
private String referenceGenomeVersion;
/**
* List of references connected to this variant.
*/
private List<MiriamData> references = new ArrayList<>();
/**
* Constructor that creates copy of the {@link GeneVariation}.
*
* @param original
* original {@link GeneVariation}
*/
protected GeneVariation(GeneVariation original) {
this.setPosition(original.getPosition());
this.setOriginalDna(original.getOriginalDna());
this.setModifiedDna(original.getModifiedDna());
this.setReferenceGenomeType(original.getReferenceGenomeType());
this.setReferenceGenomeVersion(original.getReferenceGenomeVersion());
this.addReferences(original.getReferences());
this.setContig(original.getContig());
this.setAllelFrequency(original.getAllelFrequency());
this.setVariantIdentifier(original.getVariantIdentifier());
this.setAminoAcidChange(original.getAminoAcidChange());
}
/**
* Default constructor.
*/
public GeneVariation() {
}
/**
* Adds references.
*
* @param references
* references to add
* @see #references
*/
private void addReferences(Collection<MiriamData> references) {
for (MiriamData reference : references) {
addReference(reference);
}
}
/**
* @return the position
* @see #position
*/
public Long getPosition() {
return position;
}
/**
* @param position
* the position to set
* @see #position
*/
public void setPosition(Long position) {
this.position = position;
}
/**
* @return the originalDna
* @see #originalDna
*/
public String getOriginalDna() {
return originalDna;
}
/**
* @param originalDna
* the originalDna to set
* @see #originalDna
*/
public void setOriginalDna(String originalDna) {
this.originalDna = originalDna;
}
/**
* @return the modifiedDna
* @see #modifiedDna
*/
public String getModifiedDna() {
return modifiedDna;
}
/**
* @param modifiedDna
* the modifiedDna to set
* @see #modifiedDna
*/
public void setModifiedDna(String modifiedDna) {
this.modifiedDna = modifiedDna;
}
/**
* @return the referenceGenomeType
* @see #referenceGenomeType
*/
public ReferenceGenomeType getReferenceGenomeType() {
return referenceGenomeType;
}
/**
* @param referenceGenomeType
* the referenceGenomeType to set
* @see #referenceGenomeType
*/
public void setReferenceGenomeType(ReferenceGenomeType referenceGenomeType) {
this.referenceGenomeType = referenceGenomeType;
}
/**
* @return the references
* @see #references
*/
public List<MiriamData> getReferences() {
return references;
}
/**
* @return the referenceGenomeVersion
* @see #referenceGenomeVersion
*/
public String getReferenceGenomeVersion() {
return referenceGenomeVersion;
}
/**
* @param referenceGenomeVersion
* the referenceGenomeVersion to set
* @see #referenceGenomeVersion
*/
public void setReferenceGenomeVersion(String referenceGenomeVersion) {
this.referenceGenomeVersion = referenceGenomeVersion;
}
/**
* Adds reference.
*
* @param reference
* reference to add
* @see #references
*/
public void addReference(MiriamData reference) {
this.references.add(reference);
}
/**
* Creates copy of the object.
*
* @return copy of the object
*/
public GeneVariation copy() {
if (this.getClass().equals(GeneVariation.class)) {
return new GeneVariation(this);
} else {
throw new NotImplementedException("Copy method not implemented for class: " + this.getClass());
}
}
/**
* @return the contig
* @see #contig
*/
public String getContig() {
return contig;
}
/**
* @param contig
* the contig to set
* @see #contig
*/
public void setContig(String contig) {
this.contig = contig;
}
/**
* Sets {@link #position}.
*
* @param position
* new position value
*/
public void setPosition(int position) {
this.position = (long) position;
}
/**
* @return the allelFrequency
* @see #allelFrequency
*/
public String getAllelFrequency() {
return allelFrequency;
}
/**