Skip to content
Snippets Groups Projects
Commit cd966c71 authored by rds's avatar rds
Browse files

Styles implemented as GObjects, initial version...

parent c56e9d91
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
src/include/ZMap/zmapStyle.h
+ 49
− 43
View file @ cd966c71
......@@ -26,9 +26,9 @@
* Description: Style and Style set handling functions.
*
* HISTORY:
* Last edited: Jun 11 13:32 2008 (rds)
* Last edited: Jun 25 14:51 2008 (rds)
* Created: Mon Feb 26 09:28:26 2007 (edgrif)
* CVS info: $Id: zmapStyle.h,v 1.22 2008-06-12 21:00:46 rds Exp $
* CVS info: $Id: zmapStyle.h,v 1.23 2008-06-25 13:59:24 rds Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_STYLE_H
......@@ -36,9 +36,6 @@
#include <ZMap/zmapEnum.h>
/* The opaque struct representing a style. */
typedef struct _zmapFeatureTypeStyleStruct *ZMapFeatureTypeStyle ;
#define ZMAP_STYLE_MODE_LIST(_) \
_(ZMAPSTYLE_MODE_INVALID,) /**< invalid mode */ \
......@@ -123,8 +120,7 @@ ZMAP_DEFINE_ENUM(ZMapStyleScoreMode, ZMAP_STYLE_SCORE_MODE_LIST) ;
/* Specifies how features in columns should be overlapped for compact display. */
#define ZMAP_STYLE_OVERLAP_MODE_LIST(_) \
_(ZMAPOVERLAP_START,) \
_(ZMAPOVERLAP_INVALID, = ZMAPOVERLAP_START) \
_(ZMAPOVERLAP_INVALID,) \
_(ZMAPOVERLAP_COMPLETE,) /* draw on top - default */ \
_(ZMAPOVERLAP_OVERLAP,) /* bump if feature coords overlap. */ \
_(ZMAPOVERLAP_POSITION,) /* bump if features start at same coord. */ \
......@@ -153,6 +149,50 @@ _(ZMAPOVERLAP_END,)
ZMAP_DEFINE_ENUM(ZMapStyleOverlapMode, ZMAP_STYLE_OVERLAP_MODE_LIST) ;
#define ZMAPOVERLAP_START ZMAPOVERLAP_INVALID
/* Note the naming here in the macros. ZMAP_TYPE_FEATURE_TYPE_STYLE seemed confusing... */
#define ZMAP_TYPE_FEATURE_STYLE (zMapFeatureTypeStyleGetType())
#define ZMAP_FEATURE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyle))
#define ZMAP_FEATURE_STYLE_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyle const))
#define ZMAP_FEATURE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyleClass))
#define ZMAP_IS_FEATURE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ZMAP_TYPE_FEATURE_STYLE))
#define ZMAP_FEATURE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyleClass))
/* Instance */
typedef struct _zmapFeatureTypeStyleStruct *ZMapFeatureTypeStyle;
typedef struct _zmapFeatureTypeStyleStruct zmapFeatureTypeStyle;
/* Class */
typedef struct _zmapFeatureTypeStyleClassStruct *ZMapFeatureTypeStyleClass;
typedef struct _zmapFeatureTypeStyleClassStruct zmapFeatureTypeStyleClass;
typedef struct
{
char *fill;
char *draw;
char *border;
} ZMapStyleColourStringsStruct, *ZMapStyleColourStrings;
/* Public funcs */
GType zMapFeatureTypeStyleGetType(void);
/* Enum -> String Decs */
/* const char *zMapStyleMode2Str(ZMapStyleMode mode); */
ZMAP_ENUM_AS_STRING_DEC(zMapStyleMode2Str, ZMapStyleMode);
ZMapFeatureTypeStyle zMapFeatureStyleCreate(char *name, char *description);
ZMapFeatureTypeStyle zMapFeatureStyleCopy(ZMapFeatureTypeStyle src);
gboolean zMapStyleCCopy(ZMapFeatureTypeStyle src, ZMapFeatureTypeStyle *dest_out);
void zMapStyleDestroy(ZMapFeatureTypeStyle style);
gboolean zMapStyleNameCompare(ZMapFeatureTypeStyle style, char *name) ;
......@@ -176,7 +216,7 @@ gboolean zMapStyleGetColours(ZMapFeatureTypeStyle style, ZMapStyleColourTarget t
gboolean zMapStyleColourByStrand(ZMapFeatureTypeStyle style);
ZMapStyleMode zMapStyleGetMode(ZMapFeatureTypeStyle style) ;
ZMAP_ENUM_AS_STRING_DEC(zMapStyleMode2Str, ZMapStyleMode);
void zMapStyleSetGFF(ZMapFeatureTypeStyle style, char *gff_source, char *gff_feature) ;
......@@ -195,6 +235,7 @@ gboolean zMapStyleIsHidden(ZMapFeatureTypeStyle style) ;
void zMapStyleSetShowWhenEmpty(ZMapFeatureTypeStyle style, gboolean show_when_empty) ;
gboolean zMapStyleGetShowWhenEmpty(ZMapFeatureTypeStyle style);
gboolean zMapStyleIsFrameSpecific(ZMapFeatureTypeStyle style) ;
......@@ -302,41 +343,6 @@ GData *zMapStyleMergeStyles(GData *curr_styles, GData *new_styles) ;
void zMapStyleDestroyStyles(GData **styles) ;
#ifdef STYLES_ARE_G_OBJECTS
#ifndef __ZMAP_STYLE_H__
#define __ZMAP_STYLE_H__
/* Note the naming here in the macros. ZMAP_TYPE_FEATURE_TYPE_STYLE seemed confusing... */
#define ZMAP_TYPE_FEATURE_STYLE (zMapFeatureTypeStyleGetType())
#define ZMAP_FEATURE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyle))
#define ZMAP_FEATURE_STYLE_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyle const))
#define ZMAP_FEATURE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyleClass))
#define ZMAP_IS_FEATURE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ZMAP_TYPE_FEATURE_STYLE))
#define ZMAP_FEATURE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ZMAP_TYPE_FEATURE_STYLE, zmapFeatureTypeStyleClass))
/* Instance */
typedef struct _zmapFeatureTypeStyleStruct *ZMapFeatureTypeStyle;
typedef struct _zmapFeatureTypeStyleStruct zmapFeatureTypeStyle;
/* Class */
typedef struct _zmapFeatureTypeStyleClassStruct *ZMapFeatureTypeStyleClass;
typedef struct _zmapFeatureTypeStyleClassStruct zmapFeatureTypeStyleClass;
/* Public funcs */
GType zMapFeatureTypeStyleGetType(void);
#endif /* __ZMAP_STYLE_H__ */
#endif /* STYLES_ARE_G_OBJECTS */
......
src/zmapFeature/zmapFeatureTypes.c
+ 189
− 276
View file @ cd966c71
This diff is collapsed.
src/zmapFeature/zmapStyle.c
+ 857
− 73
View file @ cd966c71
This diff is collapsed.
src/zmapFeature/zmapStyle_I.h
+ 20
− 12
View file @ cd966c71
......@@ -26,9 +26,9 @@
* Description: Private header for style.
*
* HISTORY:
* Last edited: Jun 10 10:46 2008 (rds)
* Last edited: Jun 16 09:55 2008 (rds)
* Created: Mon Feb 26 09:13:30 2007 (edgrif)
* CVS info: $Id: zmapStyle_I.h,v 1.1 2008-06-12 21:03:58 rds Exp $
* CVS info: $Id: zmapStyle_I.h,v 1.2 2008-06-25 14:00:39 rds Exp $
*-------------------------------------------------------------------
*/
......@@ -40,10 +40,7 @@
#include <ZMap/zmapFeature.h>
#include <ZMap/zmapStyle.h>
#ifdef STYLES_ARE_G_OBJECTS
#include <ZMap/zmapStyle.h>
#include <zmapBase_I.h>
#define ZMAP_PARAM_STATIC (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
#define ZMAP_PARAM_STATIC_RW (ZMAP_PARAM_STATIC | G_PARAM_READWRITE)
......@@ -51,11 +48,11 @@
typedef struct _zmapFeatureTypeStyleClassStruct
{
GObjectClass __parent__;
zmapBaseClass __parent__;
} zmapFeatureTypeStyleClassStruct;
#endif /* STYLES_ARE_G_OBJECTS */
/*! @addtogroup zmapstyles
* @{
......@@ -225,10 +222,7 @@ typedef struct
* of feature the style represents. */
typedef struct _zmapFeatureTypeStyleStruct
{
#ifdef STYLES_ARE_G_OBJECTS
GObject __parent__;
#endif /* STYLES_ARE_G_OBJECTS */
zmapBase __parent__;
/*! _All_ styles must have these fields set, no other fields are compulsory. */
GQuark original_id ; /*!< Original name. */
......@@ -366,6 +360,20 @@ typedef struct _zmapFeatureTypeStyleStruct
/* Enum -> String Decs */
/* const char *zmapStyleMode2Str(ZMapStyleMode mode); */
ZMAP_ENUM_AS_STRING_DEC(zmapStyleMode2Str, ZMapStyleMode);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleColDisplayState2Str, ZMapStyleColumnDisplayState);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleGraphMode2Str, ZMapStyleGraphMode);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleGlyphMode2Str, ZMapStyleGlyphMode);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleDrawContext2Str, ZMapStyleDrawContext);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleColourType2Str, ZMapStyleColourType);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleColourTarget2Str, ZMapStyleColourTarget);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleScoreMode2Str, ZMapStyleScoreMode);
ZMAP_ENUM_AS_STRING_DEC(zmapStyleOverlapMode2Str, ZMapStyleOverlapMode);
ZMapFeatureTypeStyle zMapFeatureStyleCreate(char *name, char *description);
/*! @} end of zmapstyles docs. */
......
src/zmapFeature/zmapStyle_P.h
+ 3
− 2
View file @ cd966c71
......@@ -26,14 +26,15 @@
* Description: Private header for style.
*
* HISTORY:
* Last edited: Jun 10 11:32 2008 (rds)
* Last edited: Jun 13 17:33 2008 (rds)
* Created: Mon Feb 26 09:13:30 2007 (edgrif)
* CVS info: $Id: zmapStyle_P.h,v 1.12 2008-06-12 21:02:36 rds Exp $
* CVS info: $Id: zmapStyle_P.h,v 1.13 2008-06-25 14:00:48 rds Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_STYLE_P_H
#define ZMAP_STYLE_P_H
#define STYLES_ARE_G_OBJECTS
#include <zmapStyle_I.h>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment