1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/8333828fcc9e/
changeset: r5495:8333828fcc9e
user: jgoecks
date: 2011-05-02 23:35:06
summary: Trackster filters improvements: (a) stop propagation of keydown events to viz; and (b) simplify min and max calculations.
affected #: 1 file (7 bytes)
--- a/static/scripts/trackster.js Mon May 02 15:14:53 2011 -0400
+++ b/static/scripts/trackster.js Mon May 02 17:35:06 2011 -0400
@@ -158,14 +158,6 @@
exports.sortable = sortable;
/**
- * Calculates step for slider with a given min, max.
- */
-var get_slider_step = function(min, max) {
- var range = max - min;
- return (range <= 2 ? 0.01 : (range <= 100 ? 1 : (range <= 1000 ? 5 : 10)));
-};
-
-/**
* Init constants & functions used throughout trackster.
*/
var
@@ -1077,6 +1069,11 @@
* Update filter's slider.
*/
update_ui_elt: function () {
+ var get_slider_step = function(min, max) {
+ var range = max - min;
+ return (range <= 2 ? 0.01 : 1);
+ };
+
var
slider_min = this.slider.slider("option", "min"),
slider_max = this.slider.slider("option", "max");
@@ -1180,13 +1177,15 @@
// Create filtering div.
this.parent_div = $("<div/>").addClass("filters").hide();
- // Disable dragging, double clicking on div so that actions on slider do not impact viz.
+ // Disable dragging, double clicking, keys on div so that actions on slider do not impact viz.
this.parent_div.bind("drag", function(e) {
e.stopPropagation();
}).bind("click", function(e) {
e.stopPropagation();
}).bind("dblclick", function(e) {
e.stopPropagation();
+ }).bind("keydown", function(e) {
+ e.stopPropagation();
});
var manager = this;
$.each(this.filters, function(index, filter) {
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/f6f0c94433b8/
changeset: r5494:f6f0c94433b8
user: jgoecks
date: 2011-05-02 21:14:53
summary: Fix bugs in tracks/run_tool.
affected #: 1 file (17 bytes)
--- a/lib/galaxy/web/controllers/tracks.py Mon May 02 14:43:09 2011 -0400
+++ b/lib/galaxy/web/controllers/tracks.py Mon May 02 15:14:53 2011 -0400
@@ -721,7 +721,7 @@
messages_list = []
for jida in original_job.input_datasets:
input_dataset = jida.dataset
- if hasattr( input_dataset, 'get_track_type' ):
+ if hasattr( input_dataset.datatype, 'get_track_type' ):
#
# Dataset can be indexed and hence a subset can be extracted.
#
@@ -748,7 +748,7 @@
data_provider_class = get_data_provider( original_dataset=input_dataset )
data_provider = data_provider_class( original_dataset=input_dataset,
converted_dataset=converted_dataset,
- deps=deps )
+ dependencies=deps )
data_provider.write_data_to_file( chrom, low, high, new_dataset.file_name )
# TODO: size not working.
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/c784699c544a/
changeset: r5493:c784699c544a
user: jgoecks
date: 2011-05-02 20:43:09
summary: Trackster: use user preferences when drawing summary tree.
affected #: 1 file (62 bytes)
--- a/static/scripts/trackster.js Mon May 02 13:59:49 2011 -0400
+++ b/static/scripts/trackster.js Mon May 02 14:43:09 2011 -0400
@@ -2391,7 +2391,7 @@
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.css({ position: "absolute", top: "22px", left: "10px", color: this.prefs.label_color });
max_label.prependTo(this.container_div);
// Create canvas
var canvas = this.view.canvas_manager.new_canvas();
@@ -2850,14 +2850,14 @@
if (!y) { continue; }
var y_px = y / max * height
if (y !== 0 && y_px < 1) { y_px = 1; }
-
- ctx.fillStyle = "black";
+
+ ctx.fillStyle = this.prefs.block_color;
ctx.fillRect( x, base_y - y_px, delta_x_px, y_px );
// Draw number count if it can fit the number with some padding, otherwise things clump up
var text_padding_req_x = 4;
if (this.prefs.show_counts && (ctx.measureText(y).width + text_padding_req_x) < delta_x_px) {
- ctx.fillStyle = "#666";
+ ctx.fillStyle = this.prefs.label_color;
ctx.textAlign = "center";
ctx.fillText(y, x + (delta_x_px/2), 10);
}
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/8b27774b2cab/
changeset: r5491:8b27774b2cab
user: kanwei
date: 2011-05-02 19:25:11
summary: Revert Mako to 0.2.5 since it breaks fn tests
affected #: 1 file (0 bytes)
--- a/eggs.ini Fri Apr 29 17:32:33 2011 -0400
+++ b/eggs.ini Mon May 02 13:25:11 2011 -0400
@@ -38,7 +38,7 @@
elementtree = 1.2.6_20050316
GeneTrack = 2.0.0_beta_1
lrucache = 0.2
-Mako = 0.4.1
+Mako = 0.2.5
nose = 0.11.1
NoseHTML = 0.4.1
NoseTestDiff = 0.1
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.