diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html index de6e0d92e7d..4ea819f4649 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html @@ -126,7 +126,7 @@ -
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js index 6f4dccd7015..545a216920b 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js @@ -1179,6 +1179,12 @@ $scope.setGraphMode($scope.paragraph.config.graph.mode, true, false); }; + $scope.removeScatterOptionLabels = function(idx) { + $scope.paragraph.config.graph.scatter.labels = null; + clearUnknownColsFromGraphOption(); + $scope.setGraphMode($scope.paragraph.config.graph.mode, true, false); + }; + /* Clear unknown columns from graph option */ var clearUnknownColsFromGraphOption = function() { var unique = function(list) { diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js b/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js index de699091432..36a3b470f0f 100644 --- a/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js +++ b/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js @@ -49,6 +49,11 @@ zeppelin.ScatterchartVisualization.prototype.configureChart = function(chart) { // configure how the tooltip looks. chart.tooltipContent(function(key, x, y, graph, data) { var tooltipContent = '' + data.point.label + '
'; + } + if (self.config.scatter.size && self.isValidSizeOption(self.config.scatter, self.tableData.rows)) { tooltipContent += '' + data.point.size + '
'; @@ -66,6 +71,7 @@ zeppelin.ScatterchartVisualization.prototype.setScatterChart = function(data, re var yAxis = this.config.scatter.yAxis; var group = this.config.scatter.group; var size = this.config.scatter.size; + var labels = this.config.scatter.labels; var xValues = []; var yValues = []; @@ -82,6 +88,7 @@ zeppelin.ScatterchartVisualization.prototype.setScatterChart = function(data, re var colIdx = 0; var grpIdx = 0; var grpName = ''; + var labelValue = ''; var xValue; var yValue; @@ -140,6 +147,9 @@ zeppelin.ScatterchartVisualization.prototype.setScatterChart = function(data, re if (group) { grpName = row[group.index]; } + if (labels) { + labelValue = row[labels.index]; + } var sz = (isAllDiscrete) ? row[row.length - 1] : ((size) ? row[size.index] : 1); if (grpNameIndex[grpName] === undefined) { @@ -167,7 +177,8 @@ zeppelin.ScatterchartVisualization.prototype.setScatterChart = function(data, re d3g[grpNameIndex[grpName]].values.push({ x: xAxis ? (isNaN(xValue) ? rowNameIndex[xValue] : parseFloat(xValue)) : 0, y: yAxis ? (isNaN(yValue) ? colNameIndex[yValue] : parseFloat(yValue)) : 0, - size: isNaN(parseFloat(sz)) ? 1 : parseFloat(sz) + size: isNaN(parseFloat(sz)) ? 1 : parseFloat(sz), + label: labelValue, }); }