Changeset 8304 for branches

Timestamp:

14/12/11 09:36:49 (5 months ago)

Author:

westram

Message:

• removed ED4_species_container_changed_cb
  • that callback triggered whenever the number of species in database increased and then loaded the "last" species in species container
    • most likely was thought to load species after creating a new species, but also triggered after delete+undo and similar
  • removed GB_search_last_son (only used there)

Location:

branches/e4fix

Files:

• ARBDB/ad_prot.h (modified) (1 diff)
• ARBDB/adquery.cxx (modified) (1 diff)
• EDIT4/ED4_base.cxx (modified) (1 diff)
• EDIT4/ED4_main.cxx (modified) (1 diff)
• EDIT4/ed4_class.hxx (modified) (2 diffs)

branches/e4fix/ARBDB/ad_prot.h

@@ -232 +232 @@
 GBDATA *GB_searchOrCreate_int(GBDATA *gb_container, const char *fieldpath, long default_value);
 GBDATA *GB_searchOrCreate_float(GBDATA *gb_container, const char *fieldpath, double default_value);
-GBDATA *GB_search_last_son(GBDATA *gbd);
 long GB_number_of_marked_subentries(GBDATA *gbd);
 GBDATA *GB_first_marked(GBDATA *gbd, const char *keystring);

branches/e4fix/ARBDB/adquery.cxx

@@ -653 +653 @@
         }
         if (!skip_over--) return gb;
-    }
-    return NULL;
-}
-
-GBDATA *GB_search_last_son(GBDATA *gbd) {
-    GBCONTAINER    *gbc    = (GBCONTAINER *)gbd;
-    int             index;
-    int             end    = gbc->d.nheader;
-    GBDATA         *gb;
-    gb_header_list *header = GB_DATA_LIST_HEADER(gbc->d);
-
-    for (index = end-1; index>=0; index--) {
-        if (header[index].flags.changed >= GB_DELETED) continue;
-        if ((gb=GB_HEADER_LIST_GBD(header[index]))==NULL)
-        {
-            gb_unfold(gbc, 0, index);
-            header = GB_DATA_LIST_HEADER(gbc->d);
-            gb = GB_HEADER_LIST_GBD(header[index]);
-        }
-        return gb;
     }
     return NULL;

branches/e4fix/EDIT4/ED4_base.cxx

@@ -178 +178 @@
     if (gbtype&GB_CB_SON_CREATED) {
         // @@@ New son for database-member was created ... what may we do now?
-    }
-}
-
-int ED4_elements_in_species_container; // # of elements in species container
-void ED4_species_container_changed_cb(GBDATA *gb_species_data, int * /* cl */, GB_CB_TYPE gbtype)
-{
-    if (gbtype==GB_CB_CHANGED) {
-        int nsons = GB_number_of_subentries(gb_species_data);
-
-        if (nsons>ED4_elements_in_species_container) { // new species was created
-#if defined(DEBUG) && 1
-            printf("# of species in species-container changed from %i to %i\n", ED4_elements_in_species_container, nsons);
-            aw_popup_ok("Species container changed!");
-#endif
-            GBDATA *gb_lastSon = GB_search_last_son(gb_species_data);
-
-            if (gb_lastSon) {
-                GBDATA *gb_name = GB_search(gb_lastSon, "name", GB_FIND);
-
-                if (gb_name) {
-                    char *name = GB_read_as_string(gb_name);
-
-                    ED4_get_and_jump_to_species(name);
-#if defined(DEBUG) && 1
-                    printf("new species = '%s'\n", name);
-#endif
-                    free(name);
-                }
-            }
-        }
-        ED4_elements_in_species_container = nsons;
     }
 }

branches/e4fix/EDIT4/ED4_main.cxx

@@ -637 +637 @@
 
     // now bind DB depending callbacks
-
     ed4_bind_mainDB_awar_callbacks(ED4_ROOT->aw_root);
-    {
-        GB_transaction dummy(GLOBAL_gb_main);
-        GBDATA *species_container = GB_search(GLOBAL_gb_main, "species_data", GB_FIND);
-        GB_add_callback(species_container, (GB_CB_TYPE)GB_CB_CHANGED, (GB_CB)ED4_species_container_changed_cb, 0); // callback if species_data changes
-
-        ED4_elements_in_species_container = GB_number_of_subentries(species_container); // store # of species
-#if defined(DEBUG) && 0
-        printf("Species container contains %i species (at startup)\n", ED4_elements_in_species_container);
-#endif
-    }
 
     // Create Additional sequence (aminoacid) terminals to be used in Protein Viewer

branches/e4fix/EDIT4/ed4_class.hxx

@@ -2208 +2208 @@
 void ED4_finish_and_show_notFoundMessage();
 
-extern int  ED4_elements_in_species_container; // # of elements in species container
-void        ED4_undo_redo               (AW_window*, AW_CL undo_type);
+void ED4_undo_redo(AW_window*, AW_CL undo_type);
 
 ED4_species_name_terminal *ED4_find_species_name_terminal(const char *species_name);
@@ -2221 +2220 @@
 
 extern "C" {
-    void    ED4_species_container_changed_cb(GBDATA *gbd, int *cl, GB_CB_TYPE gbtype);
     void    ED4_sequence_changed_cb(GBDATA *gb_seq, int *cl, GB_CB_TYPE gbtype);
     void    ED4_alignment_length_changed(GBDATA *gb_alignment_len, int *dummy, GB_CB_TYPE gbtype);