Merge pull request #69 from uhmlavalab/master

Pull request for update on the default node fill color .
GlobalNOC · Nov 9, 2018 · d2fafd3 · d2fafd3
2 parents 6f64f97 + d48cf1e
commit d2fafd3
Show file tree

Hide file tree

Showing 66 changed files with 27 additions and 10 deletions.
diff --git a/src/CustomHover.js b/src/CustomHover.js
diff --git a/src/atlas3.js b/src/atlas3.js
@@ -559,7 +559,8 @@ export class Atlas3 extends MetricsPanelCtrl {
                         min: ctrl.panel.min[j],
                         lineWidth: ctrl.panel.size[j],
                         twin_tubes: ctrl.panel.twin_tubes,
-                        mapSource: ctrl.panel.mapSrc[j]
+                        mapSource: ctrl.panel.mapSrc[j],
+                        endpointColor : ctrl.panel.nodeFillColor
                     });
                     if(ctrl.panel.mapSrc[j] === null || ctrl.panel.mapSrc[j] === undefined || ctrl.panel.mapSrc[j] === "") {
                         ctrl.layer_ids.push('');
@@ -658,7 +659,8 @@ export class Atlas3 extends MetricsPanelCtrl {
                     min: ctrl.panel.min[i],
                     twin_tubes: ctrl.panel.twin_tubes,
                     lineWidth: ctrl.panel.size[i],
-                    mapSource: ctrl.panel.mapSrc[i]
+                    mapSource: ctrl.panel.mapSrc[i],
+                    endpointColor : ctrl.panel.nodeFillColor,
                 });
                 ctrl.layer_ids.push(networkLayer.layerId());
                 ctrl.panel.layers.push(networkLayer);

diff --git a/src/css/JsonEditor.css b/src/css/JsonEditor.css
diff --git a/src/css/Legend.css b/src/css/Legend.css
@@ -113,10 +113,12 @@ limitations under the License.
 
 .atlas-legend.atlas-info-div.horizontal .numbers .scale-num.zero {
     text-align: left;
+    color: snow; 
 }
 
 .atlas-legend.atlas-info-div.horizontal .numbers .scale-num.hundred {
     text-align: right;
+    color: snow; 
 }
 
 /* infodiv style */

