Commits

Anonymous committed c4f912c

Fixed bug with point array concatenation and more tweaking of highilght color algorithm.

Comments (0)

Files changed (2)

src/jqplot.core.js

                 var sum = newrgb[0] + newrgb[1] + newrgb[2];
                 for (var j=0; j<3; j++) {
                     // when darkening, lowest color component can be is 60.
-                    newrgb[j] = (sum > 660) ?  newrgb[j] * 0.8 : newrgb[j] + 0.4 * (255 - newrgb[j]);
+                    newrgb[j] = (sum > 660) ?  newrgb[j] * 0.85 : newrgb[j] + 20 + 0.2 * (255 - newrgb[j]);
                     newrgb[j] = parseInt(newrgb[j], 10);
                     (newrgb[j] > 255) ? 255 : newrgb[j];
                 }
                 // newrgb[3] = (rgba[3] > 0.4) ? rgba[3] * 0.4 : rgba[3] * 1.5;
                 // newrgb[3] = (rgba[3] > 0.5) ? 0.8 * rgba[3] - .1 : rgba[3] + 0.2;
-                newrgb[3] = 0.25 + 0.4 * rgba[3];
+                newrgb[3] = 0.25 + 0.35 * rgba[3];
                 ret.push('rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+newrgb[3]+')');
             }
         }
                 // when darkening, lowest color component can be is 60.
                 // newrgb[j] = (sum > 570) ?  newrgb[j] * 0.8 : newrgb[j] + 0.3 * (255 - newrgb[j]);
                 // newrgb[j] = parseInt(newrgb[j], 10);
-                newrgb[j] = (sum > 660) ?  newrgb[j] * 0.8 : newrgb[j] + 0.4 * (255 - newrgb[j]);
+                newrgb[j] = (sum > 660) ?  newrgb[j] * 0.85 : newrgb[j] + 20 + 0.2 * (255 - newrgb[j]);
                 newrgb[j] = parseInt(newrgb[j], 10);
                 (newrgb[j] > 255) ? 255 : newrgb[j];
             }
             // newrgb[3] = (rgba[3] > 0.4) ? rgba[3] * 0.4 : rgba[3] * 1.5;
             // newrgb[3] = (rgba[3] > 0.5) ? 0.8 * rgba[3] - .1 : rgba[3] + 0.2;
-            newrgb[3] = 0.25 + 0.4 * rgba[3];
+            newrgb[3] = 0.25 + 0.35 * rgba[3];
             ret = 'rgba('+newrgb[0]+','+newrgb[1]+','+newrgb[2]+','+newrgb[3]+')';
         }
         return ret;

src/jqplot.lineRenderer.js

 
                         if (this.renderer.bands.fill) {
                             if (this.renderer.smooth) {
-                                bdat = Array.concat(this.renderer._hiBandSmoothedData, this.renderer._lowBandSmoothedData.reverse());
+                                bdat = this.renderer._hiBandSmoothedData.concat(this.renderer._lowBandSmoothedData.reverse());
                             }
                             else {
-                                bdat = Array.concat(this.renderer._hiBandGridData, this.renderer._lowBandGridData.reverse());
+                                bdat = this.renderer._hiBandGridData.concat(this.renderer._lowBandGridData.reverse());
                             }
                             this._areaPoints = bdat;
                             bopts.closePath = true;