Skip to content

GitLab

Mise à jour terminée. Pour connaître les apports de la version 13.10.3 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/03/22/gitlab-13-10-released/
https://about.gitlab.com/releases/2021/03/31/security-release-gitlab-13-10-1-released/
https://about.gitlab.com/releases/2021/04/01/gitlab-13-10-2-released/
https://about.gitlab.com/releases/2021/04/14/security-release-gitlab-13-10-3-released/

Commit 47fac706 authored by Marc Duez's avatar Marc Duez
Browse files
Options

interface : rework pdf.js

parent 4452d3b7
Hide whitespace changes
Inline Side-by-side
Showing with 329 additions and 233 deletions
browser/css/vidjil.less
View file @ 47fac706
......@@ -781,4 +781,5 @@ span .substitution{
#toggle-left-container {
position: relative;
top: calc(50% - 10px);
cursor :pointer;
}
browser/index.html
View file @ 47fac706
......@@ -117,7 +117,7 @@
<a class="buttonSelector" onclick="javascript:m.saveAnalysis()">save analysis</a>
<!--<a class="buttonSelector" onclick="javascript:m.resetAnalysis()">reset analysis</a> -->
<!--<a class="buttonSelector" onclick="javascript:reset()">reset all</a> -->
<a class="buttonSelector" onclick="javascript:testPDF2()">export pdf (graph + selected clones)</a>
<a class="buttonSelector" onclick="javascript:new PDF(m, 'visu2_svg')">export pdf (graph + selected clones)</a>
</div>
</div>
......
browser/js/pdf.js
View file @ 47fac706
......@@ -16,240 +16,335 @@
* You should have received a copy of the GNU General Public License
* along with "Vidjil". If not, see <http://www.gnu.org/licenses/>
*/
function PDF(model, graph_id) {
this.m = model;
this.graph_id = graph_id;
this.doc = new jsPDF();
/*
function extractSVG(id){
var html = d3.select("#"+id)
.attr("title", "test")
.attr("version", 1.1)
.attr("xmlns", "http://www.w3.org/2000/svg")
.node().parentNode.innerHTML;
d3.select("#popup-msg").append("div")
.append("img")
.attr("src", "data:image/svg+xml;base64,"+ btoa(html));
popupMsg("plop");
}
function testPDF(){
//récupération du node du graphique
var node = d3.select("#svg2")
.attr("title", "test")
.attr("version", 1.1)
.attr("xmlns", "http://www.w3.org/2000/svg")
.node();
//extraction du code SVG
var s = new XMLSerializer();
var xmlString = s.serializeToString(node);
//calcul du rescale a effectuer
var width=document.getElementById("svg2").getAttribute("width");
var height=document.getElementById("svg2").getAttribute("height");
var nWidth=3000;
var nHeight=1500;
var dWidth = nWidth/width;
var dHeight = nHeight/height;
//application du rescale
xmlString = xmlString.replace(width, nWidth);
xmlString = xmlString.replace(height, nHeight);
xmlString = xmlString.replace('<svg ', '<svg transform="scale(' + dWidth + ' ' + dHeight + ')" ');
//TODO changement de style pour la version PDF
// + gestion non-scaling-stroke vector effect + font
xmlString = xmlString.replace(new RegExp(colorStyle.c01, 'g'), pdfStyle.c01);
xmlString = xmlString.replace(new RegExp(colorStyle.c02, 'g'), pdfStyle.c02);
xmlString = xmlString.replace(new RegExp(colorStyle.c03, 'g'), pdfStyle.c03);
xmlString = xmlString.replace(new RegExp(colorStyle.c04, 'g'), pdfStyle.c04);
xmlString = xmlString.replace(new RegExp(colorStyle.c05, 'g'), pdfStyle.c05);
xmlString = xmlString.replace(new RegExp(colorStyle.c06, 'g'), pdfStyle.c06);
//conversion canvas
var canvas = document.createElement("canvas");
canvg(canvas,xmlString);
//conversion jpeg
var imgData = canvas.toDataURL("image/jpeg", 1.0);
//génération pdf
var doc = new jsPDF();
doc.text(20, 20, 'Vidjil pdf test');
doc.text(20, 30, 'hi!');
doc.addImage(imgData, 'JPEG', 5, 40, 200, 100);
doc.save('Test.pdf');
}
*/
var listF;
function testPDF2(){
m.focusOut();
var list=m.getSelected()
if (list.length==0){
var flag=5;
for (var i = 0; i<m.n_windows; i++){
if (m.clones[i].cluster.length !=0 && flag!=0){
list.push(i);
flag--;
}
}
}
var elem = document.getElementById("visu2_svg").cloneNode(true);
var opt={};
var doc = new jsPDF();
// The clones should have their natural (tag) color, even if two have the same color...
for (var i = 0; i<m.n_windows; i++){
var polyline = elem.getElementById("polyline"+i)
polyline.setAttribute("style","stroke-width:1px; stroke:"+ tagColor[m.windows[i].tag]);
polyline.setAttribute("stroke", tagColor[m.windows[i].tag]);
// polyline.setAttribute("style","stroke-width:1px; stroke: #dddddd");
// polyline.setAttribute("stroke","#dddddd");
// Hide 'other' line (TODO: really remove this line !)
if (m.windows[i].window == "other")
{
polyline.setAttribute("style","stroke-width:0px; stroke: #ffffff");
polyline.setAttribute("stroke", "#ffffff");
}
}
for (var i = 0; i<list.length; i++){
var polyline = elem.getElementById("polyline"+list[i])
polyline.setAttribute("style","stroke-width:6px; stroke:"+tagColor[m.windows[i].tag]);
polyline.setAttribute("stroke", tagColor[m.windows[i].tag]);
elem.getElementById("polyline_container").appendChild(polyline);
}
var textElem = elem.getElementsByTagName("text");
for (var i = 0; i<textElem.length; i++){
textElem[i].setAttribute("text-anchor","middle");
}
elem.getElementById("resolution1").firstChild.setAttribute("fill","#eeeeee");
var timebar=elem.getElementById("timebar");
elem.getElementById("timebar").parentNode.removeChild(timebar);
var visu2_back=elem.getElementById("visu2_back");
elem.getElementById("visu2_back").parentNode.removeChild(visu2_back);
var visu2_back2=elem.getElementById("visu2_back2");
elem.getElementById("visu2_back2").parentNode.removeChild(visu2_back2);
var reso5=elem.getElementById("resolution5");
elem.getElementById("resolution5").parentNode.removeChild(reso5);
opt.scaleX=180/document.getElementById("visu2_svg").getAttribute("width");
opt.scaleY=80/document.getElementById("visu2_svg").getAttribute("height");
opt.x_offset=15;
opt.y_offset=60;
doc.setFontSize(12);
doc.text(130, 20, 'Vidjil -- http://bioinfo.lifl.fr/vidjil');
doc.rect(15, 15, 60, 23);
doc.text(20, 20, document.getElementById("upload_json").files[0].name);
doc.text(20, 25, 'run: 2014-xx-xx');
doc.text(20, 30, 'analysis: '+m.timestamp[0].split(' ')[0]);
doc.text(20, 35, 'germline: '+m.system);
doc.text(20, 45, 'reads: ' + m.reads_segmented_total + ' / ' + m.reads_total_total
+ ' (' + (100 * m.reads_segmented_total / m.reads_total_total).toFixed(3) + '%)');
doc.text(130, 25, '**beta** PDF export');
svgElementToPdf(elem, doc, opt)
doc.setFillColor(255, 255, 255);
doc.rect(0,140, 210, 140, 'F');
var y=150
// Detailed output by clone
for (var i = 0; i<list.length; i++){
var id=list[i];
var polyline = document.getElementById("polyline"+id).cloneNode(true);
polyline.setAttribute("style","stroke-width:40px");
polyline.setAttribute("stroke",tagColor[m.windows[i].tag]);
var res =elem.getElementById("resolution1").cloneNode(true);
res.firstChild.setAttribute("fill","white");
var icon=document.createElement("svg");
this.marge = 15
this.y = this.marge;
this.y_max = 297 - this.marge
m.focusOut()
this.getList()
this.header()
this.graph()
this.info()
this.sequences()
this.doc.output('dataurlnewwindow');
}
PDF.prototype = {
/*init list
*/
getList: function () {
this.list = m.getSelected()
if (this.list.length == 0) {
var flag = 5;
for (var i = 0; i < m.n_windows; i++) {
if (m.clones[i].cluster.length != 0 && flag != 0) {
this.list.push(i);
flag--;
}
}
}
},
/*print Header
*/
header: function () {
var header_size = 30
this.checkPage(header_size)
this.doc.setFontSize(12);
this.doc.text(this.marge + 120, this.y, 'Vidjil (beta) - http://bioinfo.lifl.fr/vidjil');
this.doc.text(this.marge + 5, this.y + 5, document.getElementById("upload_json")
.files[0].name);
this.doc.text(this.marge + 5, this.y + 10, 'run: 2013-10-03');
this.doc.text(this.marge + 5, this.y + 15, 'analysis: ' + m.timestamp.split(' ')[0]);
this.doc.text(this.marge + 5, this.y + 20, 'germline: ' + m.system);
this.doc.rect(this.marge, this.y, 60, 23);
this.y = this.y + header_size
},
/*check remaining space on current page
*begin a new pdf page if neccesary
*/
checkPage: function (size) {
if ((this.y + size) > this.y_max) {
this.y = this.marge
this.doc.addPage();
}
},
/* show current pdf
*/
out: function () {
this.doc.output('dataurlnewwindow');
},
/* print sequences of selected clones
*/
sequences: function () {
for (var i = 0; i < this.list.length; i++) {
this.checkPage(30)
var id = this.list[i];
var color = tagColor[m.windows[id].tag]
this.doc.setFontSize(12);
//icone
var polyline = document.getElementById("polyline" + id)
.cloneNode(true);
polyline.setAttribute("style", "stroke-width:40px");
polyline.setAttribute("stroke", color);
var res = document.getElementById("resolution1")
.cloneNode(true);
res.firstChild.setAttribute("fill", "white");
var icon = document.createElement("svg");
icon.appendChild(polyline)
icon.appendChild(res)
var opt_icon = {};
opt_icon.scaleX = 18 / document.getElementById(this.graph_id)
.getAttribute("width");
opt_icon.scaleY = 8 / document.getElementById(this.graph_id)
.getAttribute("height");
opt_icon.x_offset = this.marge;
opt_icon.y_offset = this.y - 2;
svgElementToPdf(icon, this.doc, opt_icon)
this.doc.setDrawColor(150, 150, 150);
this.doc.rect(this.marge, this.y - 2, 18, 8);
//clone name
this.doc.setFont('courier', 'bold');
this.doc.setTextColor(color);
this.doc.text(this.marge + 20, this.y, this.m.getName(id));
this.doc.setFont('courier', 'normal');
this.doc.setTextColor(0, 0, 0);
//clone size
/*
var r=0;
for(var j=0 ;j<m.clones[id].cluster.length; j++){
r += m.windows[m.clones[id].cluster[j]].size;
}
var s;
var size=m.getSize(id);
if (size<0.0001){
s=(size).toExponential(1);
}else{
s=(100*size).toFixed(3)+"%";
}
this.doc.text(this.marge+110, this.y, 'reads (point 0): '+r+' -- '+s);
*/
this.y += 5;
//sequence
if (typeof (m.windows[id].sequence) != 'number') {
var seq = m.windows[id].sequence;
var seq = seq.insert(m.windows[id].Jstart, " ");
var seq = seq.insert(m.windows[id].Vend + 1, " ");
for (j = 0; j < (Math.floor(seq.length / 60) + 1); j++) {
this.doc.text(this.marge + 20, this.y, seq.substring(j * 60, (j + 1) * 60));
this.y += 5;
}
} else {
this.doc.text(this.marge + 20, this.y, "segment fail :" + m.windows[id].window);
}
this.y += 10;
}
},
/* print graph
*/
graph: function () {
var elem = document.getElementById(this.graph_id)
.cloneNode(true);
var graph_size = 90
this.checkPage(graph_size)
var opt = {};
opt.scaleX = 180 / document.getElementById(this.graph_id)
.getAttribute("width");
opt.scaleY = 80 / document.getElementById(this.graph_id)
.getAttribute("height");
opt.x_offset = this.marge;
opt.y_offset = this.y;
//clones style
for (var i = 0; i < this.m.windows.length; i++) {
var polyline = elem.getElementById("polyline" + i)
var color = tagColor[this.m.windows[i].tag]
polyline.setAttribute("style", "stroke-width:1px");
polyline.setAttribute("stroke", color);
if (m.windows[i].window == "other") {
polyline.parentNode.removeChild(polyline);
}
}
//selected clones style
for (var i = 0; i < this.list.length; i++) {
var polyline = elem.getElementById("polyline" + this.list[i])
var color = tagColor[this.m.windows[this.list[i]].tag]
polyline.setAttribute("stroke", color);
polyline.setAttribute("style", "stroke-width:6px");
elem.getElementById("polyline_container")
.appendChild(polyline);
}
//text style
var textElem = elem.getElementsByTagName("text");
for (var i = 0; i < textElem.length; i++) {
textElem[i].setAttribute("text-anchor", "middle");
}
//
elem.getElementById("resolution1")
.firstChild.setAttribute("fill", "#eeeeee");
var timebar = elem.getElementById("timebar");
timebar.parentNode.removeChild(timebar);
var visu2_back = elem.getElementById("visu2_back");
visu2_back.parentNode.removeChild(visu2_back);
var visu2_back2 = elem.getElementById("visu2_back2");
visu2_back2.parentNode.removeChild(visu2_back2);
var reso5 = elem.getElementById("resolution5");
reso5.parentNode.removeChild(reso5);
svgElementToPdf(elem, this.doc, opt)
this.doc.rect(this.marge, this.y, 180, 80);
this.doc.setFillColor(255, 255, 255);
this.doc.rect(0, this.y + 80, 210, 140, 'F');
this.doc.setFillColor(0, 0, 0);
this.y += graph_size
},
info: function () {
var col_width = 25
var first_col_width = 35
var height_row = 6
var height_sub_row = 4
this.doc.setFontSize(12);
this.doc.setFont('helvetica', 'normal');
this.checkPage(15)
//time point
for (var i = 0; i < this.m.time.length; i++) {
var x = this.marge + first_col_width + (col_width * i)
var y = this.y
this.doc.text(x, y, ' ' + this.m.time[i]);
}
this.doc.lines([
[210 - 2 * (this.marge), 0]
], this.marge, this.y + 2)
this.y += height_row
//info global
this.doc.text(this.marge, this.y, 'total reads');
for (var i = 0; i < this.m.time.length; i++) {
var x = this.marge + first_col_width + (col_width * i)
var y = this.y
this.doc.text(x, y, ' ' + this.m.reads_segmented[i]);
}
this.doc.lines([
[210 - 2 * (this.marge), 0]
], this.marge, this.y + 2)
this.y += height_row
//info selected clone
for (var j = 0; j < this.list.length; j++) {
this.checkPage(20)
icon.appendChild(polyline)
icon.appendChild(res)
var opt_icon={};
opt_icon.scaleX=18/document.getElementById("visu2_svg").getAttribute("width");
opt_icon.scaleY=8/document.getElementById("visu2_svg").getAttribute("height");
opt_icon.x_offset=10;
opt_icon.y_offset=y-2;
svgElementToPdf(icon, doc, opt_icon)
doc.setDrawColor(150,150,150);
doc.rect(10, y-2, 18, 8);
/*
polyline.setAttribute("stroke",tagColor[m.windows[i].tag]);
polyline.setAttribute("style","stroke-width:6px");
opt_icon.scaleX=180/document.getElementById("visu2_svg").getAttribute("width");
opt_icon.scaleY=30/document.getElementById("visu2_svg").getAttribute("height");
opt_icon.x_offset=15;
opt_icon.y_offset=y-5;
svgElementToPdf(icon, doc, opt_icon)
*/
doc.setFont('courier', 'bold');
doc.setTextColor(tagColor[m.windows[i].tag]);
doc.text(30, y, m.getName(id));
doc.setFont('courier', 'normal');
doc.setTextColor(0,0,0);
var r=0;
for(var j=0 ;j<m.clones[id].cluster.length; j++){
r += m.windows[m.clones[id].cluster[j]].size;}
var s;
var size=m.getSize(id);
if (size<0.0001){
s=(size).toExponential(1);
}else{
s=(100*size).toFixed(3)+"%";
}
doc.text(120, y, 'reads (point 0): '+r+' -- '+s);
y=y+5;
if (typeof(m.windows[id].sequence) !='number'){
//var v_seq=windows[id].sequence.substr(0, windows[id].Vend+1);
//var n_seq=windows[id].sequence.substr(windows[id].Vend+1, windows[id].Jstart);
//var j_seq=windows[id].sequence.substr(windows[id].Jstart);
var seq=m.windows[id].sequence;
var seq=seq.insert(m.windows[id].Jstart, " ");
var seq=seq.insert(m.windows[id].Vend+1, " ");
for(j=0 ; j<(Math.floor(seq.length/80)+1) ; j++){
doc.text(30, y, seq.substring(j*80, (j+1)*80 ));
y=y+5;
}
y=y+10;
}else{
doc.text(30, y, "segment fail :"+m.windows[id].window);
y=y+10;
}
var id = this.list[j]
var color = tagColor[m.windows[id].tag]
//clone name
this.doc.setFont('courier', 'bold');
this.doc.setTextColor(color);
this.doc.text(this.marge, this.y, this.m.getName(id));
this.doc.setFont('helvetica', 'normal');
this.doc.setTextColor(0,0,0);
this.doc.lines([
[210 - 2 * (this.marge), 0]
], this.marge, this.y + 2)
this.y += height_row
//clone reads
this.doc.text(this.marge + 5, this.y, 'reads');
for (var i = 0; i < m.time.length; i++) {
var x = this.marge + first_col_width + (col_width * i)
var y = this.y
this.doc.text(x, y, ' ' + this.m.windows[id].size[i]);
}
this.y += height_sub_row
//clone reads (%)
for (var i = 0; i < this.m.time.length; i++) {
var val = m.windows[this.list[j]].size[i] / m.reads_segmented[i]
var x = this.marge + first_col_width + (col_width * i)
var y = this.y
this.doc.text(x, y, ' ' + val.toFixed(2) + ' %');
}
this.doc.lines([
[210 - 2 * (this.marge), 0]
], this.marge, this.y + 2)
this.y += height_row
}
this.y += 10
}
doc.output('dataurlnewwindow')
//doc.save('Test.pdf');
m.update();
}
}
String.prototype.insert = function (index, string) {
if (index > 0)
return this.substring(0, index) + string + this.substring(index, this.length);
else
return string + this;
};
if (index > 0)
return this.substring(0, index) + string + this.substring(index, this.length);
else
return string + this;
};
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment