Commit 142480be authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/696-add-separators-between-keywords-in-phylo' into dev

parents dbf5d605 d1c63881
...@@ -11292,6 +11292,9 @@ select.form-control { ...@@ -11292,6 +11292,9 @@ select.form-control {
.phylo .term:hover { .phylo .term:hover {
font-weight: bold; font-weight: bold;
} }
.phylo .separator {
fill: #B5B5B5;
}
.phylo .term-path { .phylo .term-path {
fill: none; fill: none;
stroke: #F24C3D; stroke: #F24C3D;
......
...@@ -11138,6 +11138,9 @@ select.form-control { ...@@ -11138,6 +11138,9 @@ select.form-control {
.phylo .term:hover { .phylo .term:hover {
font-weight: bold; font-weight: bold;
} }
.phylo .separator {
fill: #B5B5B5;
}
.phylo .term-path { .phylo .term-path {
fill: none; fill: none;
stroke: #F24C3D; stroke: #F24C3D;
......
...@@ -11363,6 +11363,9 @@ select.form-control { ...@@ -11363,6 +11363,9 @@ select.form-control {
.phylo .term:hover { .phylo .term:hover {
font-weight: bold; font-weight: bold;
} }
.phylo .separator {
fill: #B5B5B5;
}
.phylo .term-path { .phylo .term-path {
fill: none; fill: none;
stroke: #F24C3D; stroke: #F24C3D;
......
...@@ -11436,6 +11436,9 @@ select.form-control { ...@@ -11436,6 +11436,9 @@ select.form-control {
.phylo .term:hover { .phylo .term:hover {
font-weight: bold; font-weight: bold;
} }
.phylo .separator {
fill: #B5B5B5;
}
.phylo .term-path { .phylo .term-path {
fill: none; fill: none;
stroke: #F24C3D; stroke: #F24C3D;
......
...@@ -119,5 +119,5 @@ nodeCpt = R2.hereComponent here "node" hCpt where ...@@ -119,5 +119,5 @@ nodeCpt = R2.hereComponent here "node" hCpt where
] ]
_ -> H.p _ -> H.p
{ className: "text-center pt-10" } { className: "text-center pt-10" }
[ H.text "Phylo not generated yet, please update the node settings to see your phylonometry." ] [ H.text "Phylo not generated yet, please update the node settings to see your phylomemy." ]
} }
...@@ -2062,7 +2062,9 @@ function setGroup(g, xScale, yScale, wScale) { ...@@ -2062,7 +2062,9 @@ function setGroup(g, xScale, yScale, wScale) {
fdt = lines[i].fdt, fdt = lines[i].fdt,
roles = lines[i].role, roles = lines[i].role,
terms = mergeLists(words,fdt,roles), terms = mergeLists(words,fdt,roles),
toSpan = (acc, w) => acc + "<tspan fdt=" + w[1] toSpan = (acc, w, index) => {
let separator = index < terms.length - 1 ? "<tspan class='separator'> | </tspan>" : "";
return acc + "<tspan fdt=" + w[1]
+ " class='term fdt-" + w[1] + " " + "g-" + g.gId + findRole(w[2]) + "'" + " class='term fdt-" + w[1] + " " + "g-" + g.gId + findRole(w[2]) + "'"
+ " gy=" + yScale(g.to) + " gy=" + yScale(g.to)
+ " gx=" + xScale(g.x) + " gx=" + xScale(g.x)
...@@ -2071,7 +2073,9 @@ function setGroup(g, xScale, yScale, wScale) { ...@@ -2071,7 +2073,9 @@ function setGroup(g, xScale, yScale, wScale) {
+ " gid=" + g.gId + " gid=" + g.gId
+ " bid=" + g.bId + " bid=" + g.bId
+ " from=" + (g.to).getFullYear() + " from=" + (g.to).getFullYear()
+ ">" + w[0] + "</tspan>"; + ">" + w[0] + "</tspan>"
+ separator;
};
panel panel
.append("text") .append("text")
......
...@@ -209,7 +209,10 @@ $decreasing-color: #11638F; ...@@ -209,7 +209,10 @@ $decreasing-color: #11638F;
.term:hover { .term:hover {
font-weight: bold; font-weight: bold;
} }
.separator {
fill: $graph-heading-color;
}
// .term-unfocus { // .term-unfocus {
// fill: #A9A9A9; // fill: #A9A9A9;
// } // }
......
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