picto, trad, orthographe, accents...

1twitif · Mar 10, 2017 · 5d0c62f · 5d0c62f · 1000i100 · Mar 10, 2017
1 parent fcc20f0
commit 5d0c62f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/staticApp/appDefault.yml b/staticApp/appDefault.yml
@@ -11,6 +11,8 @@ panels:
   tools-panel: small
 zoomPrecisionK: 3
 zoomPrecisionXY: 2
+nodeStyle:
+  selectionSize: 0.75
 fixedNode:
   sides: 8
   tension: -2

diff --git a/staticApp/graph.js b/staticApp/graph.js
@@ -159,16 +159,18 @@ define([
 				nodeEnter.append("circle")
 					.attr("cx", 0).attr("cy", 0)
 					.attr("r", function (n) {
-						return n.r = options.nodeBaseRadius * nodeRadiusScale(n.degree);
+						n.r = options.nodeBaseRadius * nodeRadiusScale(n.degree);
+						return n.r * options.nodeStyle.selectionSize
 					})
-					.attr("opacity", .2) //FIXME: nombre magique
+					//.attr("opacity", .2) //FIXME: nombre magique
 					.attr("fill", function (d) {
 						return color(0);//FIXME: couleur magique
 					});
 				nodeEnter.append("path")
 					.attr("d", function (n) {
-						return points2Path(regularPolygon(0, 0, n.r, options.fixedNode.sides), options.fixedNode.tension);
+						return points2Path(regularPolygon(0, 0, n.r * options.nodeStyle.selectionSize, options.fixedNode.sides), options.fixedNode.tension)+' z';
 					})
+					.attr("transform","rotate(22.5)")
 					.attr("fill", function (d) {
 						return color(0);//FIXME: couleur magique
 					});
@@ -484,7 +486,7 @@ define([
 					.y(function (d) {
 						return d.y;
 					})
-					.curve(d3.curveCardinalClosed.tension(tension));
+					//.curve(d3.curveCardinalClosed.tension(tension));
 				return drawer(points);
 			}
 		});

diff --git a/staticApp/style.css b/staticApp/style.css
@@ -313,17 +313,17 @@ body {
   cursor: pointer;
 }
 .node circle {
-  opacity: 0.2;
+  opacity: 0;
 }
 .node path {
-  opacity: 0.7;
+  opacity: 0.2;
   display: none;
 }
 .node:hover {
   cursor: pointer;
 }
 .node:hover circle {
-  opacity: 0.7;
+  opacity: 0.3;
 }
 .node.fixed path {
   display: block;
@@ -332,7 +332,7 @@ body {
   display: none;
 }
 .node.fixed:hover path {
-  opacity: 1;
+  opacity: 0.7;
 }
 .node.selected path,
 .node.selected circle {

diff --git a/staticApp/style.styl b/staticApp/style.styl
@@ -34,22 +34,22 @@ body
 
 .node
 	circle
-		opacity 0.2
+		opacity 0 // 0.2
 	path
-		opacity 0.7
+		opacity 0.2 // 0.7
 		display none
 	&:hover
 		cursor pointer
 		circle
-			opacity 0.7
+			opacity 0.3 // 0.7
 	&.fixed
 		path
 			display block
 		circle
 			display none
 		&:hover
 			path
-				opacity 1
+				opacity 0.7 // 1
 	&.selected path, &.selected circle
 		stroke-width 4px
 		stroke #CC4444