From 7a4eca6efae872d6d9be89553c289ce798813409 Mon Sep 17 00:00:00 2001 From: Joshua Gould Date: Tue, 24 May 2016 16:52:23 -0400 Subject: [PATCH] added sum --- src/tools/collapse_dataset_tool.js | 64 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/tools/collapse_dataset_tool.js b/src/tools/collapse_dataset_tool.js index 0a94480..18881d2 100644 --- a/src/tools/collapse_dataset_tool.js +++ b/src/tools/collapse_dataset_tool.js @@ -1,8 +1,8 @@ -morpheus.CollapseDatasetTool = function() { +morpheus.CollapseDatasetTool = function () { }; -morpheus.CollapseDatasetTool.Functions = [ morpheus.Mean, morpheus.Median, - new morpheus.MaxPercentiles([ 25, 75 ]), morpheus.Min, morpheus.Max ]; -morpheus.CollapseDatasetTool.Functions.fromString = function(s) { +morpheus.CollapseDatasetTool.Functions = [morpheus.Mean, morpheus.Median, + new morpheus.MaxPercentiles([25, 75]), morpheus.Min, morpheus.Max, morpheus.Sum]; +morpheus.CollapseDatasetTool.Functions.fromString = function (s) { for (var i = 0; i < morpheus.CollapseDatasetTool.Functions.length; i++) { if (morpheus.CollapseDatasetTool.Functions[i].toString() === s) { return morpheus.CollapseDatasetTool.Functions[i]; @@ -11,45 +11,45 @@ morpheus.CollapseDatasetTool.Functions.fromString = function(s) { throw new Error(s + ' not found'); }; morpheus.CollapseDatasetTool.prototype = { - toString : function() { + toString: function () { return 'Collapse'; }, - init : function(project, form) { - var setValue = function(val) { + init: function (project, form) { + var setValue = function (val) { var isRows = val === 'Rows'; var names = morpheus.MetadataUtil.getMetadataNames(isRows ? project - .getFullDataset().getRowMetadata() : project - .getFullDataset().getColumnMetadata()); + .getFullDataset().getRowMetadata() : project + .getFullDataset().getColumnMetadata()); form.setOptions('collapse_to_fields', names); }; - form.$form.find('[name=collapse]').on('change', function(e) { + form.$form.find('[name=collapse]').on('change', function (e) { setValue($(this).val()); }); setValue('Rows'); }, - gui : function() { - return [ { - name : 'collapse_method', - options : morpheus.CollapseDatasetTool.Functions, - value : morpheus.CollapseDatasetTool.Functions[1].toString(), - type : 'select' + gui: function () { + return [{ + name: 'collapse_method', + options: morpheus.CollapseDatasetTool.Functions, + value: morpheus.CollapseDatasetTool.Functions[1].toString(), + type: 'select' }, { - name : 'collapse', - options : [ 'Columns', 'Rows' ], - value : 'Rows', - type : 'radio' + name: 'collapse', + options: ['Columns', 'Rows'], + value: 'Rows', + type: 'radio' }, { - name : 'collapse_to_fields', - options : [], - type : 'select', - multiple : true - } ]; + name: 'collapse_to_fields', + options: [], + type: 'select', + multiple: true + }]; }, - execute : function(options) { + execute: function (options) { var project = options.project; var controller = options.controller; var f = morpheus.CollapseDatasetTool.Functions - .fromString(options.input.collapse_method); + .fromString(options.input.collapse_method); var collapseToFields = options.input.collapse_to_fields; if (collapseToFields.length === 0) { throw new Error('Please select one or more fields to collapse to'); @@ -60,22 +60,22 @@ morpheus.CollapseDatasetTool.prototype = { dataset = morpheus.DatasetUtil.transposedView(dataset); } var allFields = morpheus.MetadataUtil.getMetadataNames(dataset - .getRowMetadata()); + .getRowMetadata()); dataset = morpheus.CollapseDataset(dataset, collapseToFields, f, true); if (!rows) { dataset = dataset.getDataset(); } var set = new morpheus.Map(); - _.each(allFields, function(field) { + _.each(allFields, function (field) { set.set(field, true); }); - _.each(collapseToFields, function(field) { + _.each(collapseToFields, function (field) { set.remove(field); }); // hide fields that were not part of collapse to - set.forEach(function(val, name) { + set.forEach(function (val, name) { controller.setTrackVisible(name, false, !rows); }); project.setFullDataset(dataset, true); } -}; \ No newline at end of file +}; -- GitLab