ENH: refs #917. Use line color itself to render official scalars

midasplatform · Feb 18, 2013 · 0b6f18a · 0b6f18a
1 parent b4e22cc
commit 0b6f18a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/core/public/js/jquery/jqplot/jqplot.differentColorMarkerLineRenderer.js b/core/public/js/jquery/jqplot/jqplot.differentColorMarkerLineRenderer.js
@@ -247,16 +247,15 @@
                     this.renderer.shapeRenderer.draw(ctx, gd, opts);
                 }
             }
-
 
             // now draw the markers
             if (this.markerRenderer.show && !fill) {
                 for (i=0; i<gd.length; i++) {
                     // Grab each color and send it to a new markerRenderer. 
                     opts.markerOptions = {
-                        color: this.markerColors[i]
+                        color: this.markerColors[i] || this.color
                     };
-                    this.markerRenderer = new  $.jqplot.MarkerRenderer
+                    this.markerRenderer = new $.jqplot.MarkerRenderer;
                     this.markerRenderer.init(opts.markerOptions);
                     this.markerRenderer.draw(gd[i][0], gd[i][1], ctx, opts.markerOptions);
                 }

diff --git a/modules/tracker/public/js/trend/trend.view.js b/modules/tracker/public/js/trend/trend.view.js
@@ -1,7 +1,7 @@
 var midas = midas || {};
 midas.tracker = midas.tracker || {};
 
-midas.tracker.OFFICIAL_COLOR_KEY = 'black';
+midas.tracker.OFFICIAL_COLOR_KEY = null;
 midas.tracker.UNOFFICIAL_COLOR_KEY = 'red';
 
 /**