Commits

Chris Leonello committed f49dfb0

Some in process changes committed for syncing.

  • Participants
  • Parent commits 983fb9a

Comments (0)

Files changed (3)

examples/meterGauge2.html

 <script id = "example_5" type="text/javascript">$(document).ready(function(){
    s1 = [0];
    plot5 = $.jqplot('chart5',[s1],{
-       seriesDefaults: {
+       title: 'This is a rather Long Title For a Meter Test',
+       series: [{
            renderer: $.jqplot.MeterGaugeRenderer,
            rendererOptions: {
                label: 'Line Chart',
                labelPosition: 'bottom',
-               intervalOuterRadius: 120,
+               // intervalOuterRadius: 120,
                ticks: [0, 10000, 20000, 30000, 40000, 50000],
                intervals:[10000, 40000, 50000],
                intervalColors:['#cc6666', '#E7E658', '#66cc66']
            }
-       },
+       }],
        legend: { show: true },
    });
 });</script> 

src/jqplot.lineRenderer.js

     $.jqplot.LineRenderer.prototype.init = function(options, plot) {
         options = options || {};
         this._type='line';
+        this.smooth = false;
+        this.steps = 50;
+        this.tension = 0.5;
+        this._smoothedData = [];
         var lopts = {highlightMouseOver: options.highlightMouseOver, highlightMouseDown: options.highlightMouseDown, highlightColor: options.highlightColor};
         
         delete (options.highlightMouseOver);

src/plugins/jqplot.meterGaugeRenderer.js

         }
         this._tickPoints = [];
         // reference to label element.
-        this._labelElm = null;
+        this._labelElem = null;
         
         // start the gauge at the beginning of the span
         this.startAngle = (90 + (360 - this.span)/2) * Math.PI/180;
         options.legend = options.legend || {};
         options.seriesDefaults = options.seriesDefaults || {};
         options.grid = options.grid || {};
-        options.gridPadding = options.gridPadding || {};
+        // options.gridPadding = options.gridPadding || {};
            
         // only set these if there is a gauge series
         var setopts = false;
             options.grid.drawGridlines = false;
             options.grid.borderWidth = (options.grid.borderWidth != null) ? options.grid.borderWidth : 0;
             options.grid.shadow = (options.grid.shadow != null) ? options.grid.shadow : false;
-            options.gridPadding.top = (options.gridPadding.top != null) ? options.gridPadding.top : 0;
-            options.gridPadding.bottom = (options.gridPadding.bottom != null) ? options.gridPadding.bottom : 0;
-            options.gridPadding.left = (options.gridPadding.left != null) ? options.gridPadding.left : 0;
-            options.gridPadding.right = (options.gridPadding.right != null) ? options.gridPadding.right : 0;
+            // options.gridPadding.top = (options.gridPadding.top != null) ? options.gridPadding.top : 0;
+            // options.gridPadding.bottom = (options.gridPadding.bottom != null) ? options.gridPadding.bottom : 0;
+            // options.gridPadding.left = (options.gridPadding.left != null) ? options.gridPadding.left : 0;
+            // options.gridPadding.right = (options.gridPadding.right != null) ? options.gridPadding.right : 0;
         }
     }