Merge pull request #3197 from stormpython/enhancement/3176

adding feature to remove circles when option to remove circles selected
elastic · Mar 4, 2015 · cde5f15 · cde5f15
2 parents e0bea02 + 2b2d0f5
commit cde5f15
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/kibana/components/vislib/visualizations/line_chart.js b/src/kibana/components/vislib/visualizations/line_chart.js
@@ -65,6 +65,7 @@ define(function (require) {
      */
     LineChart.prototype.addCircles = function (svg, data) {
       var self = this;
+      var showCircles = this._attr.showCircles;
       var color = this.handler.data.getColorFunc();
       var xScale = this.handler.xAxis.xScale;
       var yScale = this.handler.yAxis.yScale;
@@ -81,7 +82,7 @@ define(function (require) {
         .attr('class', 'points line');
 
       var circles = layer
-      .selectAll('rect')
+      .selectAll('circle')
       .data(function appendData(d) {
         return d;
       });
@@ -105,13 +106,23 @@ define(function (require) {
         return color(d.label);
       }
 
+      function colorCircle(d) {
+        var parent = d3.select(this).node().parentNode;
+        var lengthOfParent = d3.select(parent).data()[0].length;
+        var isVisible = (lengthOfParent === 1);
+
+        // If only 1 point exists, show circle
+        if (!showCircles && !isVisible) return 'none';
+        return cColor(d);
+      }
+
       circles
       .enter()
         .append('circle')
         .attr('r', visibleRadius)
         .attr('cx', cx)
         .attr('cy', cy)
-        .attr('fill', cColor)
+        .attr('fill', colorCircle)
         .attr('class', 'circle-decoration');
 
       circles

diff --git a/src/kibana/plugins/vis_types/vislib/editors/line.html b/src/kibana/plugins/vis_types/vislib/editors/line.html
@@ -0,0 +1,8 @@
+<!-- vis type specific options -->
+<vislib-basic-options></vislib-basic-options>
+<div class="vis-option-item form-group">
+  <label>
+    <input type="checkbox" value="{{showCircles}}" ng-model="vis.params.showCircles" name="showCircles"  ng-checked="vis.params.showCircles">
+    Show Circles
+  </label>
+</div>
diff --git a/src/kibana/plugins/vis_types/vislib/line.js b/src/kibana/plugins/vis_types/vislib/line.js
@@ -14,9 +14,10 @@ define(function (require) {
           shareYAxis: true,
           addTooltip: true,
           addLegend: true,
+          showCircles: true,
           defaultYExtents: false
         },
-        editor: require('text!plugins/vis_types/vislib/editors/basic.html')
+        editor: require('text!plugins/vis_types/vislib/editors/line.html')
       },
       schemas: new Schemas([
         {