Commit 13832e89 authored by maxchaza's avatar maxchaza

Merge branch 'hotfix/linksPersistanec'

parents 6b57f948 d1136bde
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/** /**
* The version of the application. * The version of the application.
*/ */
"version": "3.0.5", "version": "3.0.6",
/** /**
* The relative path to the application's markup file (html, jsp, asp, etc.). * The relative path to the application's markup file (html, jsp, asp, etc.).
......
...@@ -66,7 +66,7 @@ metExploreD3.GraphLink = { ...@@ -66,7 +66,7 @@ metExploreD3.GraphLink = {
.classed("pathway", true) .classed("pathway", true)
.attr('id', pathw.getName().replace(/[.*+?^${} ()|[\]\-\\]/g, "")) .attr('id', pathw.getName().replace(/[.*+?^${} ()|[\]\-\\]/g, ""))
.classed("hide", true) .classed("hide", true)
.style("stroke-width","3px") .style("stroke-width",linkStyle.getLineWidth()+2)
.style("stroke-dasharray", size+","+size*(cols.length-1)) .style("stroke-dasharray", size+","+size*(cols.length-1))
.style("stroke-dashoffset", size*i) .style("stroke-dashoffset", size*i)
.style("stroke", pathw.getColor()); .style("stroke", pathw.getColor());
...@@ -330,7 +330,7 @@ metExploreD3.GraphLink = { ...@@ -330,7 +330,7 @@ metExploreD3.GraphLink = {
return linkStyle.getMarkerInColor(); return linkStyle.getMarkerInColor();
}) })
.style("stroke", linkStyle.getStrokeColor()) .style("stroke", linkStyle.getStrokeColor())
.style("stroke-width", 0.5) .style("stroke-width", linkStyle.getLineWidth())
.style("opacity", 1) .style("opacity", 1)
.style("stroke-dasharray", null); .style("stroke-dasharray", null);
...@@ -375,7 +375,7 @@ metExploreD3.GraphLink = { ...@@ -375,7 +375,7 @@ metExploreD3.GraphLink = {
return linkStyle.getMarkerInColor(); return linkStyle.getMarkerInColor();
}) })
.style("stroke", linkStyle.getStrokeColor()) .style("stroke", linkStyle.getStrokeColor())
.style("stroke-width", 0.5) .style("stroke-width", linkStyle.getLineWidth())
.style("opacity", 1) .style("opacity", 1)
.style("stroke-dasharray", null); .style("stroke-dasharray", null);
...@@ -415,7 +415,7 @@ metExploreD3.GraphLink = { ...@@ -415,7 +415,7 @@ metExploreD3.GraphLink = {
.attr("fill-rule", "evenodd") .attr("fill-rule", "evenodd")
.attr("id", "link") .attr("id", "link")
.style("stroke", linkStyle.getStrokeColor()) .style("stroke", linkStyle.getStrokeColor())
.style("stroke-width", 0.5) .style("stroke-width", linkStyle.getLineWidth())
d3.select(this) d3.select(this)
.append("svg:path") .append("svg:path")
...@@ -427,7 +427,7 @@ metExploreD3.GraphLink = { ...@@ -427,7 +427,7 @@ metExploreD3.GraphLink = {
.attr("class", "link").classed("reaction", true) .attr("class", "link").classed("reaction", true)
.attr("fill-rule", "evenodd") .attr("fill-rule", "evenodd")
.style("stroke", linkStyle.getStrokeColor()) .style("stroke", linkStyle.getStrokeColor())
.style("stroke-width", 0.5); .style("stroke-width", linkStyle.getLineWidth());
}); });
...@@ -489,7 +489,7 @@ metExploreD3.GraphLink = { ...@@ -489,7 +489,7 @@ metExploreD3.GraphLink = {
.attr("transform", "translate(-10, -15)") .attr("transform", "translate(-10, -15)")
.classed('hide', false) .classed('hide', false)
.style("paint-order", "stroke") .style("paint-order", "stroke")
.style("stroke-width", 1) .style("stroke-width", linkStyle.getLineWidth())
.style("stroke", function () { .style("stroke", function () {
return d3.select(this.parentNode).select("path#link").style('fill'); return d3.select(this.parentNode).select("path#link").style('fill');
}) })
...@@ -560,7 +560,7 @@ metExploreD3.GraphLink = { ...@@ -560,7 +560,7 @@ metExploreD3.GraphLink = {
.attr("transform", "translate(-10, 0)") .attr("transform", "translate(-10, 0)")
.classed('hide', false) .classed('hide', false)
.style("paint-order", "stroke") .style("paint-order", "stroke")
.style("stroke-width", 1) .style("stroke-width", linkStyle.getLineWidth())
.style("stroke", function () { .style("stroke", function () {
return d3.select(this.parentNode).select("path#linkRev").style('fill'); return d3.select(this.parentNode).select("path#linkRev").style('fill');
}) })
...@@ -599,7 +599,7 @@ metExploreD3.GraphLink = { ...@@ -599,7 +599,7 @@ metExploreD3.GraphLink = {
return linkStyle.getMarkerInColor(); return linkStyle.getMarkerInColor();
}) })
.style("stroke",linkStyle.getStrokeColor()) .style("stroke",linkStyle.getStrokeColor())
.style("stroke-width",0.5) .style("stroke-width",linkStyle.getLineWidth())
.style("stroke-linejoin", "bevel"); .style("stroke-linejoin", "bevel");
}, },
...@@ -657,8 +657,11 @@ metExploreD3.GraphLink = { ...@@ -657,8 +657,11 @@ metExploreD3.GraphLink = {
.selectAll("path.link") .selectAll("path.link")
.attr("d", function(link){ .attr("d", function(link){
return funcPath(link, panel, this.id); return funcPath(link, panel, this.id);
}) });
.select('reaction').attr("fill", function (d) {
d3.select("#"+panel).select("#D3viz").select("#graphComponent")
.selectAll("path.link.reaction")
.attr("fill", function (d) {
if (d.interaction == "out") if (d.interaction == "out")
return metExploreD3.getLinkStyle().getMarkerOutColor(); return metExploreD3.getLinkStyle().getMarkerOutColor();
else else
......
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