1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/5ca863b3b300/
Changeset: 5ca863b3b300
User: guerler
Date: 2014-04-17 16:45:18
Summary: Charts: Improve handling of different scales/distributions
Affected #: 1 file
diff -r c055181847a46dc3199458d899d28d559ae43c38 -r 5ca863b3b300a552a44f1607cc565842538894c6 config/plugins/visualizations/charts/static/charts/nvd3_histogram/nvd3_histogram.js
--- a/config/plugins/visualizations/charts/static/charts/nvd3_histogram/nvd3_histogram.js
+++ b/config/plugins/visualizations/charts/static/charts/nvd3_histogram/nvd3_histogram.js
@@ -26,9 +26,56 @@
},
}
}
-
+
+ // link this
+ var self = this;
+
+ // load nvd3
var nvd3 = new NVD3(this.app, this.options);
- nvd3.draw(process_id, nv.models.multiBarChart(), chart, request_dictionary);
+ nvd3.draw(process_id, nv.models.multiBarChart(), chart, request_dictionary, function() {
+ // ensure data consistency
+ self._fix_partial_data(request_dictionary.groups);
+ });
+ },
+
+ // the histogram module might generate partial data i.e. length(col1) = 10, length(col2) = 11, length(col3) = 12.
+ // this function ensures that data is consistent, such that all columns have the same length.
+ _fix_partial_data: function(groups) {
+ // x-values
+ var x_list = {};
+
+ // identify all x values
+ for (var i in groups) {
+ var x_sub = this._identify_x_values(groups[i].values);
+ x_list = _.extend(x_list, x_sub);
+ }
+
+ // identify all x values
+ for (var i in groups) {
+ var values = groups[i].values;
+ var x_sub = this._identify_x_values(values);
+ for (var x in x_list) {
+ if (x_sub[x] === undefined) {
+ values.push({
+ x: parseFloat(x),
+ y: 0.0
+ });
+ }
+ }
+ values.sort(function(a, b) {return a.x - b.x})
+ }
+ },
+
+ // identify available x-values
+ _identify_x_values: function(values) {
+ var x_list = {};
+ for (var j in values) {
+ var x_value = values[j].x;
+ if (x_value !== undefined && x_value !== null) {
+ x_list[x_value] = true;
+ }
+ }
+ return x_list;
}
});
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/c05752549163/
Changeset: c05752549163
Branch: stable
User: dan
Date: 2014-04-16 19:28:22
Summary: Fix for bug reporting in Chrome (webkit), due to it not properly handling forms with disabled submit buttons.
Affected #: 1 file
diff -r aab39d3344e2fbe83c209f33d7e69fea2350709d -r c05752549163e2b3b6aeddbab8019af06443c461 templates/webapps/galaxy/dataset/errors.mako
--- a/templates/webapps/galaxy/dataset/errors.mako
+++ b/templates/webapps/galaxy/dataset/errors.mako
@@ -39,7 +39,8 @@
hiddenInput.name = button.name;
hiddenInput.value = button.value;
form.appendChild( hiddenInput );
- return true;
+ form.submit();
+ return false;
}
return false;
}
https://bitbucket.org/galaxy/galaxy-central/commits/aafe68685891/
Changeset: aafe68685891
User: dan
Date: 2014-04-16 19:31:00
Summary: merge stable
Affected #: 0 files
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2d8ab92940fb/
Changeset: 2d8ab92940fb
User: dan
Date: 2014-04-16 19:28:22
Summary: Fix for bug reporting in Chrome (webkit), due to it not properly handling forms with disabled submit buttons.
Affected #: 1 file
diff -r bd1abde45a4132a9d8297a76731245062be14440 -r 2d8ab92940fb7f7ee42b8a7478fd9f4406d401d3 templates/webapps/galaxy/dataset/errors.mako
--- a/templates/webapps/galaxy/dataset/errors.mako
+++ b/templates/webapps/galaxy/dataset/errors.mako
@@ -39,7 +39,8 @@
hiddenInput.name = button.name;
hiddenInput.value = button.value;
form.appendChild( hiddenInput );
- return true;
+ form.submit();
+ return false;
}
return false;
}
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7c6fce1fd9e7/
Changeset: 7c6fce1fd9e7
User: jmchilton
Date: 2014-04-16 16:11:31
Summary: If 'populating' state from tool API request - stop processing tree on conditional test param error.
Attempting to populate the state below the conditional parameter can result in uncaught exceptions in some cases. See Peter's post here - http://dev.list.galaxyproject.org/Unclear-API-and-Twill-test-failure-for-un… for example.
Affected #: 1 file
diff -r cd73af9c02e7f94d76239c010da12fcf1f91d1d4 -r 7c6fce1fd9e7f7adb4811cd92a56cdff05ea748d lib/galaxy/tools/__init__.py
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -2133,28 +2133,31 @@
context,
source )
- current_case = input.get_current_case( value, trans )
- # Current case has changed, throw away old state
- group_state = state[input.name] = {}
- # TODO: we should try to preserve values if we can
- self.fill_in_new_state( trans, input.cases[current_case].inputs, group_state, context, history=history )
- group_errors = self.populate_state( trans,
- input.cases[current_case].inputs,
- group_state,
- incoming,
- history,
- source,
- prefix=group_prefix,
- context=context,
- )
if test_param_error:
- group_errors[ input.test_param.name ] = test_param_error
- if group_errors:
- errors[ input.name ] = group_errors
- # Store the current case in a special value
- group_state['__current_case__'] = current_case
- # Store the value of the test element
- group_state[ input.test_param.name ] = value
+ errors[ input.name ] = [ test_param_error ]
+ # Store the value of the test element
+ group_state[ input.test_param.name ] = value
+ else:
+ current_case = input.get_current_case( value, trans )
+ # Current case has changed, throw away old state
+ group_state = state[input.name] = {}
+ # TODO: we should try to preserve values if we can
+ self.fill_in_new_state( trans, input.cases[current_case].inputs, group_state, context, history=history )
+ group_errors = self.populate_state( trans,
+ input.cases[current_case].inputs,
+ group_state,
+ incoming,
+ history,
+ source,
+ prefix=group_prefix,
+ context=context,
+ )
+ if group_errors:
+ errors[ input.name ] = group_errors
+ # Store the current case in a special value
+ group_state['__current_case__'] = current_case
+ # Store the value of the test element
+ group_state[ input.test_param.name ] = value
elif isinstance( input, UploadDataset ):
group_state = state[input.name]
group_errors = []
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.