1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/9203be6a16b3/
changeset: r5388:9203be6a16b3
user: jgoecks
date: 2011-04-14 16:37:42
summary: Trackster: refactor so that summary_tree and Histogram modes use the same code.
affected #: 1 file (1.3 KB)
--- a/static/scripts/trackster.js Thu Apr 14 10:05:00 2011 -0400
+++ b/static/scripts/trackster.js Thu Apr 14 10:37:42 2011 -0400
@@ -2353,7 +2353,7 @@
}
// Drawing the summary tree (feature coverage histogram)
- if ( mode === "summary_tree" ) {
+ if (mode === "summary_tree" || mode === "Histogram") {
// Set height of parent_element
required_height = this.summary_draw_height;
parent_element.parent().css("height", Math.max(this.height_px, required_height) + "px");
@@ -2369,44 +2369,22 @@
canvas.width = width + left_offset;
// Extra padding at top of summary tree
canvas.height = required_height + SUMMARY_TREE_TOP_PADDING;
+
+ // Get summary tree data if necessary and set max if there is one.
+ if (result.dataset_type != "summary_tree") {
+ var st_data = this.get_summary_tree_data(result.data, tile_low, tile_high, 200);
+ if (result.max) {
+ st_data.max = result.max;
+ }
+ result = st_data;
+ }
// Paint summary tree into canvas
- var painter = new painters.SummaryTreePainter( result, tile_low, tile_high, this.prefs );
- var ctx = canvas.getContext("2d");
- // Deal with left_offset by translating
- ctx.translate( left_offset, SUMMARY_TREE_TOP_PADDING );
- painter.draw( ctx, width, required_height );
- return new SummaryTreeTile(tile_index, resolution, canvas, result.max);
- }
-
- // Drawing coverage histogram. This is different from summary tree because data can feature
- // details, but user has requested a histogram.
- if (mode === "Histogram") {
- // Set height of parent_element
- required_height = this.summary_draw_height;
- parent_element.parent().css("height", Math.max(this.height_px, required_height) + "px");
- // Add label to container div showing maximum count
- // TODO: this shouldn't be done at the tile level
- this.container_div.find(".yaxislabel").remove();
- var max_label = $("<div />").addClass('yaxislabel');
- max_label.text( result.max );
- max_label.css({ position: "absolute", top: "22px", left: "10px" });
- max_label.prependTo(this.container_div);
- // Create canvas
- var canvas = this.view.canvas_manager.new_canvas();
- canvas.width = width + left_offset;
- // Extra padding at top of summary tree
- canvas.height = required_height + SUMMARY_TREE_TOP_PADDING;
- // Paint summary tree into canvas.
- var binned_data = this.get_summary_tree_data(result.data, tile_low, tile_high, 200);
- if (result.max) {
- binned_data.max = result.max;
- }
- var painter = new painters.SummaryTreePainter(binned_data, tile_low, tile_high, this.prefs);
+ var painter = new painters.SummaryTreePainter(result, tile_low, tile_high, this.prefs);
var ctx = canvas.getContext("2d");
// Deal with left_offset by translating
ctx.translate(left_offset, SUMMARY_TREE_TOP_PADDING);
painter.draw(ctx, width, required_height);
- return new SummaryTreeTile(tile_index, resolution, canvas, binned_data.max);
+ return new SummaryTreeTile(tile_index, resolution, canvas, result.max);
}
// Start dealing with row-by-row tracks
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 changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/835656900dd0/
changeset: r5387:835656900dd0
user: jgoecks
date: 2011-04-14 16:05:00
summary: Fix bug that prevented workflows with runtime parameters from being exported.
affected #: 1 file (5 bytes)
--- a/lib/galaxy/web/controllers/workflow.py Thu Apr 14 09:02:20 2011 -0400
+++ b/lib/galaxy/web/controllers/workflow.py Thu Apr 14 10:05:00 2011 -0400
@@ -1587,7 +1587,7 @@
for name, val in module.state.inputs.items():
input_type = type( val )
if input_type == RuntimeValue:
- step['inputs'].append( { "name" : name, "description" : "runtime parameter for tool %s" % module.get_name() } )
+ step_dict['inputs'].append( { "name" : name, "description" : "runtime parameter for tool %s" % module.get_name() } )
elif input_type == dict:
# Input type is described by a dict, e.g. indexed parameters.
for partname, partval in val.items():
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.