diff --git a/src/zmapWindow/zmapWindowItemFeatureSet.c b/src/zmapWindow/zmapWindowItemFeatureSet.c index a174e842a7066e0ed714911e04ec026064d180e5..4b87b7b1061f6f81928b6d799d64077b1858a522 100755 --- a/src/zmapWindow/zmapWindowItemFeatureSet.c +++ b/src/zmapWindow/zmapWindowItemFeatureSet.c @@ -27,9 +27,9 @@ * * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Apr 20 11:59 2009 (rds) + * Last edited: Apr 21 16:49 2009 (rds) * Created: Mon Jul 30 13:09:33 2007 (rds) - * CVS info: $Id: zmapWindowItemFeatureSet.c,v 1.11 2009-04-20 11:05:49 rds Exp $ + * CVS info: $Id: zmapWindowItemFeatureSet.c,v 1.12 2009-04-21 15:52:13 rds Exp $ *------------------------------------------------------------------- */ #include <string.h> /* memset */ @@ -49,6 +49,7 @@ enum ITEM_FEATURE_SET_SHOW_WHEN_EMPTY, ITEM_FEATURE_SET_DEFERRED, ITEM_FEATURE_SET_STRAND_SPECIFIC, + ITEM_FEATURE_SET_BUMP_SPACING, }; typedef struct @@ -360,6 +361,17 @@ double zmapWindowItemFeatureSetGetWidth(ZMapWindowItemFeatureSetData set_data) return width; } +double zmapWindowItemFeatureGetBumpSpacing(ZMapWindowItemFeatureSetData set_data) +{ + double spacing; + + g_object_get(G_OBJECT(set_data), + ZMAPSTYLE_PROPERTY_BUMP_SPACING, &spacing, + NULL); + + return spacing; +} + gboolean zmapWindowItemFeatureSetGetMagValues(ZMapWindowItemFeatureSetData set_data, double *min_mag_out, double *max_mag_out) { @@ -584,6 +596,14 @@ static void zmap_window_item_feature_set_class_init(ZMapWindowItemFeatureSetData "The minimum width the column should be displayed at.", 0.0, 32000.00, 16.0, ZMAP_PARAM_STATIC_RO)); + /* Bump spacing */ + g_object_class_install_property(gobject_class, + ITEM_FEATURE_SET_BUMP_SPACING, + g_param_spec_double(ZMAPSTYLE_PROPERTY_BUMP_SPACING, + ZMAPSTYLE_PROPERTY_BUMP_SPACING, + "The x coord spacing between features when bumping.", + 0.0, 32000.00, 1.0, + ZMAP_PARAM_STATIC_RO)); /* display mode */ g_object_class_install_property(gobject_class, ITEM_FEATURE_SET_VISIBLE, @@ -693,6 +713,7 @@ static void zmap_window_item_feature_set_get_property(GObject *gobject, switch(param_id) { + case ITEM_FEATURE_SET_BUMP_SPACING: case ITEM_FEATURE_SET_WIDTH: case ITEM_FEATURE_SET_VISIBLE: case ITEM_FEATURE_SET_OVERLAP_MODE: @@ -775,6 +796,7 @@ static void extract_value_from_style_table(gpointer key, gpointer value, gpointe switch(value_data->param_id) { + case ITEM_FEATURE_SET_BUMP_SPACING: case ITEM_FEATURE_SET_WIDTH: { double tmp_width, style_width; diff --git a/src/zmapWindow/zmapWindowItemFeatureSet.h b/src/zmapWindow/zmapWindowItemFeatureSet.h index 3feec871e0ded7e7b019142eb38621d9535e95e6..3e1719d2b3f28534666ea8454853a8fcf27aeed2 100755 --- a/src/zmapWindow/zmapWindowItemFeatureSet.h +++ b/src/zmapWindow/zmapWindowItemFeatureSet.h @@ -27,9 +27,9 @@ * * Exported functions: See XXXXXXXXXXXXX.h * HISTORY: - * Last edited: Apr 17 16:32 2009 (rds) + * Last edited: Apr 21 16:48 2009 (rds) * Created: Fri Feb 6 15:32:46 2009 (rds) - * CVS info: $Id: zmapWindowItemFeatureSet.h,v 1.6 2009-04-20 11:06:03 rds Exp $ + * CVS info: $Id: zmapWindowItemFeatureSet.h,v 1.7 2009-04-21 15:52:16 rds Exp $ *------------------------------------------------------------------- */ @@ -91,6 +91,7 @@ ZMapFeatureTypeStyle zmapWindowItemFeatureSetGetStyle(ZMapWindowItemFeatureSetDa ZMapFeatureTypeStyle zmapWindowItemFeatureSetColumnStyle(ZMapWindowItemFeatureSetData set_data); double zmapWindowItemFeatureSetGetWidth(ZMapWindowItemFeatureSetData set_data); +double zmapWindowItemFeatureGetBumpSpacing(ZMapWindowItemFeatureSetData set_data); gboolean zmapWindowItemFeatureSetGetMagValues(ZMapWindowItemFeatureSetData set_data, double *min_mag_out, double *max_mag_out);