Commit d7746a81 authored by jgould's avatar jgould

removed formatObject and replaced with toString

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