Skip to content

Commit

Permalink
Merge pull request #124 from AliTVTeam/rc/version1.0.0
Browse files Browse the repository at this point in the history
Rc/version1.0.0
  • Loading branch information
iimog authored Apr 18, 2017
2 parents f965055 + 33ab9e9 commit 272ba6c
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 50 deletions.
10 changes: 5 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ module.exports = function(grunt) {
}
},
helpers: ['d3/test/helpers/defaultConf.js',
'd3/test/helpers/eventHelper.js',
'd3/test/helpers/customMatchers.js',
'd3/test/data/testData.js'
]
// keepRunner : true
'd3/test/helpers/eventHelper.js',
'd3/test/helpers/customMatchers.js',
'd3/test/data/testData.js'
]
// keepRunner : true
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion README.org
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ The licenses of included libraries might differ, please see [[LICENSES/README.or
[[https://travis-ci.org/AliTVTeam/AliTV/][https://travis-ci.org/AliTVTeam/AliTV.svg?branch=master]]
[[https://coveralls.io/github/AliTVTeam/AliTV?branch=master][https://coveralls.io/repos/github/AliTVTeam/AliTV/badge.svg?branch=master]]
** Changelog
*** 0.4.1
*** 1.0.0 <2017-04-13 Do>
- Include perl part version 1.0.0
*** 0.4.1 <2016-08-05 Fr>
- Fix corner cases for move chromosome left/right
- Fix corner cases for move genome up/down
- Add linkOpacity setting (#104)
Expand Down
2 changes: 1 addition & 1 deletion d3/AliTV.html
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@
<body>

<div class="page-header">
<h1><img src="css/AliTV_logo.png" alt="logo" width="200" height="160" style="margin:0px 20px"/><b>AliTV <sup id="version-placeholder"></sup></b><small>&nbsp;Visualize multiple whole genome alignments as linear maps</small></h1>
<h1><img src="css/AliTV_logo.png" alt="logo" width="200" height="160" style="margin:0px 20px" /><b>AliTV <sup id="version-placeholder"></sup></b><small>&nbsp;Visualize multiple whole genome alignments as linear maps</small></h1>
<div>
<ul class="nav nav-tabs" role="tablist">

Expand Down
14 changes: 7 additions & 7 deletions d3/doc/AliTV.html
Original file line number Diff line number Diff line change
Expand Up @@ -9597,7 +9597,7 @@ <h4 class="name" id="getGenomeColor"><span class="type-signature"></span>getGeno


<div class="description">
This function returns an array which contains the color of the first and the last genome.
This function returns an array which contains the color of the first and the last genome.
The colors are defined in the conf-object.
</div>

Expand Down Expand Up @@ -9820,7 +9820,7 @@ <h4 class="name" id="getGenomeLabelColor"><span class="type-signature"></span>ge


<div class="description">
This function returns the color of the genomeLabels.
This function returns the color of the genomeLabels.
The color is defined in the conf-object.
</div>

Expand Down Expand Up @@ -10020,7 +10020,7 @@ <h4 class="name" id="getGenomeLabelSize"><span class="type-signature"></span>get


<div class="description">
This function returns the size of the genomeLabels.
This function returns the size of the genomeLabels.
The size is defined in the conf-object.
</div>

Expand Down Expand Up @@ -11583,7 +11583,7 @@ <h4 class="name" id="getLinkColor"><span class="type-signature"></span>getLinkCo


<div class="description">
This function returns an array which contains the color of the minLinkIdentity and the maxLinkIdentity.
This function returns an array which contains the color of the minLinkIdentity and the maxLinkIdentity.
The colors are defined in the conf-object.
</div>

Expand Down Expand Up @@ -13059,7 +13059,7 @@ <h4 class="name" id="getTickLabelColor"><span class="type-signature"></span>getT


<div class="description">
This function returns the color of the tick Labels.
This function returns the color of the tick Labels.
The color is defined in the conf-object.
</div>

Expand Down Expand Up @@ -13270,7 +13270,7 @@ <h4 class="name" id="getTickLabelSize"><span class="type-signature"></span>getTi


<div class="description">
This function returns the size of the tick Labels.
This function returns the size of the tick Labels.
The size is defined in the conf-object.
</div>

Expand Down Expand Up @@ -18920,7 +18920,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AliTV.htm
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri Aug 05 2016 10:13:29 GMT+0200 (CEST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Apr 13 2017 17:44:50 GMT+0200 (CEST)
</footer>

<script> prettyPrint(); </script>
Expand Down
34 changes: 17 additions & 17 deletions d3/doc/AliTV.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ <h1 class="page-title">Source: AliTV.js</h1>
/* global bootbox: false */

// use const instead of var as soon as EcmaScript 6 (ES6 is widely used)
var AliTV_VERSION = "0.4.1";
var AliTV_VERSION = "1.0.0";

/**
* Creates an object of type AliTV for drawing whole genome alignment visualizations
* @author Markus Ankenbrand &lt;[email protected]>
* @author Markus Ankenbrand &lt;[email protected]>
* @constructor
* @param {Object} svg - jQuery object containing a svg DOM element. Visualizations will be drawn on this svg. Size may be changed by object methods. Previous content will be deleted.
* @example
Expand Down Expand Up @@ -88,7 +88,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
* @property {Object} filters.karyo - the chromosome dependent displaying information
* @property {Boolean} filters.skipChromosomesWithoutVisibleLinks - If a chromosome has no visible links, because they are filtered, it is possible to skip this chromosome.
* @property {Boolean} filters.showAllChromosomes - Allows to show all chromosomes, even if when they are set not visible.
* @property {Boolean} filters.onlyShowAdjacentLinks - Allows to show only adjacent links or all links.
* @property {Boolean} filters.onlyShowAdjacentLinks - Allows to show only adjacent links or all links.
* @property {Array} filters.karyo.order - array of chromosome IDs in the desired order (circular layout)
* @property {Array} filters.karyo.genome_order - array of genome IDs in the desired order (linear layout)
* @property {Object} filters.karyo.chromosomes - the chromosome drawing details, karyo IDs as keys
Expand All @@ -111,13 +111,13 @@ <h1 class="page-title">Source: AliTV.js</h1>
* @property {String} linear.endLineColor - The end color of the color gradient.
* @property {String} linear.hideHalfVisibleLinks - If true - do not show links with only one end in a visible region.
* @property {Object} circular - The configuration options for the circular layout.
* @property {Number} circular.tickSize - The size of the ticks in pixels.
* @property {Number} circular.tickSize - The size of the ticks in pixels.
* @property {Number} minLinkIdentity - The minimum of the link identity the user wants to color.
* @property {Number} maxLinkIdentity - The maximum of the link identity the user wants to color.
* @property {Number} midLinkIdentity - The middle of the link identity the user wants to color.
* @property {String} minLinkIdentityColor - The color of the minimum link.
* @property {String} maxLinkIdentityColor - The color of the maximum link.
* @property {String} midLinkIdentityColor - The color of the middle link.
* @property {String} midLinkIdentityColor - The color of the middle link.
* @property {Number} minLinkLength - The minimum length of a link:
* @property {Number} maxLinkLength - The maximum length of a link.
* @property {Object} graphicalParameters - The configuration options for all graphical parameters.
Expand Down Expand Up @@ -1629,7 +1629,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
};

/**
* This function returns an array which contains the color of the first and the last genome.
* This function returns an array which contains the color of the first and the last genome.
* The colors are defined in the conf-object.
* @returns {Array} The color of the first and the last genome.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -1662,7 +1662,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
};

/**
* This function returns an array which contains the color of the minLinkIdentity and the maxLinkIdentity.
* This function returns an array which contains the color of the minLinkIdentity and the maxLinkIdentity.
* The colors are defined in the conf-object.
* @returns {Array} The color of the links with the minimal and maximal identity.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -1719,7 +1719,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
*This method should filter all chromosome which are set visible in conf.filters.karyo.chromosomes[&lt;chromosome>].visible
* @param visibleChromosomes: the method gets all current visible chromosomes.
* @returns filteredChromosomes: the method returns only chromosomes whose visibility is set true
* @author Sonja Hohlfeld
* @author Sonja Hohlfeld
*/
AliTV.prototype.filterVisibleChromosomes = function(visibleChromosomes) {
var that = this;
Expand All @@ -1736,7 +1736,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
* This method should filter all chromosome which have no visible links with the current configurations
* @param visibleChromosomes: the method gets all current visible chromosomes.
* @returns filteredChromosomes: the method returns only chromosomes which have visible links
* @author Sonja Hohlfeld
* @author Sonja Hohlfeld
*/
AliTV.prototype.filterChromosomeWithoutVisibleLinks = function(visibleChromosomes) {
var that = this;
Expand Down Expand Up @@ -2669,7 +2669,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
};

/**
* This function returns the color of the genomeLabels.
* This function returns the color of the genomeLabels.
* The color is defined in the conf-object.
* @returns The color of the genome labels.
* @author Sonja Hohlfeld
Expand All @@ -2696,7 +2696,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
};

/**
* This function returns the size of the genomeLabels.
* This function returns the size of the genomeLabels.
* The size is defined in the conf-object.
* @returns The size of the genome labels.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -2730,7 +2730,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
};

/**
* This function returns the color of the tick Labels.
* This function returns the color of the tick Labels.
* The color is defined in the conf-object.
* @returns The color of the tick labels.
* @author Sonja Hohlfeld
Expand All @@ -2756,7 +2756,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
};

/**
* This function returns the size of the tick Labels.
* This function returns the size of the tick Labels.
* The size is defined in the conf-object.
* @returns The size of the tick labels.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -2834,7 +2834,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
/**
* This function is supposed to return the value of the longest chromosome.
* @return maxLinkLength: the value of the longest chromosome in bp.
* @author Sonja Hohlfeld
* @author Sonja Hohlfeld
*/
AliTV.prototype.getMaxChromosomeLength = function() {
var length = [];
Expand Down Expand Up @@ -3020,7 +3020,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
this.triggerChange();
};

/**
/**
* This function is supposed to change the visibility of a selected chromosome.
* The function gets the name of a chromosome and set his visibility in filters.karyo.chromosomes equal false or true.
* @param {String} chromosomeName: the name of the selected chromosome.
Expand Down Expand Up @@ -3159,7 +3159,7 @@ <h1 class="page-title">Source: AliTV.js</h1>
}
};

/**
/**
* This function is supposed to return an array of supported features
* @returns {Array} supportedFeatures
* @author: Sonja Hohlfeld and Markus Ankenbrand
Expand Down Expand Up @@ -3558,7 +3558,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AliTV.htm
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri Aug 05 2016 10:13:29 GMT+0200 (CEST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Apr 13 2017 17:44:50 GMT+0200 (CEST)
</footer>

<script> prettyPrint(); </script>
Expand Down
2 changes: 1 addition & 1 deletion d3/doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h2><a href="index.html">Home</a></h2><h3>Classes</h3><ul><li><a href="AliTV.htm
<br class="clear">

<footer>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Fri Aug 05 2016 10:13:29 GMT+0200 (CEST)
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.0</a> on Thu Apr 13 2017 17:44:50 GMT+0200 (CEST)
</footer>

<script> prettyPrint(); </script>
Expand Down
32 changes: 16 additions & 16 deletions d3/js/AliTV.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
/* global bootbox: false */

// use const instead of var as soon as EcmaScript 6 (ES6 is widely used)
var AliTV_VERSION = "0.4.1";
var AliTV_VERSION = "1.0.0";

/**
* Creates an object of type AliTV for drawing whole genome alignment visualizations
* @author Markus Ankenbrand <[email protected]>
* @author Markus Ankenbrand <[email protected]>
* @constructor
* @param {Object} svg - jQuery object containing a svg DOM element. Visualizations will be drawn on this svg. Size may be changed by object methods. Previous content will be deleted.
* @example
Expand Down Expand Up @@ -60,7 +60,7 @@ function AliTV(svg) {
* @property {Object} filters.karyo - the chromosome dependent displaying information
* @property {Boolean} filters.skipChromosomesWithoutVisibleLinks - If a chromosome has no visible links, because they are filtered, it is possible to skip this chromosome.
* @property {Boolean} filters.showAllChromosomes - Allows to show all chromosomes, even if when they are set not visible.
* @property {Boolean} filters.onlyShowAdjacentLinks - Allows to show only adjacent links or all links.
* @property {Boolean} filters.onlyShowAdjacentLinks - Allows to show only adjacent links or all links.
* @property {Array} filters.karyo.order - array of chromosome IDs in the desired order (circular layout)
* @property {Array} filters.karyo.genome_order - array of genome IDs in the desired order (linear layout)
* @property {Object} filters.karyo.chromosomes - the chromosome drawing details, karyo IDs as keys
Expand All @@ -83,13 +83,13 @@ function AliTV(svg) {
* @property {String} linear.endLineColor - The end color of the color gradient.
* @property {String} linear.hideHalfVisibleLinks - If true - do not show links with only one end in a visible region.
* @property {Object} circular - The configuration options for the circular layout.
* @property {Number} circular.tickSize - The size of the ticks in pixels.
* @property {Number} circular.tickSize - The size of the ticks in pixels.
* @property {Number} minLinkIdentity - The minimum of the link identity the user wants to color.
* @property {Number} maxLinkIdentity - The maximum of the link identity the user wants to color.
* @property {Number} midLinkIdentity - The middle of the link identity the user wants to color.
* @property {String} minLinkIdentityColor - The color of the minimum link.
* @property {String} maxLinkIdentityColor - The color of the maximum link.
* @property {String} midLinkIdentityColor - The color of the middle link.
* @property {String} midLinkIdentityColor - The color of the middle link.
* @property {Number} minLinkLength - The minimum length of a link:
* @property {Number} maxLinkLength - The maximum length of a link.
* @property {Object} graphicalParameters - The configuration options for all graphical parameters.
Expand Down Expand Up @@ -1601,7 +1601,7 @@ AliTV.prototype.setFeatureProperty = function(groupId, property, val) {
};

/**
* This function returns an array which contains the color of the first and the last genome.
* This function returns an array which contains the color of the first and the last genome.
* The colors are defined in the conf-object.
* @returns {Array} The color of the first and the last genome.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -1634,7 +1634,7 @@ AliTV.prototype.setGenomeColor = function(color) {
};

/**
* This function returns an array which contains the color of the minLinkIdentity and the maxLinkIdentity.
* This function returns an array which contains the color of the minLinkIdentity and the maxLinkIdentity.
* The colors are defined in the conf-object.
* @returns {Array} The color of the links with the minimal and maximal identity.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -1691,7 +1691,7 @@ AliTV.prototype.filterChromosomes = function() {
*This method should filter all chromosome which are set visible in conf.filters.karyo.chromosomes[<chromosome>].visible
* @param visibleChromosomes: the method gets all current visible chromosomes.
* @returns filteredChromosomes: the method returns only chromosomes whose visibility is set true
* @author Sonja Hohlfeld
* @author Sonja Hohlfeld
*/
AliTV.prototype.filterVisibleChromosomes = function(visibleChromosomes) {
var that = this;
Expand All @@ -1708,7 +1708,7 @@ AliTV.prototype.filterVisibleChromosomes = function(visibleChromosomes) {
* This method should filter all chromosome which have no visible links with the current configurations
* @param visibleChromosomes: the method gets all current visible chromosomes.
* @returns filteredChromosomes: the method returns only chromosomes which have visible links
* @author Sonja Hohlfeld
* @author Sonja Hohlfeld
*/
AliTV.prototype.filterChromosomeWithoutVisibleLinks = function(visibleChromosomes) {
var that = this;
Expand Down Expand Up @@ -2641,7 +2641,7 @@ AliTV.prototype.setJSON = function(json) {
};

/**
* This function returns the color of the genomeLabels.
* This function returns the color of the genomeLabels.
* The color is defined in the conf-object.
* @returns The color of the genome labels.
* @author Sonja Hohlfeld
Expand All @@ -2668,7 +2668,7 @@ AliTV.prototype.setGenomeLabelColor = function(color) {
};

/**
* This function returns the size of the genomeLabels.
* This function returns the size of the genomeLabels.
* The size is defined in the conf-object.
* @returns The size of the genome labels.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -2702,7 +2702,7 @@ AliTV.prototype.setGenomeLabelSize = function(size) {
};

/**
* This function returns the color of the tick Labels.
* This function returns the color of the tick Labels.
* The color is defined in the conf-object.
* @returns The color of the tick labels.
* @author Sonja Hohlfeld
Expand All @@ -2728,7 +2728,7 @@ AliTV.prototype.setTickLabelColor = function(color) {
};

/**
* This function returns the size of the tick Labels.
* This function returns the size of the tick Labels.
* The size is defined in the conf-object.
* @returns The size of the tick labels.
* @author Sonja Hohlfeld
Expand Down Expand Up @@ -2806,7 +2806,7 @@ AliTV.prototype.showInvisibleLink = function(selectedLinkID) {
/**
* This function is supposed to return the value of the longest chromosome.
* @return maxLinkLength: the value of the longest chromosome in bp.
* @author Sonja Hohlfeld
* @author Sonja Hohlfeld
*/
AliTV.prototype.getMaxChromosomeLength = function() {
var length = [];
Expand Down Expand Up @@ -2992,7 +2992,7 @@ AliTV.prototype.resetGenomeRegion = function(genome_id) {
this.triggerChange();
};

/**
/**
* This function is supposed to change the visibility of a selected chromosome.
* The function gets the name of a chromosome and set his visibility in filters.karyo.chromosomes equal false or true.
* @param {String} chromosomeName: the name of the selected chromosome.
Expand Down Expand Up @@ -3131,7 +3131,7 @@ AliTV.prototype.setOffset = function(offset, karyoId) {
}
};

/**
/**
* This function is supposed to return an array of supported features
* @returns {Array} supportedFeatures
* @author: Sonja Hohlfeld and Markus Ankenbrand
Expand Down
Loading

0 comments on commit 272ba6c

Please sign in to comment.