From 30ea13d480c06a3190534c09182f72ceddccc463 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Fri, 22 Jan 2010 13:02:59 +0000
Subject: [PATCH] replace old get feature call with new.
---
src/zmapWindow/zmapWindow.c | 12 ++++--------
src/zmapWindow/zmapWindowColBump.c | 6 +++---
src/zmapWindow/zmapWindowDNA.c | 10 +++++-----
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/zmapWindow/zmapWindow.c b/src/zmapWindow/zmapWindow.c
index 62a5b1a09..326d8cc0c 100755
--- a/src/zmapWindow/zmapWindow.c
+++ b/src/zmapWindow/zmapWindow.c
@@ -26,9 +26,9 @@
*
* Exported functions: See ZMap/zmapWindow.h
* HISTORY:
- * Last edited: Jan 22 22:57 2010 (roy)
+ * Last edited: Jan 22 11:15 2010 (edgrif)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info: $Id: zmapWindow.c,v 1.304 2010-01-22 10:06:42 rds Exp $
+ * CVS info: $Id: zmapWindow.c,v 1.305 2010-01-22 13:02:59 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -1241,7 +1241,7 @@ void zMapWindowUpdateInfoPanel(ZMapWindow window,
gboolean replace_highlight_item,
gboolean highlight_same_names)
{
- ZMapWindowCanvasItem canvas_item, top_canvas_item;
+ ZMapWindowCanvasItem top_canvas_item;
ZMapFeature feature = NULL;
ZMapFeatureTypeStyle style ;
ZMapWindowSelectStruct select = {0} ;
@@ -1264,12 +1264,8 @@ void zMapWindowUpdateInfoPanel(ZMapWindow window,
return ;
}
- canvas_item = zMapWindowCanvasItemIntervalGetObject(sub_item);
- zMapAssert(ZMAP_IS_CANVAS_ITEM(canvas_item));
-
sub_feature = zMapWindowCanvasItemIntervalGetData(sub_item);
-
- feature = zMapWindowCanvasItemGetFeature(canvas_item);
+ feature = zMapWindowCanvasItemGetFeature(sub_item);
zMapAssert(feature_arg == feature);
top_canvas_item = zMapWindowCanvasItemIntervalGetTopLevelObject(sub_item);
diff --git a/src/zmapWindow/zmapWindowColBump.c b/src/zmapWindow/zmapWindowColBump.c
index df31feecc..8ff310fd8 100755
--- a/src/zmapWindow/zmapWindowColBump.c
+++ b/src/zmapWindow/zmapWindowColBump.c
@@ -27,9 +27,9 @@
*
* Exported functions: See zmapWindow_P.h
* HISTORY:
- * Last edited: Jan 11 09:16 2010 (edgrif)
+ * Last edited: Jan 22 11:15 2010 (edgrif)
* Created: Tue Sep 4 10:52:09 2007 (edgrif)
- * CVS info: $Id: zmapWindowColBump.c,v 1.59 2010-01-21 08:48:55 mh17 Exp $
+ * CVS info: $Id: zmapWindowColBump.c,v 1.60 2010-01-22 13:03:18 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -274,7 +274,7 @@ static void make_parent_item_cb(gpointer data, gpointer user_data)
if((column_data->feature_list) &&
(column_data->feature_list->data) &&
- (feature = zMapWindowCanvasItemGetFeature(column_data->feature_list->data)))
+ (feature = zMapWindowCanvasItemGetFeature(FOO_CANVAS_ITEM(column_data->feature_list->data))))
{
if (feature->type == ZMAPSTYLE_MODE_ALIGNMENT)
column_data->parent_item = zMapWindowCollectionFeatureCreate(column_features);
diff --git a/src/zmapWindow/zmapWindowDNA.c b/src/zmapWindow/zmapWindowDNA.c
index 640b02aa2..c412c1fd1 100755
--- a/src/zmapWindow/zmapWindowDNA.c
+++ b/src/zmapWindow/zmapWindowDNA.c
@@ -26,9 +26,9 @@
*
* Exported functions: See zmapWindow_P.h
* HISTORY:
- * Last edited: Jun 11 14:02 2009 (rds)
+ * Last edited: Jan 22 11:15 2010 (edgrif)
* Created: Fri Oct 6 16:00:11 2006 (edgrif)
- * CVS info: $Id: zmapWindowDNA.c,v 1.22 2009-06-11 14:06:55 rds Exp $
+ * CVS info: $Id: zmapWindowDNA.c,v 1.23 2010-01-22 13:03:40 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -121,13 +121,13 @@ void zmapWindowCreateSequenceSearchWindow(ZMapWindow window, FooCanvasItem *feat
/* Need to check that there is any dna...n.b. we need the item that was clicked for us to check
* the dna..... */
- if(ZMAP_IS_CONTAINER_GROUP(feature_item))
+ if (ZMAP_IS_CONTAINER_GROUP(feature_item))
{
zmapWindowContainerGetFeatureAny((ZMapWindowContainerGroup)feature_item, &feature_any);
}
- else if(ZMAP_IS_CANVAS_ITEM(feature_item))
+ else if (ZMAP_IS_CANVAS_ITEM(feature_item))
{
- feature_any = (ZMapFeatureAny)zMapWindowCanvasItemGetFeature((ZMapWindowCanvasItem)feature_item);
+ feature_any = (ZMapFeatureAny)zMapWindowCanvasItemGetFeature(feature_item) ;
}
else
{
--
GitLab