Commit ad2447e5 authored by Jean-Clement Gallardo's avatar Jean-Clement Gallardo
Browse files

manage general style + flux vizu

parent 3c58eef8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/** /**
* The version of the application. * The version of the application.
*/ */
"version": "3.1.2", "version": "3.1.3",
/** /**
* 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.).
......
...@@ -484,6 +484,7 @@ metExploreD3.GraphFlux = { ...@@ -484,6 +484,7 @@ metExploreD3.GraphFlux = {
curveEdge: function(){ curveEdge: function(){
var panel = "viz"; var panel = "viz";
var reactionStyle = metExploreD3.getReactionStyle(); var reactionStyle = metExploreD3.getReactionStyle();
var linkStyle = metExploreD3.getLinkStyle();
var reactions = d3.select("#"+panel).select("#D3viz").select("#graphComponent") var reactions = d3.select("#"+panel).select("#D3viz").select("#graphComponent")
.selectAll("g.node") .selectAll("g.node")
.filter(function(node){ .filter(function(node){
...@@ -684,6 +685,7 @@ metExploreD3.GraphFlux = { ...@@ -684,6 +685,7 @@ metExploreD3.GraphFlux = {
}); });
} }
if (node.fluxDirection1 === undefined){ if (node.fluxDirection1 === undefined){
var color = linkStyle.getStrokeColor();
enteringLinks enteringLinks
.each(function (link) { .each(function (link) {
var path; var path;
...@@ -699,9 +701,11 @@ metExploreD3.GraphFlux = { ...@@ -699,9 +701,11 @@ metExploreD3.GraphFlux = {
node.axe = axe; node.axe = axe;
d3.select(this).attr("d", path) d3.select(this).attr("d", path)
.attr("fill", "none") .attr("fill", "none")
.attr("stroke", color)
.classed("horizontal", false) .classed("horizontal", false)
.classed("vertical", false) .classed("vertical", false)
.classed(axe, true) .classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6) .style("opacity", 0.6)
.style("stroke-width",1); .style("stroke-width",1);
}); });
...@@ -721,9 +725,11 @@ metExploreD3.GraphFlux = { ...@@ -721,9 +725,11 @@ metExploreD3.GraphFlux = {
d3.select(this).attr("d", path) d3.select(this).attr("d", path)
.attr("fill", "none") .attr("fill", "none")
.attr("stroke", color)
.classed("horizontal", false) .classed("horizontal", false)
.classed("vertical", false) .classed("vertical", false)
.classed(axe, true) .classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6) .style("opacity", 0.6)
.style("stroke-width",1); .style("stroke-width",1);
}); });
...@@ -738,6 +744,7 @@ metExploreD3.GraphFlux = { ...@@ -738,6 +744,7 @@ metExploreD3.GraphFlux = {
*/ */
curveTwoEdge: function(){ curveTwoEdge: function(){
var reactionStyle = metExploreD3.getReactionStyle(); var reactionStyle = metExploreD3.getReactionStyle();
var linkStyle = metExploreD3.getLinkStyle();
var reactions = d3.select("#viz").select("#D3viz").select("#graphComponent") var reactions = d3.select("#viz").select("#D3viz").select("#graphComponent")
.selectAll("g.node") .selectAll("g.node")
.filter(function(node){ .filter(function(node){
...@@ -1115,6 +1122,7 @@ metExploreD3.GraphFlux = { ...@@ -1115,6 +1122,7 @@ metExploreD3.GraphFlux = {
}); });
} }
if (node.fluxDirection1 === undefined || node.fluxDirection2 === undefined){ if (node.fluxDirection1 === undefined || node.fluxDirection2 === undefined){
var color = linkStyle.getStrokeColor();
enteringLinks enteringLinks
.each(function (link) { .each(function (link) {
var path; var path;
...@@ -1133,6 +1141,7 @@ metExploreD3.GraphFlux = { ...@@ -1133,6 +1141,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false) .classed("horizontal", false)
.classed("vertical", false) .classed("vertical", false)
.classed(axe, true) .classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6) .style("opacity", 0.6)
.style("stroke-width",1); .style("stroke-width",1);
}); });
...@@ -1155,6 +1164,7 @@ metExploreD3.GraphFlux = { ...@@ -1155,6 +1164,7 @@ metExploreD3.GraphFlux = {
.classed("horizontal", false) .classed("horizontal", false)
.classed("vertical", false) .classed("vertical", false)
.classed(axe, true) .classed(axe, true)
.classed("fluxstylelink", true)
.style("opacity", 0.6) .style("opacity", 0.6)
.style("stroke-width",1); .style("stroke-width",1);
}); });
......
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