diff --git a/src/ui/heat_map.js b/src/ui/heat_map.js
index 6ca69e3af1040db69c0ba0cbb763e7c4a0473f96..641096cc7b6ef9aa934fd82713486627410f3a38 100644
--- a/src/ui/heat_map.js
+++ b/src/ui/heat_map.js
@@ -1029,13 +1029,13 @@ morpheus.HeatMap.prototype = {
columnIndex)));
rowTracks.forEach(function (track) {
tipText.push('\t');
- tipText.push(morpheus.Util.formatObject(dataset
+ tipText.push(morpheus.Util.toString(dataset
.getRowMetadata().getByName(track.name).getValue(
rowIndex)));
});
columnTracks.forEach(function (track) {
tipText.push('\t');
- tipText.push(morpheus.Util.formatObject(dataset
+ tipText.push(morpheus.Util.toString(dataset
.getColumnMetadata().getByName(track.name)
.getValue(columnIndex)));
});
diff --git a/src/ui/heat_map_tooltip_provider.js b/src/ui/heat_map_tooltip_provider.js
index c737e325a05cf715e8a299af6eb884d26dbd9f9a..c9f8ab0f62a1a2de474101702f56d91ed5e0f5fb 100644
--- a/src/ui/heat_map_tooltip_provider.js
+++ b/src/ui/heat_map_tooltip_provider.js
@@ -143,7 +143,7 @@ morpheus.HeatMapTooltipProvider._matrixValueToString = function (dataset,
var obj = val.toObject ? val.toObject() : val;
var keys = _.keys(obj);
if (keys.length === 0) {
- var v = morpheus.Util.formatObject(obj);
+ var v = morpheus.Util.toString(obj);
if (tipText.length > 0) {
tipText.push(separator);
}
@@ -163,7 +163,7 @@ morpheus.HeatMapTooltipProvider._matrixValueToString = function (dataset,
if (morpheus.Util.isArray(objVal)) {
v = morpheus.Util.arrayToString(objVal, ', ');
} else {
- v = morpheus.Util.formatObject(objVal);
+ v = morpheus.Util.toString(objVal);
}
if (tipText.length > 0) {
tipText.push(separator);
@@ -214,13 +214,13 @@ morpheus.HeatMapTooltipProvider.vectorToString = function (vector, index,
}
tipText.push(key);
tipText.push(': ');
- tipText.push(morpheus.Util.formatObject(subVal));
+ tipText.push(morpheus.Util.toString(subVal));
tipText.push('');
}
});
} else {
tipText.push(': ');
- tipText.push(morpheus.Util.formatObject(arrayVal));
+ tipText.push(morpheus.Util.toString(arrayVal));
tipText.push('');
}
@@ -271,7 +271,7 @@ morpheus.HeatMapTooltipProvider.vectorToString = function (vector, index,
}
tipText.push(vector.getName());
tipText.push(': ');
- tipText.push(morpheus.Util.formatObject(primaryVal));
+ tipText.push(morpheus.Util.toString(primaryVal));
tipText.push('');
}
@@ -319,10 +319,10 @@ morpheus.HeatMapTooltipProvider._nodesToString = function (tipText, nodes,
if (i > 0) {
tipText.push(', ');
}
- tipText.push(morpheus.Util.formatObject(value[i]));
+ tipText.push(morpheus.Util.toString(value[i]));
}
} else {
- tipText.push(morpheus.Util.formatObject(value));
+ tipText.push(morpheus.Util.toString(value));
}
tipText.push('');
if (color) {
diff --git a/src/util/util.js b/src/util/util.js
index c81d786db1eb4eb6ea7998acbfb02dd914a7123a..b9fbb7c7b6c62b3a7c1b2a424a883f722354adfc 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -961,20 +961,6 @@ morpheus.Util.createNumberFormat = function (nfractionDigits) {
};
return f;
};
-morpheus.Util.formatObject = function (value) {
- if (_.isNumber(value)) {
- return morpheus.Util.nf(value);
- }
- return value;
-};
-morpheus.Util.arrayToString = function (array, sep) {
- var s = [];
- for (var i = 0, length = array.length; i < length; i++) {
- s.push(morpheus.Util.formatObject(array[i]));
- }
- return s.join(sep);
-
-};
morpheus.Util.wrapNumber = function (value, object) {
var n = new Number(value);
@@ -989,14 +975,25 @@ morpheus.Util.toString = function (value) {
} else if (_.isNumber(value)) {
return morpheus.Util.nf(value);
} else if (morpheus.Util.isArray(value)) {
- var s = [];
- for (var i = 0, length = value.length; i < length; i++) {
- s.push(morpheus.Util.formatObject(value[i]));
- }
- return s.join(', ');
+ return morpheus.Util.arrayToString(value, ', ');
}
return '' + value;
};
+
+morpheus.Util.arrayToString = function (value, sep) {
+ var s = [];
+ for (var i = 0, length = value.length; i < length; i++) {
+ var val_i = value[i];
+ if (_.isNumber(val_i)) {
+ s.push(morpheus.Util.nf(val_i[i]));
+ } else {
+ s.push('' + val_i);
+ }
+
+ }
+ return s.join(sep);
+
+};
morpheus.Util.removeTrailingZerosInFraction = function (str) {
var index = str.lastIndexOf('.');
if (index !== -1) {