Commit f9a3ce9f authored by Marc Duez's avatar Marc Duez

Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into server

parents f16f06fc ea9b361b
......@@ -11,10 +11,10 @@ $ Parses germline/IGHJ.fa
1: 701 bp in 13 sequences
$ Find the good number of "too short sequences" for windows of size 100
1: SEG, but no window -> 2046
1: SEG, but no window -> 2052
$ Find the good number of segmented sequences (including "too short sequences")
1: segmented 11316 reads .86%.
1: segmented 11311 reads .86%.
$ Find the good number of windows of size 100 in Stanford S22
1: found 8323 100-windows in 9270 segments
1: found 8314 100-windows in 9259 segments
......@@ -14,7 +14,7 @@ html{
body {
font-family: Arial, Helvetica, Sans-serif;
font-size: 14px;
font-size: 13px;
height : 100%;
margin:0px;
color : @default;
......@@ -103,7 +103,7 @@ max-height: calc(~"100%" - @margin)
#info{
font-family : Courier New,monaco,terminal,courier,system;
font-size: 14px;
font-size: 13px;
height :150px;
padding:3px;
background : @background;
......@@ -197,12 +197,18 @@ max-height: calc(~"100%" - @margin)
opacity : 0.75;
}
.graph_text, .graph_time{
.graph_time{
font-weight : bold;
fill : @secondary ;
text-anchor:middle;
}
.graph_text{
font-weight : bold;
fill : @secondary ;
text-anchor:end;
}
.graph_time:hover{
cursor:pointer;
fill : @select;
......@@ -346,8 +352,7 @@ max-height: calc(~"100%" - @margin)
.listElem{
width : @width_listElem;
font-family : Courier New,monaco,terminal,courier,system;
font-size: 14px;
font-size: 13px;
cursor:pointer;
-webkit-transition: color 0.2s;
-o-transition: color 0.2s;
......@@ -442,7 +447,7 @@ max-height: calc(~"100%" - @margin)
#listSeq {
font-weight: bold;
font-family: Courier New,monaco,terminal,courier,system;
font-size: 14px;
font-size: 13px;
}
.sequence-line {
......@@ -515,7 +520,7 @@ max-height: calc(~"100%" - @margin)
min-width:400px;
margin-left:-250px;
left :50%;
font-size: 14px;
font-size: 13px;
padding: 10px;
background:inherit;
display:none;
......@@ -524,7 +529,7 @@ max-height: calc(~"100%" - @margin)
.buttonSelector {
background : @background;
cursor:pointer;
font-size: 14px;
font-size: 13px;
margin :2px;
display:block;
text-align:left;
......@@ -546,7 +551,7 @@ max-height: calc(~"100%" - @margin)
top: 250px;
left:50% ;
width:500px;
font-size: 14px;
font-size: 13px;
padding: 10px;
background: @background;
display:none;
......@@ -571,7 +576,7 @@ max-height: calc(~"100%" - @margin)
position: fixed;
top: 50px;
left: 20px + @width_left_container;
font-size: 14px;
font-size: 13px;
padding: 10px;
background: @background;
display:none;
......@@ -616,7 +621,7 @@ max-height: calc(~"100%" - @margin)
.button {
cursor:pointer;
font-size: 14px;
font-size: 13px;
padding: 0px 3px;
margin-right:5px;
margin-left:5px;
......@@ -626,7 +631,7 @@ max-height: calc(~"100%" - @margin)
.smallbutton {
cursor:pointer;
font-size: 14px;
font-size: 13px;
text-decoration:underline;
}
......@@ -878,4 +883,4 @@ span .substitution{
left: -moz-calc(~"50% - 480px");
left: -webkit-calc(~"50% - 480px");
left: calc(~"50% - 480px");
}
\ No newline at end of file
}
......@@ -108,14 +108,6 @@
</div>
</div>
<div id="norm" class="menu" onmouseover="showSelector('ratioSelector');"> normalize
<div id="ratioSelector" class="selector">
<!--TODO generer automatiquement-->
<a class="buttonSelector" onclick="m.normalization_switch(false);">off</a>
<a class="buttonSelector" onclick="m.normalization_switch(true);">on</a>
</div>
</div>
<div class="menu" onmouseover="showSelector('groupSelector');"> analysis
<div id="groupSelector" class="selector">
<a class="buttonSelector" onclick="sp.changeSplitMethod('gene_v', 'gene_j');">V / J (genes)</a>
......@@ -141,13 +133,24 @@
<div id="display_menu" class="menu" onmouseover="showSelector('displaySelector');"> display
<div id="displaySelector" class="selector">
<div>
</br>
<input id="top_slider" type="range" min="5" max="100" step="5" value="10"
onchange="m.displayTop(this.value)" />
</div>
<ul>
</ul>
<div>normalize
<input id="normalize" type="checkbox" name="normalize" onclick="m.normalization_switch(this.checked);">
</div>
<div>scientific notation
<input id="notation" type="checkbox" name="notation" onclick="m.notation_switch(this.checked);">
</div>
</div>
</div>
......
......@@ -263,7 +263,7 @@ Builder.prototype = {
var displaySelector = document.getElementById("displaySelector")
var listTag = displaySelector.getElementsByTagName("ul")[0]
//reset
listTag.innerHTML = "";
......@@ -307,6 +307,10 @@ Builder.prototype = {
max_top = (Math.ceil(max_top / 5)) * 5
document.getElementById("top_slider")
.max = max_top;
if (m.notation_type == "scientific") {
document.getElementById("notation").checked = true
}
initTag();
},
......
......@@ -36,7 +36,7 @@ function Graph(id, model) {
this.marge1 = 0.05; //marge droite bord du graph/premiere colonne
this.marge2 = 0.08; //marge gauche derniere colonne/bord du graph
this.marge3 = 0; //marge droite (non influencé par le resize)
this.marge4 = 80; //marge gauche (non influencé par le resize)
this.marge4 = 60; //marge gauche (non influencé par le resize)
this.marge5 = 25; //marge top (non influencé par le resize)
this.data_axis = [];
......@@ -44,6 +44,9 @@ function Graph(id, model) {
this.drag_on = false;
this.dragged_time_point = 0;
this.text_position_y = 15;
this.text_position_x = 60;
this.m.view.push(this)
......@@ -517,10 +520,10 @@ Graph.prototype = {
})
.attr("y", function (d) {
if (d.type == "axis_h") return Math.floor(self.resizeH * d.pos) + self.marge5;
else return 15;
else return self.text_position_y;
})
.attr("x", function (d) {
if (d.type == "axis_h") return 40;
if (d.type == "axis_h") return self.text_position_x;
else return Math.floor(self.resizeW * d.pos + self.marge4);
})
.attr("class", function (d) {
......
......@@ -878,6 +878,19 @@ Model.prototype = {
this.norm = newR;
this.update();
},
/* use scientific notation ( true/false )
*
* */
notation_switch: function (newR) {
console.log("scientific notation : " + newR)
if (newR==true) {
this.notation_type = "scientific"
}else{
this.notation_type = "percent"
}
this.update();
},
/* change the current tracking point used
......
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