rgraph-rails 1.0.3 → 1.0.4

data/vendor/assets/javascripts/RGraph.meter.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -29,8 +29,6 @@
         * Allow for object config style
         */
         if (   typeof conf === 'object'
-            && typeof conf.min === 'number'
-            && typeof conf.max === 'number'
             && typeof conf.value !== 'undefined'
             && typeof conf.id === 'string') {
 
@@ -60,8 +58,8 @@
         this.context           = this.canvas.getContext ? this.canvas.getContext("2d", {alpha: (typeof id === 'object' && id.alpha === false) ? false : true}) : null;
         this.canvas.__object__ = this;
         this.type              = 'meter';
-        this.min               = min;
-        this.max               = max;
+        this.min               = RGraph.stringsToNumbers(min);
+        this.max               = RGraph.stringsToNumbers(max);
         this.value             = RGraph.stringsToNumbers(value);
         this.centerx           = null;
         this.centery           = null;
@@ -162,6 +160,7 @@
             'chart.centery':                  null,
             'chart.labels':                   true,
             'chart.labels.count':             10,
+            'chart.labels.specific':          null,
             'chart.segment.radius.start':     0,
             'chart.needle.radius':            null,
             'chart.needle.tail':              false,
@@ -865,18 +864,55 @@
                 return;
             }
 
-            var radius     = this.radius;
-            var text_size  = prop['chart.text.size'];
-            var text_font  = prop['chart.text.font'];
-            var units_post = prop['chart.units.post'];
-            var units_pre  = prop['chart.units.pre'];
-            var centerx    = this.centerx;
-            var centery    = this.centery;
-            var min        = this.min;
-            var max        = this.max;
-            var decimals   = prop['chart.scale.decimals'];
-            var numLabels  = prop['chart.labels.count'];
-    
+            var radius     = this.radius,
+                text_size  = prop['chart.text.size'],
+                text_font  = prop['chart.text.font'],
+                units_post = prop['chart.units.post'],
+                units_pre  = prop['chart.units.pre'],
+                centerx    = this.centerx,
+                centery    = this.centery,
+                min        = this.min,
+                max        = this.max,
+                decimals   = prop['chart.scale.decimals'],
+                numLabels  = prop['chart.labels.count'],
+                specific   = prop['chart.labels.specific']
+
+
+
+
+//
+// Draw the specific labels if they're specifid
+//
+if (specific) {
+    for (var i=0; i<specific.length; ++i) {
+
+        var         angle = this.getAngle(specific[i][1]),
+            angle_degrees = angle * (180 / RG.PI),
+                    text  = specific[i][0].toString(),
+                    coords = RG.getRadiusEndPoint(this.centerx, this.centery, angle, this.radius * 0.925)
+
+
+        RG.text2(this, {
+            'font':text_font,
+            'size':text_size,
+            'x': coords[0],
+            'y': coords[1],
+            'text':text,
+            'halign':'center',
+            'valign':'center',
+            'angle':angle_degrees + 90,
+            'bounding': false,
+            'tag': 'labels-specific',
+            color: 'black'
+        });
+    }
+
+    return;
+}
+
+
+
+
             co.fillStyle = prop['chart.text.color'];
             co.lineWidth = 1;
     
@@ -887,13 +923,12 @@
                 var angle      = ((prop['chart.angles.end'] - prop['chart.angles.start']) * (i / numLabels)) + prop['chart.angles.start'];
                 var coords     = RG.getRadiusEndPoint(centerx, centery, angle + (((i == 0 || i == numLabels) && prop['chart.border']) ? (i == 0 ? 0.05 : -0.05) : 0), (this.radius * 0.925) - (prop['chart.text.valign'] === 'bottom' ? 15 : 0));
                 
