Commit 13665da3 authored by Fintan Mc Gee's avatar Fintan Mc Gee

added chgeck to mkae sure temporary lables do not end up as a color category

parent be6cd4f7
<!--<ng-include src="'./html/templates/topAspectDataToolBar.html'"></ng-include>-->
<H2 class="centered"><span>Aspect Combination</span></H2>
<H2 class="centered"><span>Perspective Combination</span></H2>
<div ng-controller="aspectCombinationViewCtrl" ng-init="init()">
<div class="centeredDiv" style="position:relative;display:inline-block;width: 95%;">
......
......@@ -28,7 +28,7 @@ angular.module('blizaarModule.controllers')
DHList:{name: "DHList",fullName: "DH List",enabled: true, index:11},
bioList:{name: "bioList",fullName: "Bio List",enabled: true, index:1},
nodeLinkList:{name: "nodeLinkList",fullName: "Node Link List",enabled: true, index:2},
aspectCombination:{name: "aspectCombination", fullName: "Aspect Combination", enabled:true, index:3},
aspectCombination:{name: "aspectCombination", fullName: "Persepctives", enabled:true, index:3},
smallMultiples:{name: "smallMultiples",fullName: "Small Multiples",enabled: true, index:12},
layerComparison:{name: "layerComparison",fullName: "Layer Comparison",enabled: true, index:13},
nodeLinkAttribute:{name: "nodeLinkAttribute", fullName: "Node Link Attribute",enabled:true, index: 14},
......
......@@ -773,10 +773,15 @@ var MultiLayerGraph = function (nodes, links, layerName) {
_this.nodeAttributesAndValues = {};
g.colorCategoryField = colorField;
g.nodes.forEach(function (n) {
n.colorCategory = n[colorField]; // creating colorCategory field to be consistent across all graph types
// and to make it clear that there is a specific field for coloring by category
colorCategoryObj[n.colorCategory] = 1;
var prefix = ""
if(typeof (n[colorField]) === 'string') {
prefix = n[colorField].substr(0, 3);
}
if(prefix != "tmp") { // fo avoid tmeprary lavbels and vlaues
n.colorCategory = n[colorField]; // creating colorCategory field to be consistent across all graph types
// and to make it clear that there is a specific field for coloring by category
colorCategoryObj[n.colorCategory] = 1;
}
});
g.colorCategories = Object.keys(colorCategoryObj);
};
......
......@@ -795,10 +795,15 @@ var MultiLayerGraph = function (nodes, links, layerName) {
_this.nodeAttributesAndValues = {};
g.colorCategoryField = colorField;
g.nodes.forEach(function (n) {
n.colorCategory = n[colorField]; // creating colorCategory field to be consistent across all graph types
// and to make it clear that there is a specific field for coloring by category
colorCategoryObj[n.colorCategory] = 1;
var prefix = ""
if(typeof (n[colorField]) === 'string') {
prefix = n[colorField].substr(0, 3);
}
if(prefix != "tmp") { // fo avoid tmeprary lavbels and vlaues
n.colorCategory = n[colorField]; // creating colorCategory field to be consistent across all graph types
// and to make it clear that there is a specific field for coloring by category
colorCategoryObj[n.colorCategory] = 1;
}
});
g.colorCategories = Object.keys(colorCategoryObj);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment