Commit 46c54dc0 authored by Marc Duez's avatar Marc Duez
Browse files

browser : update system/label

- fix css
- debug color by V/J
parent c93fe76f
...@@ -265,6 +265,8 @@ line { ...@@ -265,6 +265,8 @@ line {
font-weight: bold; font-weight: bold;
height: 0px; height: 0px;
position: relative; position: relative;
-webkit-transition: left 0.5s;
transition: left 0.5s;
} }
.sp_system_label:hover { .sp_system_label:hover {
color: #fdf6e3; color: #fdf6e3;
...@@ -397,6 +399,10 @@ line { ...@@ -397,6 +399,10 @@ line {
display: inline-block; display: inline-block;
min-width: 85px; min-width: 85px;
height: 20px; height: 20px;
cursor: pointer;
}
.hiddenCheckBox {
display: none;
} }
.clusterBox { .clusterBox {
width: 16px; width: 16px;
...@@ -578,6 +584,7 @@ span .substitution { ...@@ -578,6 +584,7 @@ span .substitution {
display: block; display: block;
text-align: left; text-align: left;
} }
.systemBoxNameMenu:hover,
.button:hover, .button:hover,
.button_right:hover, .button_right:hover,
.buttonSelector:hover, .buttonSelector:hover,
......
...@@ -265,6 +265,8 @@ line { ...@@ -265,6 +265,8 @@ line {
font-weight: bold; font-weight: bold;
height: 0px; height: 0px;
position: relative; position: relative;
-webkit-transition: left 0.5s;
transition: left 0.5s;
} }
.sp_system_label:hover { .sp_system_label:hover {
color: #002b36; color: #002b36;
...@@ -397,6 +399,10 @@ line { ...@@ -397,6 +399,10 @@ line {
display: inline-block; display: inline-block;
min-width: 85px; min-width: 85px;
height: 20px; height: 20px;
cursor: pointer;
}
.hiddenCheckBox {
display: none;
} }
.clusterBox { .clusterBox {
width: 16px; width: 16px;
...@@ -578,6 +584,7 @@ span .substitution { ...@@ -578,6 +584,7 @@ span .substitution {
display: block; display: block;
text-align: left; text-align: left;
} }
.systemBoxNameMenu:hover,
.button:hover, .button:hover,
.button_right:hover, .button_right:hover,
.buttonSelector:hover, .buttonSelector:hover,
......
...@@ -324,6 +324,8 @@ line { ...@@ -324,6 +324,8 @@ line {
font-weight : bold; font-weight : bold;
height:0px; height:0px;
position:relative; position:relative;
-webkit-transition: left 0.5s;
transition: left 0.5s;
} }
.sp_system_label:hover{ .sp_system_label:hover{
...@@ -492,10 +494,14 @@ line { ...@@ -492,10 +494,14 @@ line {
.systemBoxNameMenu { .systemBoxNameMenu {
display: inline-block; display: inline-block;
min-width: 85px; min-width: 70px;
height: 20px; height: 20px;
cursor : pointer;
} }
.hiddenCheckBox {
display : none;
}
.clusterBox{ .clusterBox{
width: @width_clusterBox; width: @width_clusterBox;
...@@ -704,7 +710,7 @@ span .substitution{ ...@@ -704,7 +710,7 @@ span .substitution{
text-align:left; text-align:left;
} }
.button:hover,.button_right:hover, .buttonSelector:hover, .button2:hover{ .systemBoxNameMenu:hover, .button:hover,.button_right:hover, .buttonSelector:hover, .button2:hover{
background : @border; background : @border;
color : @select; color : @select;
} }
...@@ -1261,6 +1267,7 @@ span.alert { color: red; } ...@@ -1261,6 +1267,7 @@ span.alert { color: red; }
display : block; display : block;
bottom : 0px; bottom : 0px;
right : 0px; right : 0px;
z-index: 100;
} }
#log_container { #log_container {
......
...@@ -90,7 +90,7 @@ Axis.prototype = { ...@@ -90,7 +90,7 @@ Axis.prototype = {
//labels //labels
for (var key in gene_list){ for (var key in gene_list){
self.labels.push(self.label("line", ((gene_list[key].rank+0.5)/(total_gene+1)), key, "")); self.labels.push(self.label("line", ((gene_list[key].rank+0.5)/(total_gene+1)), key, this.germline.gene[key].color));
} }
if (displayAllele){ if (displayAllele){
...@@ -100,7 +100,7 @@ Axis.prototype = { ...@@ -100,7 +100,7 @@ Axis.prototype = {
var total_allele = gene_list[gene].n var total_allele = gene_list[gene].n
var pos = ((gene_list[gene].rank+0.5)/(total_gene+1)) var pos = ((gene_list[gene].rank+0.5)/(total_gene+1))
pos += (1/(total_gene+1)) * ((allele_list[key].rank+0.5)/total_allele) - (0.5/(total_gene+1)) pos += (1/(total_gene+1)) * ((allele_list[key].rank+0.5)/total_allele) - (0.5/(total_gene+1))
self.labels.push(self.label("subline", pos, "*"+allele, "")); self.labels.push(self.label("subline", pos, "*"+allele, this.germline.allele[key].color));
} }
} }
......
...@@ -630,6 +630,7 @@ Builder.prototype = { ...@@ -630,6 +630,7 @@ Builder.prototype = {
var checkbox=document.createElement("input"); var checkbox=document.createElement("input");
checkbox.type="checkbox"; checkbox.type="checkbox";
checkbox.id = "checkbox_system_"+key checkbox.id = "checkbox_system_"+key
checkbox.className = "hiddenCheckBox"
checkbox.appendChild(document.createTextNode(key)) checkbox.appendChild(document.createTextNode(key))
if (this.m.system_selected.indexOf(key) != -1) if (this.m.system_selected.indexOf(key) != -1)
checkbox.checked=true checkbox.checked=true
...@@ -642,9 +643,14 @@ Builder.prototype = { ...@@ -642,9 +643,14 @@ Builder.prototype = {
var span = document.createElement('span'); var span = document.createElement('span');
span.className = "systemBoxNameMenu"; span.className = "systemBoxNameMenu";
if (this.m.system_selected.indexOf(key) == -1)
span.className = "systemBoxNameMenu inactive";
span.appendChild(span_system) span.appendChild(span_system)
span.appendChild(checkbox) span.appendChild(checkbox)
span.appendChild(document.createTextNode(key)) span.appendChild(document.createTextNode(key))
span.onclick = function () {
this.firstChild.nextSibling.click();
}
span2.appendChild(span) span2.appendChild(span)
} }
......
...@@ -264,11 +264,11 @@ Clone.prototype = { ...@@ -264,11 +264,11 @@ Clone.prototype = {
this.color = tagColor[this.tag]; this.color = tagColor[this.tag];
}else if (this.m.colorMethod == "dbscan"){ }else if (this.m.colorMethod == "dbscan"){
this.color = this.colorDBSCAN; this.color = this.colorDBSCAN;
}else if (this.m.colorMethod == "V" && this.seg["5"] !== undefined){ }else if (this.m.colorMethod == "V" && this.getV() != "undefined V"){
this.color = this.colorV; this.color = this.colorV;
}else if (this.m.colorMethod == "D" && this.seg["4"] !== undefined){ }else if (this.m.colorMethod == "D" && this.getD() != "undefined D"){
this.color = this.colorD; this.color = this.colorD;
}else if (this.m.colorMethod == "J" && this.seg["3"] !== undefined){ }else if (this.m.colorMethod == "J" && this.getJ() != "undefined J"){
this.color = this.colorJ; this.color = this.colorJ;
}else if (this.m.colorMethod == "N"){ }else if (this.m.colorMethod == "N"){
this.color = this.colorN; this.color = this.colorN;
......
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