-                var angleStart = prop['chart.angles.start'];
-                var angleEnd   = prop['chart.angles.end'];
-                var angleRange = angleEnd - angleStart;
-                
-                var angleStart_degrees = angleStart * (180 / RG.PI);
-                var angleEnd_degrees = angleEnd * (180 / RG.PI);
-                var angleRange_degrees = angleRange * (180 / RG.PI);
+                var angleStart = prop['chart.angles.start'],
+                    angleEnd   = prop['chart.angles.end'],
+                    angleRange = angleEnd - angleStart,                
+                    angleStart_degrees = angleStart * (180 / RG.PI),
+                    angleEnd_degrees = angleEnd * (180 / RG.PI),
+                    angleRange_degrees = angleRange * (180 / RG.PI)
 
                 // Vertical alignment
                 valign = prop['chart.text.valign'];
@@ -911,18 +946,19 @@
                     halign = 'center';
                 }
     
-                RG.Text2(this, {'font':text_font,
-                                'size':text_size,
-                                'x':coords[0],
-                                'y':coords[1],
-                                'text':RG.numberFormat(this, (((this.max - this.min) * (i / numLabels)) + this.min).toFixed(decimals),units_pre,units_post),
-                                'halign':halign,
-                                'valign':valign,
-                                'angle':((angleRange_degrees * (1 / numLabels) * i) + angleStart_degrees) - 270,
-                                'bounding':false,
-                                'boundingFill':(i == 0 || i == numLabels) ? 'white': null,
-                                'tag': 'scale'
-                               });
+                RG.text2(this, {
+                    'font':text_font,
+                    'size':text_size,
+                    'x':coords[0],
+                    'y':coords[1],
+                    'text':RG.numberFormat(this, (((this.max - this.min) * (i / numLabels)) + this.min).toFixed(decimals),units_pre,units_post),
+                    'halign':halign,
+                    'valign':valign,
+                    'angle':((angleRange_degrees * (1 / numLabels) * i) + angleStart_degrees) - 270,
+                    'bounding':false,
+                    'boundingFill':(i == 0 || i == numLabels) ? 'white': null,
+                    'tag': 'scale'
+                });
             }
         };
 

data/vendor/assets/javascripts/RGraph.modaldialog.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

