Commit ec8bfdf8 authored by Joshua Gould's avatar Joshua Gould

removed try-catch

parent 996af225
...@@ -1022,28 +1022,13 @@ morpheus.HeatMap.prototype = { ...@@ -1022,28 +1022,13 @@ morpheus.HeatMap.prototype = {
var rowDendrogram = this.options.rowDendrogram; var rowDendrogram = this.options.rowDendrogram;
var columnDendrogram = this.options.columnDendrogram; var columnDendrogram = this.options.columnDendrogram;
_.each(this.whenLoaded, function (f) { _.each(this.whenLoaded, function (f) {
try {
f(_this.options.dataset); f(_this.options.dataset);
} catch (x) {
if (x.stack) {
console.log(x.stack);
}
console.log('When loaded error.');
}
}); });
if (this.options.datasetReady) { if (this.options.datasetReady) {
try {
var updatedDataset = this.options.datasetReady(dataset); var updatedDataset = this.options.datasetReady(dataset);
if (updatedDataset) { if (updatedDataset) {
dataset = updatedDataset; dataset = updatedDataset;
} }
} catch (x) {
console.log('datasetReady error');
if (x.stack) {
console.log(x.stack);
}
}
} }
this.project = this.options.symmetric ? new morpheus.SymmetricProject( this.project = this.options.symmetric ? new morpheus.SymmetricProject(
...@@ -1421,11 +1406,12 @@ morpheus.HeatMap.prototype = { ...@@ -1421,11 +1406,12 @@ morpheus.HeatMap.prototype = {
nameToOption.set(option.renameTo != null ? option.renameTo nameToOption.set(option.renameTo != null ? option.renameTo
: option.field, option); : option.field, option);
}); });
var displayMetadata = isColumns ? dataset.getColumnMetadata() var displayMetadata = isColumns ? dataset.getColumnMetadata()
: dataset.getRowMetadata(); : dataset.getRowMetadata();
// see if default fields found // see if default fields found
if (!displaySpecified) { if (!displaySpecified) {
if (displayMetadata.getByName('pert_iname')) {
var defaultFieldsToShow = new morpheus.Set(); var defaultFieldsToShow = new morpheus.Set();
['pert_iname', 'moa', 'target', 'description'] ['pert_iname', 'moa', 'target', 'description']
.forEach(function (field) { .forEach(function (field) {
...@@ -1441,17 +1427,13 @@ morpheus.HeatMap.prototype = { ...@@ -1441,17 +1427,13 @@ morpheus.HeatMap.prototype = {
} }
} }
displaySpecified = true; displaySpecified = true;
}
} }
var isFirst = true; var isFirst = true;
for (var i = 0, metadataCount = isColumns ? dataset for (var i = 0, metadataCount = displayMetadata.getMetadataCount(); i < metadataCount; i++) {
.getColumnMetadata().getMetadataCount() : dataset
.getRowMetadata().getMetadataCount(); i < metadataCount; i++) {
var display = displaySpecified ? 'None' : undefined; var display = displaySpecified ? 'None' : undefined;
var v = isColumns ? dataset.getColumnMetadata().get(i) var v = displayMetadata.get(i);
: dataset.getRowMetadata().get(i);
var name = v.getName(); var name = v.getName();
var option = nameToOption.get(name); var option = nameToOption.get(name);
......
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