diff --git a/examples/graph2d/17_dynamicStyling.html b/examples/graph2d/17_dynamicStyling.html index 9600a8c7..0bbf26dd 100644 --- a/examples/graph2d/17_dynamicStyling.html +++ b/examples/graph2d/17_dynamicStyling.html @@ -110,6 +110,42 @@ + + Points Color + + + + + + Point line thickness + + + + + + Points Fill Color + + + + @@ -135,8 +171,7 @@ dataAxis: { showMinorLabels: false, icons: true - }, - legend: {left: {position: "top-left"}} + } }; var groupData = { @@ -165,7 +200,11 @@ groupData.style += document.getElementById("thickness").value; groupData.options.drawPoints = {}; + groupData.options.drawPoints.styles = ""; groupData.options.drawPoints.style = document.getElementById("points").value; + groupData.options.drawPoints.styles += document.getElementById("pointcolor").value; + groupData.options.drawPoints.styles += document.getElementById("pointthickness").value; + groupData.options.drawPoints.styles += document.getElementById("pointfill").value; groupData.options.drawPoints.size = Number(document.getElementById("pointsize").value); if (groupData.options.drawPoints.style == "") { groupData.options.drawPoints = false; diff --git a/lib/DOMutil.js b/lib/DOMutil.js index 38b35c7e..5cc01f6f 100644 --- a/lib/DOMutil.js +++ b/lib/DOMutil.js @@ -139,7 +139,6 @@ exports.drawPoint = function(x, y, group, JSONcontainer, svgContainer) { point.setAttributeNS(null, "cx", x); point.setAttributeNS(null, "cy", y); point.setAttributeNS(null, "r", 0.5 * group.options.drawPoints.size); - point.setAttributeNS(null, "class", group.className + " point"); } else { point = exports.getSVGElement('rect',JSONcontainer,svgContainer); @@ -147,8 +146,12 @@ exports.drawPoint = function(x, y, group, JSONcontainer, svgContainer) { point.setAttributeNS(null, "y", y - 0.5*group.options.drawPoints.size); point.setAttributeNS(null, "width", group.options.drawPoints.size); point.setAttributeNS(null, "height", group.options.drawPoints.size); - point.setAttributeNS(null, "class", group.className + " point"); } + + if(group.options.drawPoints.styles !== undefined) { + point.setAttributeNS(null, "style", group.group.options.drawPoints.styles); + } + point.setAttributeNS(null, "class", group.className + " point"); return point; };