data/vendor/assets/javascripts/RGraph.odo.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -30,8 +30,6 @@
         * Allow for object config style
         */
         if (   typeof conf === 'object'
-            && typeof conf.min === 'number'
-            && typeof conf.max === 'number'
             && typeof conf.value !== 'undefined'
             && typeof conf.id === 'string') {
 
@@ -60,8 +58,8 @@
         this.canvas.__object__ = this;
         this.type              = 'odo';
         this.isRGraph          = true;
-        this.min               = min;
-        this.max               = max;
+        this.min               = RGraph.stringsToNumbers(min);
+        this.max               = RGraph.stringsToNumbers(max);
         this.value             = RGraph.stringsToNumbers(value);
         this.currentValue      = null;
         this.uid               = RGraph.CreateUID();

data/vendor/assets/javascripts/RGraph.pie.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -83,6 +83,8 @@
             'chart.labels.sticks':          false,
             'chart.labels.sticks.length':   7,
             'chart.labels.sticks.color':    '#aaa',
+            'chart.labels.sticks.usecolors': false,
+            'chart.labels.sticks.linewidth': 1,
             'chart.labels.sticks.hlength':  5,
             'chart.labels.ingraph':         null,
             'chart.labels.ingraph.color':   null,
@@ -875,14 +877,16 @@
         this.drawSticks =
         this.DrawSticks = function ()
         {
-            var context  = co;
-            var offset   = prop['chart.linewidth'] / 2;
-            var exploded = prop['chart.exploded'];
-            var sticks   = prop['chart.labels.sticks'];
-            var cx       = this.centerx;
-            var cy       = this.centery;
-            var radius   = this.radius;
-            var points   = [];
+            var context   = co,
+                offset    = prop['chart.linewidth'] / 2,
+                exploded  = prop['chart.exploded'],
+                sticks    = prop['chart.labels.sticks'],
+                colors    = prop['chart.colors'],
+                cx        = this.centerx,
+                cy        = this.centery,
+                radius     = this.radius,
+                points    = [],
+                linewidth = prop['chart.labels.sticks.linewidth']
     
             for (var i=0,len=this.angles.length; i<len; ++i) {
             
@@ -897,7 +901,14 @@
     
                 co.beginPath();
                 co.strokeStyle = prop['chart.labels.sticks.color'];
-                co.lineWidth   = 1;
+                co.lineWidth   = prop['chart.labels.sticks.linewidth'];
+                
+                //
+                // Allow for labelsSticksUseColors
+                //
+                if (prop['chart.labels.sticks.usecolors']) {
+                    co.strokeStyle = prop['chart.colors'][i];
+                }
     
                 var midpoint = (segment[0] + (radians / 2));
     
@@ -908,9 +919,6 @@
                 } else {
                     var extra = 0;
                 }
-    
-                //context.lineJoin = 'round';
-                co.lineWidth = 1;
                 
                 /**
                 * Determine the stick length
@@ -1228,8 +1236,8 @@
     
                         co.strokeStyle = prop['chart.highlight.style.2d.stroke'];
                         co.fillStyle   = prop['chart.highlight.style.2d.fill'];
-                        
-                        if (prop['chart.variant'].indexOf('donut') -1) {
+
+                        if (prop['chart.variant'].indexOf('donut') > -1) {
                             co.arc(shape['x'], shape['y'], shape['radius'], shape['angle.start'], shape['angle.end'], false);
                             co.arc(shape['x'], shape['y'], typeof(prop['chart.variant.donut.width']) == 'number' ? this.radius - prop['chart.variant.donut.width'] : shape['radius'] / 2, shape['angle.end'], shape['angle.start'], true);
                         } else {

data/vendor/assets/javascripts/RGraph.radar.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

data/vendor/assets/javascripts/RGraph.rose.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -1219,7 +1219,7 @@
     
     
                 if (co.isPointInPath(mouseXY[0], mouseXY[1])) {
-    
+
                     angles[i][6] = i;
                     
                     if (RG.parseTooltipText) {

data/vendor/assets/javascripts/RGraph.rscatter.js

@@ -1,4 +1,4 @@
-// version: 2015-11-02
+// version: 2016-02-06
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -201,7 +201,16 @@
             'chart.segment.highlight':       false,
             'chart.segment.highlight.count': null,
             'chart.segment.highlight.fill':  'rgba(0,255,0,0.5)',
-            'chart.segment.highlight.stroke':'rgba(0,0,0,0)'
+            'chart.segment.highlight.stroke':'rgba(0,0,0,0)',
+            'chart.line':                    false,
+            'chart.line.close':              false,
+            'chart.line.linewidth':          1,
+            'chart.line.colors':             ['black'],
+            'chart.line.shadow':             false,
+            'chart.line.shadow.color':       'black',
+            'chart.line.shadow.blur':        2,
+            'chart.line.shadow.offsetx':     3,
+            'chart.line.shadow.offsety':     3
         }
         
 
@@ -741,35 +750,108 @@
                 var data              = this.data[dataset];
                 this.coords2[dataset] = [];
 
-                for (var i=0; i<data.length; ++i) {
-        
-                    var d1 = data[i][0];
-                    var d2 = data[i][1];
-                    var a   = d1 / (180 / RG.PI); // RADIANS
-                    var r   = ( (d2 - prop['chart.ymin']) / (this.scale2.max - this.scale2.min) ) * this.radius;
-                    var x   = Math.sin(a) * r;
-                    var y   = Math.cos(a) * r;
-                    var color = data[i][2] ? data[i][2] : prop['chart.colors.default'];
-                    var tooltip = data[i][3] ? data[i][3] : null;
-        
-                    if (tooltip && String(tooltip).length) {
-                        this.hasTooltips = true;
+                var drawPoints = function (obj)
+                {
+                    for (var i=0; i<data.length; ++i) {
+            
+                        var d1 = data[i][0],
+                            d2 = data[i][1],
+                            a   = d1 / (180 / RG.PI), // RADIANS
+                            r   = ( (d2 - prop['chart.ymin']) / (obj.scale2.max - obj.scale2.min) ) * obj.radius,
+                            x   = Math.sin(a) * r,
+                            y   = Math.cos(a) * r,
+                            color = data[i][2] ? data[i][2] : prop['chart.colors.default'],
+                            tooltip = data[i][3] ? data[i][3] : null
+            
+                        if (tooltip && String(tooltip).length) {
+                            obj.hasTooltips = true;
+                        }
+            
+                        /**
+                        * Account for the correct quadrant
+                        */
+                        x = x + obj.centerx;
+                        y = obj.centery - y;
+            
+            
+                        obj.drawTick(x, y, color);
+                        
+                        // Populate the coords array with the coordinates and the tooltip
+                        obj.coords.push([x, y, color, tooltip]);
+                        obj.coords2[dataset].push([x, y, color, tooltip]);
                     }
-        
-                    /**
-                    * Account for the correct quadrant
-                    */
-                    x = x + this.centerx;
-                    y = this.centery - y;
-        
-        
-                    this.DrawTick(x, y, color);
+                }
+                
+                drawPoints(this);
+
+                if (prop['chart.line']) {
+                    this.drawLine(dataset);
+                }
+
+                drawPoints(this);
+            }
+        };
+
+
+
+
+        /*
+        * Draws a connecting line through the points if requested
+        * 
+        * @param object opt The options to the line
+        */
+        this.drawLine = function (idx)
+        {
+            var opt = {
+              dataset: idx,
+               coords: this.coords2[idx],
+                color: prop['chart.line.colors'][idx],
+               shadow: prop['chart.line.shadow'],
+          shadowColor: prop['chart.line.shadow.color'],
+        shadowOffsetX: prop['chart.line.shadow.offsetx'],
+        shadowOffsetY: prop['chart.line.shadow.offsety'],
+           shadowBlur: prop['chart.line.shadow.blur'],
+            linewidth: prop['chart.line.linewidth']
+            };
+
+            co.beginPath();
+
+            co.strokeStyle = this.parseSingleColorForGradient(opt.color);
+              co.lineWidth = typeof prop['chart.line.linewidth'] === 'object' ? prop['chart.line.linewidth'][idx] : prop['chart.line.linewidth'];
+                co.lineCap = 'round';
+
+            if (opt.shadow) {
+                RG.setShadow(
+                    this,
+                    opt.shadowColor,
+                    opt.shadowOffsetX,
+                    opt.shadowOffsetY,
+                    opt.shadowBlur
+                );
+            }
+
+            for (var i=0; i<this.coords2[idx].length; ++i) {
+                if (i === 0) {
+                    co.moveTo(this.coords2[idx][i][0], this.coords2[idx][i][1]);
                     
-                    // Populate the coords array with the coordinates and the tooltip
-                    this.coords.push([x, y, color, tooltip]);
-                    this.coords2[dataset].push([x, y, color, tooltip]);
+                    var startCoords = RG.arrayClone(this.coords2[idx]);
+
+                } else {
+                    co.lineTo(this.coords2[idx][i][0], this.coords2[idx][i][1]);
                 }
             }
+            
+            // Draw the line back to the start?
+            if (
+                   (typeof prop['chart.line.close'] === 'boolean' && prop['chart.line.close'])
+                || (typeof prop['chart.line.close'] === 'object' && prop['chart.line.close'][idx])
+                ) {
+                co.lineTo(this.coords2[idx][0][0], this.coords2[idx][0][1]);
+            }
+            
+            co.stroke();
+            
+            RG.noShadow(this);
         };
 
 
@@ -908,6 +990,10 @@
             co.strokeStyle = color;
             co.fillStyle   = color;
     
+            // Set the linewidth for the tickmark to 1
+            var prevLinewidth = co.lineWidth;
+            co.lineWidth = 1;
+    
             // Cross
             if (tickmarks == 'cross') {
     
@@ -958,6 +1044,9 @@
                     co.lineTo(x + ticksize, y);
                 co.stroke();
             }
+            
+            
+            co.lineWidth = prevLinewidth;
         };