rgraph-rails 1.0.8 → 4.62

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -894,8 +894,21 @@
             /**
             * If the line is filled re-stroke the lines
             */
+            if (prop['chart.outofbounds.clip']) {
+                pa2(
+                    co,
+                    'sa b r % % % % cl b',
+                    0,
+                    this.gutterTop,
+                    ca.width,
+                    ca.height - this.gutterTop - this.gutterBottom
+                );
+            }
+
+
             if (prop['chart.filled'] && prop['chart.filled.accumulative'] && !prop['chart.curvy']) {
-        
+                
+
                 for (var i=0; i<this.coords2.length; ++i) {
         
                     co.beginPath();
@@ -1005,6 +1018,11 @@
 
 
             }
+
+
+        if (prop['chart.outofbounds.clip']) {
+            co.restore();
+        }
         co.restore();
     
         // ???
@@ -1939,7 +1957,7 @@
                     lineData[i] *= prop['chart.animation.factor'];
                 }
             }
-    
+
             var penUp = false;
             var yPos  = null;
             var xPos  = 0;
@@ -2009,7 +2027,7 @@
 
             // Store the coords in another format, indexed by line number
             this.coords2[index] = lineCoords;
-    
+
             /**
             * For IE only: Draw the shadow ourselves as ExCanvas doesn't produce shadows
             */
@@ -2229,7 +2247,7 @@
 
                 // Now redraw the lines with the correct line width
                 this.SetShadow(index);
-                this.RedrawLine(lineCoords, color, linewidth, index);
+                this.redrawLine(lineCoords, color, linewidth, index);
                 co.stroke();
                 RG.NoShadow(this);
 
@@ -2661,6 +2679,8 @@
                 return;
             }
     
+
+            
             co.strokeStyle = (typeof(color) == 'object' && color && color.toString().indexOf('CanvasGradient') == -1 ? color[0] : color);
             co.lineWidth = linewidth;
 
@@ -2767,6 +2787,8 @@
                     }
                 }
             }
+            
+
 
             if (prop['chart.dashed'] || prop['chart.dotted']) {
                 co.setLineDash([1,0]);

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * 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: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * 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: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |

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

@@ -1,4 +1,4 @@
-// version: 2017-01-02
+// version: 2017-05-08
     /**
     * o--------------------------------------------------------------------------------o
     * | This file is part of the RGraph package - you can learn more at:               |
@@ -72,6 +72,22 @@
             }
         }
 
+
+
+
+
+        // First, if there's only been a single passed to us, convert it to
+        // the multiple dataset format
+        if (!RGraph.isArray(this.data[0][0])) {
+            this.data = [this.data];
+        }
+
+
+
+
+
+
+
         // If necessary convert X/Y values passed as strings to numbers
         for (var i=0,len=this.data.length; i<len; ++i) { // Datasets
             for (var j=0,len2=this.data[i].length; j<len2; ++j) { // Points
@@ -411,6 +427,7 @@
 
 
 
+
         /**
         * A simple setter
         * 
@@ -509,6 +526,10 @@
 
 
 
+
+
+
+
         /**
         * A simple getter
         * 
@@ -535,6 +556,10 @@
 
 
 
+
+
+
+
         /**
         * The function you call to draw the Scatter chart
         */
@@ -805,6 +830,10 @@
 
 
 
+
+
+
+
         /**
         * Draws the axes of the scatter graph
         */
@@ -914,21 +943,31 @@
                     }
                 }
             }
-    
-    
+
+
+
+
+
+
+
+
             /**
             * Draw the X tickmarks
             */
             if (prop['chart.numxticks'] > 0 && prop['chart.xaxis']) {
 
                 var x    = 0,
-                    y    = this.getYCoord(prop['chart.ylabels.invert'] ? this.scale2.max : 0) - 3,
+                    y    = this.getYCoord(prop['chart.ylabels.invert'] ? this.scale2.max : (this.scale2.max > 0 && this.scale2.min > 0 ? this.scale2.min : 0) ) - 3,
                     size = 3;
-                
+
                 if (prop['chart.ymin'] === 0 && prop['chart.xaxispos'] === 'bottom') {
                     y += 3;
                 }
 
+                if (this.scale2.max > 0 && this.scale2.min > 0) {
+                    y += 3;
+                }
+
                 this.xTickGap = (prop['chart.labels'] && prop['chart.labels'].length) ? ((ca.width - this.gutterLeft - this.gutterRight ) / prop['chart.labels'].length) : (ca.width - this.gutterLeft - this.gutterRight) / 10;
     
                 /**
@@ -961,17 +1000,14 @@
             */
             co.lineWidth = 1;
         };
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
+
         /**
         * Draws the labels on the scatter graph
         */
@@ -1594,20 +1630,14 @@
                 }
             }
         };
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+
+
+
+
+
+
+
+
         /**
         * Draws the actual scatter graph marks
         * 
@@ -1662,6 +1692,10 @@
 
 
 
+
+
+
+
         /**
         * Draws a single scatter mark
         */
