Merge remote-tracking branch 'jdve/pointradius' into jdve

src/app/panels/histogram/module.js

@@ -98,6 +98,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
       intervals     : ['auto','1s','1m','5m','10m','30m','1h','3h','12h','1d','1w','1y'],
       intervals     : ['auto','1s','1m','5m','10m','30m','1h','3h','12h','1d','1w','1y'],
       fill          : 0,
       fill          : 0,
       linewidth     : 3,
       linewidth     : 3,
+      pointradius   : 5,
       timezone      : 'browser', // browser, utc or a standard timezone
       timezone      : 'browser', // browser, utc or a standard timezone
       spyable       : true,
       spyable       : true,
       zoomlinks     : true,
       zoomlinks     : true,
@@ -493,7 +494,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
                   show: scope.panel.points,
                   show: scope.panel.points,
                   fill: 1,
                   fill: 1,
                   fillColor: false,
                   fillColor: false,
-                  radius: 5
+                  radius: scope.panel.pointradius
                 },
                 },
                 shadowSize: 1
                 shadowSize: 1
               },
               },

src/app/panels/histogram/styleEditor.html

@@ -25,6 +25,10 @@
       <label class="small">Line Width</label>
       <label class="small">Line Width</label>
       <select class="input-mini" ng-model="panel.linewidth" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]"></select>
       <select class="input-mini" ng-model="panel.linewidth" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]"></select>
     </div>
     </div>
+    <div class="editor-option" ng-show="panel.points">
+      <label class="small">Point Radius</label>
+      <select class="input-mini" ng-model="panel.pointradius" ng-options="f for f in [1,2,3,4,5,6,7,8,9,10]"></select>
+    </div>
   </div>
   </div>
   <div class="section">
   <div class="section">
     <h5>Multiple Series</h5>
     <h5>Multiple Series</h5>