From b808ff28b618824aca1b80c4b0af47d579284d05 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Thu, 4 Mar 2010 10:39:25 +0000
Subject: [PATCH] move colinearity type from window_P to feature.h.
---
src/include/ZMap/zmapFeature.h | 16 ++++++++++++++--
src/zmapWindow/zmapWindow_P.h | 16 +++-------------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/include/ZMap/zmapFeature.h b/src/include/ZMap/zmapFeature.h
index d9d8ce795..949a4f4ea 100755
--- a/src/include/ZMap/zmapFeature.h
+++ b/src/include/ZMap/zmapFeature.h
@@ -25,9 +25,9 @@
* Description: Data structures describing a sequence feature.
*
* HISTORY:
- * Last edited: Feb 5 11:25 2010 (edgrif)
+ * Last edited: Mar 3 13:40 2010 (edgrif)
* Created: Fri Jun 11 08:37:19 2004 (edgrif)
- * CVS info: $Id: zmapFeature.h,v 1.170 2010-02-08 18:13:23 mh17 Exp $
+ * CVS info: $Id: zmapFeature.h,v 1.171 2010-03-04 10:39:25 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_FEATURE_H
@@ -110,6 +110,18 @@ typedef enum {ZMAPPHASE_NONE = 0,
typedef enum {ZMAPHOMOL_NONE = 0,
ZMAPHOMOL_N_HOMOL, ZMAPHOMOL_X_HOMOL, ZMAPHOMOL_TX_HOMOL} ZMapHomolType ;
+
+/* Used to specify the degree of colinearity between two alignment blocks. */
+typedef enum
+ {
+ COLINEAR_INVALID,
+ COLINEAR_NOT, /* blocks not colinear. */
+ COLINEAR_IMPERFECT, /* blocks colinear but not contiguous. */
+ COLINEAR_PERFECT /* blocks colinear and contiguous. */
+ } ColinearityType ;
+
+
+
typedef enum {ZMAPBOUNDARY_NONE = 0, ZMAPBOUNDARY_CLONE_END,
ZMAPBOUNDARY_5_SPLICE, ZMAPBOUNDARY_3_SPLICE } ZMapBoundaryType ;
diff --git a/src/zmapWindow/zmapWindow_P.h b/src/zmapWindow/zmapWindow_P.h
index 3d780c3ed..b63d1b2ad 100755
--- a/src/zmapWindow/zmapWindow_P.h
+++ b/src/zmapWindow/zmapWindow_P.h
@@ -25,9 +25,9 @@
* Description: Defines internal interfaces/data structures of zMapWindow.
*
* HISTORY:
- * Last edited: Feb 15 11:51 2010 (edgrif)
+ * Last edited: Mar 3 15:12 2010 (edgrif)
* Created: Fri Aug 1 16:45:58 2003 (edgrif)
- * CVS info: $Id: zmapWindow_P.h,v 1.257 2010-02-18 11:27:02 mh17 Exp $
+ * CVS info: $Id: zmapWindow_P.h,v 1.258 2010-03-04 10:39:25 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_WINDOW_P_H
@@ -52,15 +52,13 @@
/*
- * This section details data that we attacht to the foocanvas items that represent
+ * This section details data that we attach to the foocanvas items that represent
* contexts, aligns etc. Each data structure is accessed via a key given by the
* string in the hash define for each struct.
*/
-
/* Names for keys in G_OBJECTS */
-
#define ZMAP_WINDOW_POINTER ZMAP_WINDOW_P_H "canvas_to_window"
#define ITEM_HIGHLIGHT_DATA ZMAP_WINDOW_P_H "item_highlight_data"
@@ -73,14 +71,6 @@
#endif /* !ITEM_FEATURE_DATA */
-typedef enum {
- COLINEAR_INVALID,
- COLINEAR_NOT,
- COLINEAR_IMPERFECT,
- COLINEAR_PERFECT
-} ColinearityType ;
-
-
/* All Align/Block/Column/Feature FooCanvas containers have stats blocks attached to them
* via this key, below structs show data collected for each. */
#define ITEM_FEATURE_STATS ZMAP_WINDOW_P_H "item_feature_stats"
--
GitLab