Commit 70187776 authored by Marc Duez's avatar Marc Duez

segmenter.js : unlock limit of selected clones (up to 20)

-scroll handled by javascript
parent dfe8a936
......@@ -456,8 +456,11 @@ max-height: calc(~"100%" - @margin)
}
.seq-fixed {
position: fixed;
position: relative;
display: inline-block;
width: (@width_left_container - @width_scrollbar);
margin: -2px;
padding: 2px;
padding-left: 5px;
left:0px;
cursor:pointer;
......@@ -738,7 +741,7 @@ span.logo
#segmenter {
overflow-x: scroll;
overflow-y: hidden;
overflow-y: auto;
height : 100px;
}
......
......@@ -1221,7 +1221,7 @@ Model.prototype = {
if (this.windows[cloneID].select) {
this.unselect(cloneID);
} else {
if (list.length < 5) this.windows[cloneID].select = true;
if (list.length < 20) this.windows[cloneID].select = true;
}
this.updateElemStyle([cloneID]);
},
......@@ -1830,4 +1830,44 @@ var msg = {
"welcome": " <h2>Vidjil <span class='logo'>(beta)</span></h2>" + "(c) 2011-2014, the Vidjil team" + "<br />Marc Duez, Mathieu Giraud and Mikaël Salson" + " &ndash; <a href='http://bioinfo.lifl.fr/vidjil'>http://bioinfo.lifl.fr/vidjil</a>" + "</br>" + "</br>Vidjil is developed by the <a href='http://www.lifl.fr/bonsai'>Bonsai bioinformatics team</a> (LIFL, CNRS, U. Lille 1, Inria Lille), in collaboration with the <a href='http://biologiepathologie.chru-lille.fr/organisation-fbp/91210.html'>department of Hematology</a> of CHRU Lille" + " the <a href='http://www.ircl.org/plate-forme-genomique.html'>Functional and Structural Genomic Platform</a> (U. Lille 2, IFR-114, IRCL)" + " and the <a href='http://www.euroclonality.org/'>EuroClonality-NGS</a> working group." + "</br>" + "</br>This is a beta version, please use it only for test purposes." + "</br></br> <div class='center' > <button onclick='closePopupMsg()'>start</button></div>",
"browser_error": "It seems you used an incompatible web browser (too old or too weak)." + "</br>We recommend to install one of those for a better experience : " + "</br> <a href='http://www.mozilla.org/'> Firefox </a> " + "</br> <a href='www.google.com/chrome/'> Chrome </a> " + "</br> <a href='http://www.chromium.org/getting-involved/download-chromium'> Chromium </a> " + "</br></br> <div class='center' > <button onclick='popupMsg(msg.welcome)'>i want to try anyway</button></div>",
}
\ No newline at end of file
}
var rootTab = []
function root(n) {
var startTime = new Date()
.getTime();
var elapsedTime = 0;
for (var i=0; i<n; i++){
var dx = 5
var dy = 5+1
rootTab[i] = Math.sqrt( dx*dx + dy*dy )
}
elapsedTime = new Date()
.getTime() - startTime;
console.log("root("+n+") : " + elapsedTime);
}
function root2(n) {
var startTime = new Date()
.getTime();
var elapsedTime = 0;
for (var i=0; i<n; i++){
var dx = Math.abs(5)
var dy = Math.abs(5+1)
var min = Math.min(dx,dy)
rootTab[i] = dx + dy - (min >> 1) - (min >> 2) + (min >> 4)
}
elapsedTime = new Date()
.getTime() - startTime;
console.log("root2("+n+") : " + elapsedTime);
}
......@@ -141,6 +141,12 @@ Segment.prototype = {
return self.toFasta()
}
});
$('#segmenter').scroll(function(){
var leftScroll = $("#segmenter").scrollLeft();
$('.seq-fixed').css({'left':+leftScroll});
});
},
/*
......@@ -199,7 +205,6 @@ Segment.prototype = {
div_elem.innerHTML = '';
div_elem.className = "seq-fixed";
div_elem.style.display = "block";
var seq_name = document.createElement('span');
seq_name.className = "nameBox";
......
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