From 0ec6ca3bd29a9fd5050542407ced0f2dc8fcaba3 Mon Sep 17 00:00:00 2001
From: g21589 <g21589@gmail.com>
Date: Thu, 3 Dec 2015 17:11:11 +0800
Subject: [PATCH] Support xAxis labels in chart

---
 js/pptx2html.js | 38 +++-----------------------------------
 js/worker.js    | 23 +++++++++++------------
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/js/pptx2html.js b/js/pptx2html.js
index 03208a4..45d0df9 100644
--- a/js/pptx2html.js
+++ b/js/pptx2html.js
@@ -168,59 +168,27 @@ function processSingleMsg(d) {
 	var chart = null;
 	switch (chartType) {
 		case "lineChart":
-			/*
-			for (var i=0; i<chartData.length; i++) {
-				var arr = [];
-				for (var j=0; j<chartData[i].length; j++) {
-					arr.push({x: j, y: chartData[i][j]});
-				}
-				data.push({key: 'data' + (i + 1), values: arr});
-			}
-			*/
 			data = chartData;
 			chart = nv.models.lineChart()
 						.useInteractiveGuideline(true);
-			//chart.xAxis.axisLabel('X').tickFormat(d3.format(',r'));
-			//chart.yAxis.axisLabel('Y').tickFormat(d3.format('.02f'));
+			chart.xAxis.tickFormat(function(d) { return chartData[0].xlabels[d] || d; });
 			break;
 		case "barChart":
-			/*
-			for (var i=0; i<chartData.length; i++) {
-				var arr = [];
-				for (var j=0; j<chartData[i].length; j++) {
-					arr.push({x: j, y: chartData[i][j]});
-				}
-				data.push({key: 'data' + (i + 1), values: arr});
-			}
-			*/
 			data = chartData;
 			chart = nv.models.multiBarChart();
-			//chart.xAxis.axisLabel('X').tickFormat(d3.format(',r'));
-			//chart.yAxis.axisLabel('Y').tickFormat(d3.format('.02f'));
+			chart.xAxis.tickFormat(function(d) { return chartData[0].xlabels[d] || d; });
 			break;
 		case "pieChart":
 		case "pie3DChart":
 			data = chartData[0].values;
 			chart = nv.models.pieChart();
-						//.x(function(d) { return d.x })
-						//.y(function(d) { return d.y });
 			break;
 		case "areaChart":
-			/*
-			for (var i=0; i<chartData.length; i++) {
-				var arr = [];
-				for (var j=0; j<chartData[i].length; j++) {
-					arr.push({x: j, y: chartData[i][j]});
-				}
-				data.push({key: 'data' + (i + 1), values: arr});
-			}
-			*/
 			data = chartData;
 			chart = nv.models.stackedAreaChart()
 						.clipEdge(true)
 						.useInteractiveGuideline(true);
-			//chart.xAxis.axisLabel('X').tickFormat(d3.format(',r'));
-			//chart.yAxis.axisLabel('Y').tickFormat(d3.format('.02f'));
+			chart.xAxis.tickFormat(function(d) { return chartData[0].xlabels[d] || d; });
 			break;
 		case "scatterChart":
 			
diff --git a/js/worker.js b/js/worker.js
index 24cdc35..8ccb3f8 100644
--- a/js/worker.js
+++ b/js/worker.js
@@ -1454,24 +1454,23 @@ function extractChartData(serNode) {
 		eachElement(serNode, function(innerNode, index) {
 			var dataRow = new Array();
 			var colName = getTextByPathList(innerNode, ["c:tx", "c:strRef", "c:strCache", "c:pt", "c:v"]) || index;
-			
-			// Bug: Category string must be quantifed to display on chart
-			/*
+
+			// Category
 			var rowNames = {};
-			// category
-			eachElement(innerNode["c:cat"]["c:strRef"]["c:strCache"]["c:pt"], function(innerNode, index) {
-				rowNames[innerNode["attrs"]["idx"]] = innerNode["c:v"];
-				return "";
-			});
-			*/
+			if (getTextByPathList(innerNode, ["c:cat", "c:strRef", "c:strCache", "c:pt"]) !== undefined) {
+				eachElement(innerNode["c:cat"]["c:strRef"]["c:strCache"]["c:pt"], function(innerNode, index) {
+					rowNames[innerNode["attrs"]["idx"]] = innerNode["c:v"];
+					return "";
+				});
+			}
 			
-			// value
+			// Value
 			eachElement(innerNode["c:val"]["c:numRef"]["c:numCache"]["c:pt"], function(innerNode, index) {
-				//dataRow.push({x: rowNames[innerNode["attrs"]["idx"]], y: parseFloat(innerNode["c:v"])});
 				dataRow.push({x: innerNode["attrs"]["idx"], y: parseFloat(innerNode["c:v"])});
 				return "";
 			});
-			dataMat.push({key: colName, values: dataRow});
+			
+			dataMat.push({key: colName, values: dataRow, xlabels: rowNames});
 			return "";
 		});
 	}