diff --git a/src/css/MiniMap.css b/src/css/MiniMap.css
diff --git a/src/css/NetworkLayer.css b/src/css/NetworkLayer.css
diff --git a/src/css/TrafficLayer.css b/src/css/TrafficLayer.css
@@ -46,7 +46,7 @@ limitations under the License.
 
 .popHighlight{
     stroke-width: 2px;
-    stroke: #ddd;
+    stroke: black;
 }
 
 .popHighlight:hover{

diff --git a/src/images/Colors-demo.gif b/src/images/Colors-demo.gif
diff --git a/src/images/atlas_logo.png b/src/images/atlas_logo.png
diff --git a/src/images/atlas_logo_60o.png b/src/images/atlas_logo_60o.png
diff --git a/src/images/colors-1.png b/src/images/colors-1.png
diff --git a/src/images/colors-2.png b/src/images/colors-2.png
diff --git a/src/images/colors-3-1.png b/src/images/colors-3-1.png
diff --git a/src/images/colors-3-2.png b/src/images/colors-3-2.png
diff --git a/src/images/custom-hover-box-2.png b/src/images/custom-hover-box-2.png
diff --git a/src/images/custom-node-box.png b/src/images/custom-node-box.png
diff --git a/src/images/example.png b/src/images/example.png
diff --git a/src/images/invert-legend.png b/src/images/invert-legend.png
diff --git a/src/images/invert-scheme.png b/src/images/invert-scheme.png
diff --git a/src/images/json-editor.png b/src/images/json-editor.png
diff --git a/src/images/layer-options-1.png b/src/images/layer-options-1.png
diff --git a/src/images/layer-options-2.png b/src/images/layer-options-2.png
diff --git a/src/images/line-color.png b/src/images/line-color.png
diff --git a/src/images/logical-map.png b/src/images/logical-map.png
diff --git a/src/images/map-options-logical.png b/src/images/map-options-logical.png
diff --git a/src/images/map-options.png b/src/images/map-options.png
diff --git a/src/images/network-map.png b/src/images/network-map.png
diff --git a/src/images/networkmap-main-1.png b/src/images/networkmap-main-1.png
diff --git a/src/images/node-color.png b/src/images/node-color.png
diff --git a/src/images/opacity-1.png b/src/images/opacity-1.png
diff --git a/src/images/opacity-2.png b/src/images/opacity-2.png
diff --git a/src/images/opacity-colors.png b/src/images/opacity-colors.png
diff --git a/src/images/opacity-scheme.png b/src/images/opacity-scheme.png
diff --git a/src/images/threshold-1.png b/src/images/threshold-1.png
diff --git a/src/images/threshold-2.png b/src/images/threshold-2.png
diff --git a/src/images/threshold-scheme.png b/src/images/threshold-scheme.png
diff --git a/src/images/tooltip-options-1.png b/src/images/tooltip-options-1.png
diff --git a/src/images/tsds-query.png b/src/images/tsds-query.png
diff --git a/src/images/twin-tubes.png b/src/images/twin-tubes.png
diff --git a/src/js/index/DataSource.js b/src/js/index/DataSource.js
diff --git a/src/js/index/LeafletMap.js b/src/js/index/LeafletMap.js
diff --git a/src/js/index/Legend.js b/src/js/index/Legend.js
diff --git a/src/js/map/BaseLayer.js b/src/js/map/BaseLayer.js
diff --git a/src/js/map/BaseMap.js b/src/js/map/BaseMap.js
diff --git a/src/js/map/LeafletMap.js b/src/js/map/LeafletMap.js
diff --git a/src/js/map/NetworkLayer.js b/src/js/map/NetworkLayer.js
diff --git a/src/js/map/SingleTubeLayer.js b/src/js/map/SingleTubeLayer.js
@@ -428,9 +428,10 @@ var SingleTubeLayer = function(params){
 
         //--- UPDATE -- Update any existing endpoints
         endpoints.select('.popHighlight')
-            .style("fill", function(d){
-                return d.endpointColor = undefined ? layer.endpointColor() : d.endpointColor;
-            })
+            //.style("fill", function(d){
+              //  return d.endpointColor = undefined ? layer.endpointColor() : d.endpointColor;
+            //})
+            .style('fill',layer.endpointColor()||d.endpointColor)
             .attr("fill-opacity", function(d){
                 return d.endpointOpacity = undefined ? layer.endpointOpacity() : d.endpointOpacity;
             });

diff --git a/src/js/map/TrafficLayer.js b/src/js/map/TrafficLayer.js
diff --git a/src/js/map/TwinTubeLayer.js b/src/js/map/TwinTubeLayer.js
@@ -679,9 +679,10 @@ var TwinTubeLayer = function(params){
 
         //--- UPDATE -- Update any existing endpoints
         endpoints.select('.popHighlight')
-            .style("fill", function(d){
-                return d.endpointColor = undefined ? layer.endpointColor() : d.endpointColor;
-            })
+            //.style("fill", function(d){
+             //   return d.endpointColor = undefined ? layer.endpointColor() : d.endpointColor;
+           // })
+            .style('fill',layer.endpointColor()||d.endpointColor)
             .attr("fill-opacity", function(d){
                 return d.endpointOpacity = undefined ? layer.endpointOpacity() : d.endpointOpacity;
             });

diff --git a/src/js/util/DataSource.js b/src/js/util/DataSource.js
diff --git a/src/js/util/DataSourceFormatter.js b/src/js/util/DataSourceFormatter.js
diff --git a/src/js/util/Enums.js b/src/js/util/Enums.js
diff --git a/src/js/util/Functions.js b/src/js/util/Functions.js
diff --git a/src/js/util/Geometry.js b/src/js/util/Geometry.js
diff --git a/src/js/util/Interval.js b/src/js/util/Interval.js
diff --git a/src/js/util/Topology.js b/src/js/util/Topology.js
diff --git a/src/js/util/UrlFormatter.js b/src/js/util/UrlFormatter.js
diff --git a/src/js/widget/InfoDiv.js b/src/js/widget/InfoDiv.js
@@ -59,7 +59,7 @@ var InfoDiv = function(params){
             case 'bl': 
                 _infoDiv.style('position', 'relative')
                     .style('bottom', '0px')
-                    .style('left', '0px');
+                    .style('left', '20px');
                 break;
             case 'tr': 
                 _infoDiv.style('position', 'relative')

diff --git a/src/js/widget/Legend.js b/src/js/widget/Legend.js
diff --git a/src/module.js b/src/module.js
diff --git a/src/partials/display_editor.html b/src/partials/display_editor.html
@@ -73,6 +73,12 @@ <h5 class="section-heading">Colors</h5>
             </div>
 
         </div>
+        <div class="gf-form">
+            <label class="gf-form-label width-9">Default Node color</label>
+            <span class="gf-form-label">
+                <spectrum-picker ng-model="ctrl.panel.nodeFillColor" ng-change="ctrl.render()" ></spectrum-picker>
+            </span>
+        </div>
 
     </div>
 

diff --git a/src/partials/editor.html b/src/partials/editor.html
diff --git a/src/partials/json_editor.html b/src/partials/json_editor.html
diff --git a/src/partials/module.html b/src/partials/module.html
diff --git a/src/plugin.json b/src/plugin.json
diff --git a/src/scale.js b/src/scale.js
@@ -18,6 +18,7 @@ import _ from "lodash";
 import  * as d3 from 'd3';
 
 let colorSchemes = [
+      {name: 'OrBu',    value: 'interpolateOrBu',       invert: 'dark'},
       {name: 'RdYlGn',    value: 'interpolateRdYlGn',   invert: 'always'},
       {name: 'Blues',     value: 'interpolateBlues',    invert: 'dark'},
       {name: 'Greens',    value: 'interpolateGreens',   invert: 'dark'},
@@ -133,6 +134,10 @@ export class Scale {
         var b=0;
 
         switch(color) {
+            case 'interpolateOrBu':
+                this.calculate(251,174,96,-3,0,3);
+                break;
+
             case 'interpolateRdYlGn':
                 this.calculate(255,g,b,-3,5,0);
                 break;