diff --git a/src/include/ZMap/zmapStyle.h b/src/include/ZMap/zmapStyle.h index b5b1813ea93db787e539ff715b678f9d6ac27761..8dc8a596972b5c8a37bc87edb38c1255755c68e5 100755 --- a/src/include/ZMap/zmapStyle.h +++ b/src/include/ZMap/zmapStyle.h @@ -26,9 +26,9 @@ * Description: Style and Style set handling functions. * * HISTORY: - * Last edited: Sep 18 12:21 2007 (rds) + * Last edited: Oct 15 15:38 2007 (rds) * Created: Mon Feb 26 09:28:26 2007 (edgrif) - * CVS info: $Id: zmapStyle.h,v 1.11 2007-09-18 11:22:29 rds Exp $ + * CVS info: $Id: zmapStyle.h,v 1.12 2007-10-15 14:38:59 rds Exp $ *------------------------------------------------------------------- */ #ifndef ZMAP_STYLE_H @@ -247,8 +247,8 @@ double zMapStyleGetMinMag(ZMapFeatureTypeStyle style) ; double zMapStyleGetMaxMag(ZMapFeatureTypeStyle style) ; - - +void zMapStyleSetBumpSensitivity(ZMapFeatureTypeStyle style, gboolean ignore_mark); +gboolean zMapStyleGetBumpSensitivity(ZMapFeatureTypeStyle style); /* Lets change all these names to just be zmapStyle, i.e. lose the featuretype bit..... */ diff --git a/src/zmapFeature/zmapStyle.c b/src/zmapFeature/zmapStyle.c index 823afb27915b829ed13d65b468210517d36ab04c..3b7d5dcc9ac1749721e6b4edab392c170e3c7adf 100755 --- a/src/zmapFeature/zmapStyle.c +++ b/src/zmapFeature/zmapStyle.c @@ -28,9 +28,9 @@ * * Exported functions: See ZMap/zmapStyle.h * HISTORY: - * Last edited: Jun 19 13:19 2007 (edgrif) + * Last edited: Oct 15 12:30 2007 (rds) * Created: Mon Feb 26 09:12:18 2007 (edgrif) - * CVS info: $Id: zmapStyle.c,v 1.4 2007-06-21 12:26:17 edgrif Exp $ + * CVS info: $Id: zmapStyle.c,v 1.5 2007-10-15 14:36:53 rds Exp $ *------------------------------------------------------------------- */ @@ -1077,6 +1077,25 @@ double zMapStyleBaseline(ZMapFeatureTypeStyle style) return style->mode_data.graph.baseline ; } +void zMapStyleSetBumpSensitivity(ZMapFeatureTypeStyle style, gboolean ignore_mark) +{ + zMapAssert(style); + + style->opts.bump_ignore_mark = ignore_mark; + + return ; +} + +gboolean zMapStyleGetBumpSensitivity(ZMapFeatureTypeStyle style) +{ + gboolean ignore_mark; + zMapAssert(style); + + ignore_mark = style->opts.bump_ignore_mark; + + return ignore_mark; +} + static void setColours(ZMapStyleColour colour, char *border, char *draw, char *fill) { diff --git a/src/zmapFeature/zmapStyle_P.h b/src/zmapFeature/zmapStyle_P.h index 1a5e2101d3517ae29e225baf3a6d6e70efbcd5d9..2c3666b3382591a2e8fab32f00a292206ffc7a97 100755 --- a/src/zmapFeature/zmapStyle_P.h +++ b/src/zmapFeature/zmapStyle_P.h @@ -26,9 +26,9 @@ * Description: Private header for style. * * HISTORY: - * Last edited: Aug 15 11:24 2007 (edgrif) + * Last edited: Oct 15 14:15 2007 (rds) * Created: Mon Feb 26 09:13:30 2007 (edgrif) - * CVS info: $Id: zmapStyle_P.h,v 1.4 2007-08-16 15:48:52 edgrif Exp $ + * CVS info: $Id: zmapStyle_P.h,v 1.5 2007-10-15 14:36:48 rds Exp $ *------------------------------------------------------------------- */ #ifndef ZMAP_STYLE_P_H @@ -251,6 +251,8 @@ typedef struct ZMapFeatureTypeStyleStruct_ unsigned int directional_end : 1 ; /* Display pointy ends on exons etc. */ + unsigned int bump_ignore_mark : 1 ; /* Ignore the mark when bumping... Some columns need the bump not to be limited to the marked region. e.g. transcripts */ + } opts ;