From 347d56a4c49968a9b4c02593ec5c871601de25aa Mon Sep 17 00:00:00 2001 From: Petro Kostyuk Date: Mon, 28 Nov 2016 21:17:23 +0100 Subject: [PATCH 1/3] [ZEPPELIN-1283] added labels to scatterPlot --- .../notebook/paragraph/paragraph-pivot.html | 25 ++++++++++++++++--- .../builtins/visualization-scatterchart.js | 13 +++++++++- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html index de6e0d92e7d..9852440c289 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 @@ -
+
group
-
+
size
  • -
    +
    {{paragraph.config.graph.scatter.size.name}}
    • +
    + + label + +
      +
    • +
      + {{paragraph.config.graph.scatter.labels.name}} +
      +
      • +
    + +
    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 = '

    ' + key + '

    '; + + if (self.config.scatter.labels) { + 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, }); } From 1c2c77e859779828fa221884054ad8e277a01cbf Mon Sep 17 00:00:00 2001 From: Petro Kostyuk Date: Mon, 28 Nov 2016 21:25:40 +0100 Subject: [PATCH 2/3] [ZEPPELIN-1283] added labels to scatterPlot fix --- zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html index 9852440c289..4ea819f4649 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-pivot.html @@ -157,7 +157,7 @@ class="list-unstyled" style="height:36px">
  • -
    +
    {{paragraph.config.graph.scatter.size.name}}
    • @@ -178,7 +178,7 @@
  • {{paragraph.config.graph.scatter.labels.name}} -
    +
    • From 71b840c2e7dfcfa65a3ed865720c06a97e105373 Mon Sep 17 00:00:00 2001 From: Petro Kostyuk Date: Tue, 29 Nov 2016 12:55:44 +0100 Subject: [PATCH 3/3] forgotten file --- .../src/app/notebook/paragraph/paragraph.controller.js | 6 ++++++ 1 file changed, 6 insertions(+) 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) {