From 2e25a76aed34a6dfd5f4523bbcdf903d478e8739 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Thu, 29 Mar 2007 09:00:52 +0000
Subject: [PATCH] remove redundant style mode.
---
src/include/ZMap/zmapStyle.h | 5 ++---
src/zmapServer/acedb/acedbServer.c | 8 ++++----
src/zmapServer/das/dasServer.c | 8 ++++----
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/include/ZMap/zmapStyle.h b/src/include/ZMap/zmapStyle.h
index e2ab994c5..a91497e99 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: Mar 26 16:28 2007 (edgrif)
+ * Last edited: Mar 29 08:54 2007 (edgrif)
* Created: Mon Feb 26 09:28:26 2007 (edgrif)
- * CVS info: $Id: zmapStyle.h,v 1.2 2007-03-28 16:02:00 edgrif Exp $
+ * CVS info: $Id: zmapStyle.h,v 1.3 2007-03-29 09:01:36 edgrif Exp $
*-------------------------------------------------------------------
*/
#ifndef ZMAP_STYLE_H
@@ -66,7 +66,6 @@ typedef enum
#define ZMAP_MODE_METADEFS(DEF_MACRO) \
DEF_MACRO(ZMAPSTYLE_MODE_INVALID)\
- DEF_MACRO(ZMAPSTYLE_MODE_NONE)\
DEF_MACRO(ZMAPSTYLE_MODE_META)\
DEF_MACRO(ZMAPSTYLE_MODE_BASIC)\
DEF_MACRO(ZMAPSTYLE_MODE_TRANSCRIPT)\
diff --git a/src/zmapServer/acedb/acedbServer.c b/src/zmapServer/acedb/acedbServer.c
index 380a3849e..2583a98a0 100755
--- a/src/zmapServer/acedb/acedbServer.c
+++ b/src/zmapServer/acedb/acedbServer.c
@@ -27,9 +27,9 @@
*
* Exported functions: See zmapServer.h
* HISTORY:
- * Last edited: Mar 28 09:55 2007 (edgrif)
+ * Last edited: Mar 29 09:02 2007 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
- * CVS info: $Id: acedbServer.c,v 1.85 2007-03-28 16:33:47 edgrif Exp $
+ * CVS info: $Id: acedbServer.c,v 1.86 2007-03-29 09:00:52 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -1655,7 +1655,7 @@ ZMapFeatureTypeStyle parseMethod(char *method_str_in,
gboolean strand_specific = FALSE, show_up_strand = FALSE,
frame_specific = FALSE, show_only_as_3_frame = FALSE ;
- ZMapStyleMode mode = ZMAPSTYLE_MODE_NONE ;
+ ZMapStyleMode mode = ZMAPSTYLE_MODE_INVALID ;
gboolean hide_always = FALSE, init_hidden = FALSE ;
double min_mag = 0.0, max_mag = 0.0 ;
gboolean score_set = FALSE ;
@@ -1964,7 +1964,7 @@ ZMapFeatureTypeStyle parseMethod(char *method_str_in,
* currently, we have to set it later. */
style = zMapFeatureTypeCreate(name, remark) ;
- if (mode != ZMAPSTYLE_MODE_NONE)
+ if (mode != ZMAPSTYLE_MODE_INVALID)
zMapStyleSetMode(style, mode) ;
diff --git a/src/zmapServer/das/dasServer.c b/src/zmapServer/das/dasServer.c
index 846049b17..fe8f61d0c 100755
--- a/src/zmapServer/das/dasServer.c
+++ b/src/zmapServer/das/dasServer.c
@@ -26,9 +26,9 @@
*
* Exported functions: See ZMap/zmapServerPrototype.h
* HISTORY:
- * Last edited: Mar 27 15:58 2007 (edgrif)
+ * Last edited: Mar 29 09:02 2007 (edgrif)
* Created: Wed Aug 6 15:46:38 2003 (edgrif)
- * CVS info: $Id: dasServer.c,v 1.26 2007-03-28 16:04:40 edgrif Exp $
+ * CVS info: $Id: dasServer.c,v 1.27 2007-03-29 09:01:08 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -1255,7 +1255,7 @@ static void typesFilter (ZMapDAS1Type type, gpointer user_data
GQuark tmp_quark;
char *name, *desc, *outline, *fg, *bg;
double width = 5.0; /* pass sanity check in featuretypecreate */
- ZMapStyleMode mode = ZMAPSTYLE_MODE_NONE ;
+ ZMapStyleMode mode = ZMAPSTYLE_MODE_INVALID ;
tmp_quark = type->type_id;
name = (char *)g_quark_to_string(tmp_quark);
@@ -1266,7 +1266,7 @@ static void typesFilter (ZMapDAS1Type type, gpointer user_data
/* Mode is currently hard-coded, don't know if das will address this. */
style = zMapFeatureTypeCreate(name, desc) ;
- if (mode != ZMAPSTYLE_MODE_NONE)
+ if (mode != ZMAPSTYLE_MODE_INVALID)
zMapStyleSetMode(style, mode) ;
zMapStyleSetColours(style, ZMAPSTYLE_COLOURTARGET_NORMAL, ZMAPSTYLE_COLOURTYPE_NORMAL, bg, fg, outline) ;
--
GitLab