From 584900670162409ef832882e9c689ca9b9aa7306 Mon Sep 17 00:00:00 2001
From: rds <rds>
Date: Wed, 22 Apr 2009 17:34:49 +0000
Subject: [PATCH] move to accessing column computed style property
---
src/zmapWindow/zmapWindowColBump.c | 19 +++++++++++++------
src/zmapWindow/zmapWindowState.c | 11 ++++-------
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/zmapWindow/zmapWindowColBump.c b/src/zmapWindow/zmapWindowColBump.c
index b73a439ac..d4b903b49 100755
--- a/src/zmapWindow/zmapWindowColBump.c
+++ b/src/zmapWindow/zmapWindowColBump.c
@@ -27,9 +27,9 @@
*
* Exported functions: See zmapWindow_P.h
* HISTORY:
- * Last edited: Apr 22 17:04 2009 (rds)
+ * Last edited: Apr 22 18:32 2009 (rds)
* Created: Tue Sep 4 10:52:09 2007 (edgrif)
- * CVS info: $Id: zmapWindowColBump.c,v 1.35 2009-04-22 16:09:56 rds Exp $
+ * CVS info: $Id: zmapWindowColBump.c,v 1.36 2009-04-22 17:34:49 rds Exp $
*-------------------------------------------------------------------
*/
@@ -3653,16 +3653,23 @@ static void invoke_bump_to_initial(FooCanvasGroup *container, FooCanvasPoints *p
case ZMAPCONTAINER_LEVEL_FEATURESET:
{
ZMapStyleOverlapMode default_mode, current_mode, initial_mode;
- ZMapFeatureTypeStyle style;
ZMapWindowItemFeatureSetData set_data ;
set_data = g_object_get_data(G_OBJECT(container), ITEM_FEATURE_SET_DATA) ;
- style = zmapWindowItemFeatureSetColumnStyle(set_data);
- current_mode = zMapStyleGetOverlapMode(style) ;
- default_mode = zMapStyleGetDefaultOverlapMode(style);
+ current_mode = zmapWindowItemFeatureSetGetOverlapMode(set_data);
+ default_mode = zmapWindowItemFeatureSetGetDefaultOverlapMode(set_data);
+#warning DISCUSS_WITH_ED
+#warning NEED_INITIAL_BUMP_MODE
+#ifdef CHECK_THIS_OUT
initial_mode = hack_initial_mode(style);
+#endif
+
+ /* Probably need to zmapWIndowItemFeatureSetHackInitialOverlapModes(set_data); */
+
+#warning HACKED_FOR_NOW_TRANSCRIPTS_WILL_UNBUMP_TOO
+ initial_mode = current_mode;
if(initial_mode != current_mode)
zmapWindowColumnBumpRange(FOO_CANVAS_ITEM(container), initial_mode, ZMAPWINDOW_COMPRESS_ALL);
diff --git a/src/zmapWindow/zmapWindowState.c b/src/zmapWindow/zmapWindowState.c
index 9a0aea3a8..54010e77e 100755
--- a/src/zmapWindow/zmapWindowState.c
+++ b/src/zmapWindow/zmapWindowState.c
@@ -27,9 +27,9 @@
*
* Exported functions: See XXXXXXXXXXXXX.h
* HISTORY:
- * Last edited: Apr 22 17:30 2009 (rds)
+ * Last edited: Apr 22 18:34 2009 (rds)
* Created: Mon Jun 11 09:49:16 2007 (rds)
- * CVS info: $Id: zmapWindowState.c,v 1.17 2009-04-22 16:32:38 rds Exp $
+ * CVS info: $Id: zmapWindowState.c,v 1.18 2009-04-22 17:34:56 rds Exp $
*-------------------------------------------------------------------
*/
@@ -620,13 +620,10 @@ static void state_bumped_columns_restore(ZMapWindow window, ZMapWindowBumpStateS
feature_id)))
{
ZMapWindowItemFeatureSetData set_data;
- ZMapFeatureTypeStyle style;
FooCanvasGroup *container_parent = FOO_CANVAS_GROUP(container);
set_data = zmapWindowContainerGetData(container_parent, ITEM_FEATURE_SET_DATA);
- style = zmapWindowItemFeatureSetColumnStyle(set_data);
-
if(!set_data->sorted)
{
zmapWindowContainerSortFeatures(container_parent, 0);
@@ -640,8 +637,8 @@ static void state_bumped_columns_restore(ZMapWindow window, ZMapWindowBumpStateS
/* Also if the bump is not different from the current the compress mode
* will almost certainly mean there will be odd results...
*/
-#warning WRONG
- if(zMapStyleGetOverlapMode(style) != column_state->bump_mode)
+#warning WRONG_NEED_INITIAL_BUMP_MODE
+ if(zmapWindowItemFeatureSetGetOverlapMode(set_data) != column_state->bump_mode)
{
/* I'm unsure on the cause of this, so this "fixes"
* the crash at the expense on _not_ restoring the
--
GitLab