Skip to content
Snippets Groups Projects
Commit 42c678d9 authored by mh17's avatar mh17
Browse files

added assembly_path to stats and also addFeatureModeCB ( )

parent 0f37f04d
No related branches found
No related tags found
No related merge requests found
......@@ -29,7 +29,7 @@
* HISTORY:
* Last edited: Dec 14 11:20 2009 (edgrif)
* Created: Fri Jul 16 13:05:58 2004 (edgrif)
* CVS info: $Id: zmapFeature.c,v 1.120 2010-01-19 12:36:53 mh17 Exp $
* CVS info: $Id: zmapFeature.c,v 1.121 2010-01-25 13:17:45 mh17 Exp $
*-------------------------------------------------------------------
*/
......@@ -2858,6 +2858,7 @@ static void addFeatureModeCB(gpointer key, gpointer data, gpointer user_data)
case ZMAPSTYLE_MODE_PEP_SEQUENCE:
mode = ZMAPSTYLE_MODE_TEXT ;
break ;
case ZMAPSTYLE_MODE_ASSEMBLY_PATH: // mh17: hoping this works...
case ZMAPSTYLE_MODE_TEXT:
case ZMAPSTYLE_MODE_GLYPH:
case ZMAPSTYLE_MODE_GRAPH:
......
......@@ -30,7 +30,7 @@
* HISTORY:
* Last edited: Jan 22 13:04 2010 (edgrif)
* Created: Thu Sep 8 10:34:49 2005 (edgrif)
* CVS info: $Id: zmapWindowDraw.c,v 1.116 2010-01-22 13:05:00 edgrif Exp $
* CVS info: $Id: zmapWindowDraw.c,v 1.117 2010-01-25 13:17:45 mh17 Exp $
*-------------------------------------------------------------------
*/
......@@ -176,7 +176,7 @@ void zMapWindowToggle3Frame(ZMapWindow window)
if(g_list_find(window->feature_set_names, three_frame_id))
{
#ifdef RDS_REMOVED
#ifndef RDS_REMOVED_STATS
/* Remove all col. configuration windows as columns will be destroyed/recreated and the column
* list will be out of date. */
zmapWindowColumnConfigureDestroy(window) ;
......
......@@ -31,7 +31,7 @@
* HISTORY:
* Last edited: Feb 3 16:19 2009 (rds)
* Created: Tue Nov 7 10:10:25 2006 (edgrif)
* CVS info: $Id: zmapWindowStats.c,v 1.12 2010-01-22 17:33:53 mh17 Exp $
* CVS info: $Id: zmapWindowStats.c,v 1.13 2010-01-25 13:17:46 mh17 Exp $
*-------------------------------------------------------------------
*/
......@@ -121,6 +121,8 @@ ZMapWindowStatsAny zmapWindowStatsAddChild(ZMapWindowStats stats, ZMapFeatureAny
switch (feature->type)
{
case ZMAPSTYLE_MODE_ASSEMBLY_PATH:
case ZMAPSTYLE_MODE_BASIC:
case ZMAPSTYLE_MODE_RAW_SEQUENCE:
case ZMAPSTYLE_MODE_PEP_SEQUENCE:
......@@ -135,6 +137,7 @@ ZMapWindowStatsAny zmapWindowStatsAddChild(ZMapWindowStats stats, ZMapFeatureAny
case ZMAPSTYLE_MODE_TRANSCRIPT:
num_bytes = sizeof(ZMapWindowStatsTranscriptStruct) ;
break ;
case ZMAPSTYLE_MODE_META:
default:
zMapAssertNotReached() ;
break ;
......@@ -264,7 +267,7 @@ static void printStats(gpointer data, gpointer user_data)
{
ZMapWindowStatsTranscript transcript = (ZMapWindowStatsTranscript)any_stats ;
g_string_append_printf(text, "Transcript\tfeatures:%d\texons:%d,\tintrons:%d,\tcds:%d"
g_string_append_printf(text, "Transcript\tfeatures:%d\texons:%d,\tintrons:%d,\tcds:%d\t"
"boxes:%d\texon_boxes:%d\tintron_boxes:%d\tcds_boxes:%d\n",
transcript->transcripts, transcript->exons, transcript->introns, transcript->cds,
transcript->items, transcript->exon_boxes, transcript->intron_boxes, transcript->cds_boxes) ;
......@@ -273,7 +276,7 @@ static void printStats(gpointer data, gpointer user_data)
default:
/* NEEDS FIXING TO DO STATS FOR OTHER STYLE MODES.... */
// zMapLogFatalLogicErr("switch(), unknown value: %d", any_stats->feature_type) ;
// zMapLogFatalLogicErr("switch(), unknown value: %d", any_stats->feature_type) ;
g_string_append_printf(text,"ERROR: switch(), unknown value: %d", any_stats->feature_type);
break ;
......
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