closes #12, #10

benkeen · Jun 7, 2014 · 680eaaa · 680eaaa
1 parent a99e889
commit 680eaaa
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 2 deletions.
diff --git a/d3pie-source/_labels.js b/d3pie-source/_labels.js
@@ -128,6 +128,12 @@ var labels = {
 		var quarter = Math.floor(angle / 90);
 		var midPoint = 4;
 		var x2, y2, x3, y3;
+
+		// this resolves an issue when the
+		if (quarter === 2 && angle === 180) {
+			quarter = 1;
+		}
+
 		switch (quarter) {
 			case 0:
 				x2 = pie.outerLabelGroupData[i].x - labelXMargin - ((pie.outerLabelGroupData[i].x - labelXMargin - originCoords.x) / 2);
@@ -346,6 +352,10 @@ var labels = {
 	},
 
 	checkConflict: function(pie, currIndex, direction, size) {
+		if (size <= 1) {
+			return;
+		}
+
 		var currIndexHemisphere = pie.outerLabelGroupData[currIndex].hs;
 		if (direction === "clockwise" && currIndexHemisphere != "right") {
 			return;

diff --git a/d3pie/d3pie.js b/d3pie/d3pie.js
@@ -716,6 +716,12 @@ var labels = {
 		var quarter = Math.floor(angle / 90);
 		var midPoint = 4;
 		var x2, y2, x3, y3;
+
+		// this resolves an issue when the
+		if (quarter === 2 && angle === 180) {
+			quarter = 1;
+		}
+
 		switch (quarter) {
 			case 0:
 				x2 = pie.outerLabelGroupData[i].x - labelXMargin - ((pie.outerLabelGroupData[i].x - labelXMargin - originCoords.x) / 2);
@@ -934,6 +940,10 @@ var labels = {
 	},
 
 	checkConflict: function(pie, currIndex, direction, size) {
+		if (size <= 1) {
+			return;
+		}
+
 		var currIndexHemisphere = pie.outerLabelGroupData[currIndex].hs;
 		if (direction === "clockwise" && currIndexHemisphere != "right") {
 			return;

diff --git a/d3pie/d3pie.min.js b/d3pie/d3pie.min.js
diff --git a/website/examples/single.html b/website/examples/single.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>d3pie examples</title>
+</head>
+<body>
+<h1>
+	<a href="../../#examples">Standalone Examples</a> &raquo; Single Item
+</h1>
+
+<p>
+	A pie chart with a single item. Thrilling stuff, really.
+</p>
+
+<hr size="1" />
+
+<div id="pie"></div>
+
+<script src="../libs/jquery.js"></script>
+<script src="../libs/d3.min.js"></script>
+<script src="../../d3pie/d3pie.js"></script>
+
+<script>
+	var pie = new d3pie("pie", {
+		header: {
+			title: {
+				text: "A Pie with One Item",
+				fontSize: 30
+			}
+		},
+		data: {
+			content: [
+				{ label: "JavaScript", value: 50 }
+			]
+		}
+	});
+</script>
+
+<hr size="1" />
+
+<blockquote><pre>
+var pie = new d3pie("pie", {
+	header: {
+		title: {
+			text: "A Pie with One Item"
+		}
+	},
+	data: {
+		content: [
+			{ label: "JavaScript", value: 50 }
+		]
+	}
+});
+</pre></blockquote>
+
+</body>
+</html>
diff --git a/website/pages/about/aboutPageDemoPies.js b/website/pages/about/aboutPageDemoPies.js
@@ -139,7 +139,7 @@ define([], function() {
 				titleSubtitlePadding: 6
 			},
 			footer: {
-				text:     "* We're not sure why several people regard Winnipeg as a Top 10 Fear.",
+				text:     "* We're not sure why several people regard Winnipeg as a Top 15 Fear.",
 				color:    "#999999",
 				fontSize: 10,
 				font:     "open sans",