@@ -1973,6 +2007,10 @@
 
 
 
+
+
+
+
         /**
         * Draws an optional line connecting the tick marks.
         * 
@@ -2045,6 +2083,10 @@
 
 
 
+
+
+
+
         /**
         * Returns the linewidth
         * 
@@ -2072,6 +2114,10 @@
 
 
 
+
+
+
+
         /**
         * Draws vertical bars. Line chart doesn't use a horizontal scale, hence this function
         * is not common
@@ -2111,6 +2157,10 @@
 
 
 
+
+
+
+
         /**
         * Draws in-graph labels.
         * 
@@ -2206,6 +2256,10 @@
 
 
 
+
+
+
+
         /**
         * This function makes it much easier to get the (if any) point that is currently being hovered over.
         * 
@@ -2283,6 +2337,10 @@
 
 
 
+
+
+
+
         /**
         * Draws the above line labels
         */
@@ -2336,6 +2394,10 @@
 
 
 
+
+
+
+
         /**
         * When you click on the chart, this method can return the Y value at that point. It works for any point on the
         * chart (that is inside the gutters) - not just points within the Bars.
@@ -2405,6 +2467,10 @@
 
 
 
+
+
+
+
         /**
         * When you click on the chart, this method can return the X value at that point.
         * 
@@ -2441,6 +2507,10 @@
 
 
 
+
+
+
+
         /**
         * Each object type has its own Highlight() function which highlights the appropriate shape
         * 
@@ -2466,6 +2536,10 @@
 
 
 
+
+
+
+
         /**
         * The getObjectByXY() worker method. Don't call this call:
         * 
@@ -2491,6 +2565,10 @@
 
 
 
+
+
+
+
         /**
         * This function can be used when the canvas is clicked on (or similar - depending on the event)
         * to retrieve the relevant X coordinate for a particular value.
@@ -2532,6 +2610,10 @@
 
 
 
+
+
+
+
         /**
         * This function positions a tooltip when it is displayed
         * 
@@ -2585,6 +2667,10 @@
 
 
 
+
+
+
+
         /**
         * Returns the applicable Y COORDINATE when given a Y value
         * 
@@ -2597,7 +2683,7 @@
             if (typeof(value) != 'number') {
                 return null;
             }
-    
+
             var invert          = prop['chart.ylabels.invert'];
             var xaxispos        = prop['chart.xaxispos'];
             var graphHeight     = ca.height - this.gutterTop - this.gutterBottom;
@@ -2609,7 +2695,7 @@
             if (value > ymax || (prop['chart.xaxispos'] == 'bottom' && value < ymin) || (prop['chart.xaxispos'] == 'center' && ((value > 0 && value < ymin) || (value < 0 && value > (-1 * ymin))))) {
                 return null;
             }
-    
+
             /**
             * This calculates scale values if the X axis is in the center
             */
@@ -2635,14 +2721,14 @@
             } else {
     
                 coord = ((value - ymin) / (ymax - ymin)) * graphHeight;
-                
+
                 if (invert) {
                     coord = graphHeight - coord;
                 }
     
                 // Invert the coordinate because the Y scale starts at the top
                 coord = graphHeight - coord;
-    
+
                 // And add on the top gutter
                 coord = this.gutterTop + coord;
             }
@@ -2655,6 +2741,8 @@
 
 
 
+
+
         /**
         * A helper class that helps facilitatesbubble charts
         */
@@ -2765,6 +2853,9 @@
 
 
 
+
+
+
         /**
         * This allows for easy specification of gradients
         */
@@ -2849,6 +2940,10 @@
 
 
 
+
+
+
+
         /**
         * Use this function to reset the object to the post-constructor state. Eg reset colors if
         * need be etc
@@ -2860,6 +2955,10 @@
 
 
 
+
+
+
+
         /**
         * This parses a single color value for a gradient
         */
@@ -2891,6 +2990,10 @@
 
 
 
+
+
+
+
         /**
         * This function handles highlighting an entire data-series for the interactive
         * key
@@ -2913,6 +3016,10 @@
 
 
 
+
+
+
+
         /**
         * Using a function to add events makes it easier to facilitate method chaining
         * 
@@ -2937,6 +3044,10 @@
 
 
 
+
+
+
+
         /**
         * This function runs once only
         * (put at the end of the file (before any effects))
@@ -2948,6 +3059,10 @@
 
 
 
+
+
+
+
         /**
         * Trace2
         * 
@@ -2992,6 +3107,10 @@
 
 
 
+
+
+
+
         /**
         * This helps the Gantt reset colors when the reset function is called.
         * It handles going through the data and resetting the colors.
@@ -3019,6 +3138,10 @@
 
 
 
+
+
+
+
         /**
         * Register the object
         */
@@ -3027,6 +3150,10 @@
 
 
 
+
+
+
+
         /**
         * This is the 'end' of the constructor so if the first argument
         * contains configuration data - handle that.