Changeset 8338

Timestamp:

24/01/12 14:46:56 (4 months ago)

Author:

westram

Message:

• do group-size calculation via update flags (first request; recalc during refresh)
• when creating new group:
  • correctly calc group size and selection status for source group(s)
• fixed a buffer-overflow in group_species

Location:

branches/e4fix/EDIT4

Files:

• ED4_base.cxx (modified) (3 diffs)
• ED4_cursor.cxx (modified) (1 diff)
• ED4_manager.cxx (modified) (8 diffs)
• ED4_nds.cxx (modified) (1 diff)
• ED4_no_class.cxx (modified) (6 diffs)
• ED4_root.cxx (modified) (8 diffs)
• ED4_terminal.cxx (modified) (2 diffs)
• ed4_class.hxx (modified) (12 diffs)
• ed4_defs.hxx (modified) (1 diff)

branches/e4fix/EDIT4/ED4_base.cxx

@@ -294 +294 @@
     multi_species_manager->children->append_member(species_manager);
 
-
     species_name_terminal = new ED4_species_name_terminal(group_name, 0, 0, MAXSPECIESWIDTH - BRACKETWIDTH, TERMINALHEIGHT, species_manager);
     species_name_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));      // only some terminals
@@ -319 +318 @@
     multi_species_manager->children->append_member(group_spacer_terminal2);
 
+    multi_species_manager->update_requested_by_child();
+    
     ED4_counter ++;
 
@@ -634 +635 @@
 
 
-void ED4_device_manager::generate_id_for_groups() {
-    for (int i=0; i<children->members(); i++) {
-        ED4_base *member = children->member(i);
-        if (member->is_area_manager()) {
-            member->to_area_manager()->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->generate_id_for_groups();
-        }
-    }
-}
-
-void ED4_multi_species_manager::generate_id_for_groups() {
-    count_all_children_and_set_group_id();
-}
-
-
-int ED4_multi_species_manager::count_all_children_and_set_group_id() // counts all species of a multi_species_manager
-{
-    int   counter = 0;
-    int   i;
-    char *name;
-
-    for (i=0; i<children->members(); i++) {
-        ED4_base *member = children->member(i);
-        if (member->is_species_manager() && !member->flag.is_consensus) {
-            counter ++;
-        }
-        else if (member->is_group_manager()) {
-            counter += member->to_group_manager()->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->count_all_children_and_set_group_id();
-        }
-    }
-
-
+void ED4_multi_species_manager::update_group_id() {
     ED4_base *consensus_name_terminal = get_consensus_terminal();
     if (consensus_name_terminal) { // top managers dont show consensus
-        name = (char*)GB_calloc(strlen(consensus_name_terminal->id)+10, sizeof(*name));
-
-        for (i=0; consensus_name_terminal->id[i] != '(' && consensus_name_terminal->id[i] != '\0';   i++) {
-            name[i] = consensus_name_terminal->id[i];
-        }
-        if (consensus_name_terminal->id[i] != '\0') { // skip space
+        e4_assert(has_valid_counters());
+        
+        const char *cntid = consensus_name_terminal->id;
+        char       *name  = (char*)GB_calloc(strlen(cntid)+10, sizeof(*name));
+
+        int i;
+        for (i=0; cntid[i] != '(' && cntid[i] != '\0';   i++) {
+            name[i] = cntid[i];
+        }
+        if (cntid[i] != '\0') { // skip space
             i--;
         }
         name[i] = '\0';
-        sprintf(name, "%s (%d)", name, counter);
+        sprintf(name, "%s (%d)", name, species);
 
         freeset(consensus_name_terminal->id, name);
-    }
-    return counter;
+
+        consensus_name_terminal->set_refresh();
+        consensus_name_terminal->parent->refresh_requested_by_child();
+    }
 }
 

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -652 +652 @@
         delete string;
 
-        insert_into_manager->generate_id_for_groups();
+        insert_into_manager->invalidate_species_counters();
     }
     if (name_term) {

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -1208 +1208 @@
     e4_assert(update_info.refresh);
 
-    int i;
-
-    for (i=0; i<children->members(); i++) {
+    for (int i=0; i<children->members(); i++) {
         ED4_base *child = children->member(i);
 
@@ -1240 +1238 @@
 }
 
+void ED4_manager::update_requested_by_child() {
+    if (!update_info.update_requested) {
+        if (parent) parent->update_requested_by_child();
+        update_info.update_requested = 1;
+    }
+}
 void ED4_manager::delete_requested_by_child() {
     if (!update_info.delete_requested) {
@@ -1246 +1250 @@
     }
 }
-
 void ED4_terminal::delete_requested_children() {
     e4_assert(update_info.delete_requested);
@@ -1255 +1258 @@
     unlink_from_parent();
     delete this;
+}
+
+void ED4_manager::update_requested_children() {
+    e4_assert(update_info.update_requested);
+
+    for (int i=0; i<children->members(); i++) {
+        ED4_base *child = children->member(i);
+        if (child->update_info.update_requested) {
+            child->update_requested_children();
+        }
+    }
+
+    update_info.update_requested = 0;
+}
+
+void ED4_multi_species_manager::update_requested_children() {
+    e4_assert(update_info.update_requested);
+    ED4_manager::update_requested_children();
+    update_species_counters();
+    update_group_id();
+
+    ED4_base *group_base = get_parent(ED4_L_GROUP);
+    if (group_base) {
+        e4_assert(group_base->is_group_manager());
+        e4_assert(!group_base->is_root_group_manager());
+
+        ED4_group_manager *group_man    = parent->to_group_manager();
+        ED4_base          *bracket_base = group_man->get_defined_level(ED4_L_BRACKET);
+
+        if (bracket_base && bracket_base->is_bracket_terminal()) {
+            ED4_bracket_terminal *bracket_term = bracket_base->to_bracket_terminal();
+            bracket_term->set_refresh();
+            bracket_term->parent->refresh_requested_by_child();
+        }
+    }
 }
 
@@ -1277 +1315 @@
 }
 
+void ED4_multi_species_manager::delete_requested_children() {
+    e4_assert(update_info.delete_requested);
+    invalidate_species_counters();
+    ED4_manager::delete_requested_children();
+}
+
 void ED4_terminal::Delete() {
     if (!tflag.deleted) {
@@ -1412 +1456 @@
         selected_species = -1;
 
-        set_refresh();
-        parent->refresh_requested_by_child();
-
-        e4_assert(!parent->is_root_group_manager());
-        if (parent->is_group_manager()) {
-            ED4_group_manager *group_man = parent->to_group_manager();
-            ED4_base          *base      = group_man->get_defined_level(ED4_L_BRACKET);
-
-            if (base && base->is_bracket_terminal()) {
-                ED4_bracket_terminal *bracket_term = base->to_bracket_terminal();
-
-                bracket_term->set_refresh();
-                bracket_term->parent->refresh_requested_by_child();
-            }
-        }
-
         ED4_base *pms = get_parent(ED4_L_MULTI_SPECIES);
-        if (pms) {
-            pms->to_multi_species_manager()->invalidate_species_counters();
-        }
+        if (pms) pms->to_multi_species_manager()->invalidate_species_counters();
+        
+        update_requested_by_child();
     }
 }
@@ -1450 +1478 @@
         int species_diff  = no_of_species-species;
         int selected_diff = no_of_selected-selected_species;
-        int quickSet      = 1;
-
+
+        int quickSet = 1;
         if (species==-1 || selected_species==-1) {
             quickSet = 0;
         }
 
-        species = no_of_species;
+        species          = no_of_species;
         selected_species = no_of_selected;
 
@@ -1470 +1498 @@
             ED4_multi_species_manager *parent_multi_species_man = ms->to_multi_species_manager();
 
-            if (!quickSet) {
-                parent_multi_species_man->invalidate_species_counters();
-            }
+            if (!quickSet) parent_multi_species_man->invalidate_species_counters();
 
             if (parent_multi_species_man->has_valid_counters()) {

branches/e4fix/EDIT4/ED4_nds.cxx

@@ -55 +55 @@
     if (int(refresh)) {
         ED4_calc_terminal_extentions();
-        {
-            ARB_ERROR error = ED4_ROOT->main_manager->route_down_hierarchy(update_terminal_extension);
-            aw_message_if(error);
-        }
+        ED4_ROOT->main_manager->route_down_hierarchy(update_terminal_extension).expect_no_error();
         ED4_gc_is_modified_cb(current_aww(), 0, 0);
     }

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -841 +841 @@
 }
 
-void ED4_timer_refresh()
-{
+void ED4_timer_refresh() {
     GB_begin_transaction(GLOBAL_gb_main);                  // for callbacks from database
     GB_tell_server_dont_wait(GLOBAL_gb_main);
     GB_commit_transaction(GLOBAL_gb_main);
+
+    // @@@ need to ED4_ROOT->refresh_all_windows(0) here
 }
 
@@ -1060 +1061 @@
 #define SIGNIFICANT_FIELD_CHARS 30 // length used to compare field contents (in createGroupFromSelected)
 
-static void createGroupFromSelected(GB_CSTR group_name, GB_CSTR field_name, GB_CSTR field_content)
+static void createGroupFromSelected(GB_CSTR group_name, GB_CSTR field_name, GB_CSTR field_content) {
     // creates a new group named group_name
     // if field_name==0 -> all selected species & subgroups are moved to this new group
     // if field_name!=0 -> all selected species containing field_content in field field_name are moved to this new group
-{
-    ED4_group_manager *group_manager = NULL;
-    ED4_ROOT->main_manager->create_group(&group_manager, group_name);
+
+    ED4_group_manager *new_group_manager = NULL;
+    ED4_ROOT->main_manager->create_group(&new_group_manager, group_name);
+
     ED4_manager *top_area = ED4_ROOT->main_manager->search_spec_child_rek(ED4_L_AREA)->to_manager();
-    ED4_multi_species_manager *multi_species_manager = top_area->search_spec_child_rek(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
-
-    group_manager->extension.position[Y_POS] = 2;
-    ED4_base::touch_world_cache();
-    multi_species_manager->children->append_member(group_manager);
-    group_manager->parent = (ED4_manager *) multi_species_manager;
-
-    multi_species_manager = group_manager->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
+
+    {
+        ED4_multi_species_manager *multi_species_manager = top_area->search_spec_child_rek(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
+
+        new_group_manager->extension.position[Y_POS] = 2;
+        ED4_base::touch_world_cache();
+        multi_species_manager->children->append_member(new_group_manager);
+        new_group_manager->parent = (ED4_manager *) multi_species_manager;
+    }
+    
+    ED4_multi_species_manager *new_multi_species_manager = new_group_manager->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
 
     ED4_list_elem *list_elem = ED4_ROOT->selected_objects.first();
@@ -1111 +1116 @@
 
         if (move_object) {
-            object->parent->children->remove_member(object);
-
             ED4_base *base = object->get_parent(ED4_L_MULTI_SPECIES);
             if (base && base->is_multi_species_manager()) {
@@ -1118 +1121 @@
                 old_multi->invalidate_species_counters();
             }
-            multi_species_manager->children->append_member(object);
-
-            object->parent = (ED4_manager *)multi_species_manager;
+            
+            object->parent->children->remove_member(object);
+            new_multi_species_manager->children->append_member(object);
+
+            object->parent = (ED4_manager *)new_multi_species_manager;
             object->set_width();
         }
@@ -1127 +1132 @@
     }
 
-    group_manager->create_consensus(group_manager, NULL);
-    group_manager->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->count_all_children_and_set_group_id();
-
+    new_group_manager->create_consensus(new_group_manager, NULL);
+    new_multi_species_manager->invalidate_species_counters();
+    
     {
-        ED4_bracket_terminal *bracket = group_manager->get_defined_level(ED4_L_BRACKET)->to_bracket_terminal();
+        ED4_bracket_terminal *bracket = new_group_manager->get_defined_level(ED4_L_BRACKET)->to_bracket_terminal();
         if (bracket) bracket->fold();
     }
 
-    multi_species_manager->resize_requested_by_child();
-
-    current_ed4w()->update_scrolled_rectangle();
-    current_device()->reset();
-    ED4_ROOT->refresh_all_windows(1);
+    new_multi_species_manager->resize_requested_by_child();
 }
 
@@ -1206 +1207 @@
                                 int newlen = doneLen + field_content_len + 1;
                                 char *newDone = (char*)malloc(newlen+1);
-                                GBS_global_string_to_buffer(newDone, newlen, "%s%s;", doneContents, field_content);
+                                GBS_global_string_to_buffer(newDone, newlen+1, "%s%s;", doneContents, field_content);
                                 freeset(doneContents, newDone);
                                 doneLen = newlen;

branches/e4fix/EDIT4/ED4_root.cxx

@@ -87 +87 @@
     if (main_manager->update_info.delete_requested) {
         main_manager->delete_requested_children();
-        get_device_manager()->generate_id_for_groups(); // update group-counters
+        redraw = 1;
+    }
+
+    if (main_manager->update_info.update_requested) {
+        main_manager->update_requested_children();
         redraw = 1;
     }
@@ -525 +529 @@
 }
 
+static ARB_ERROR force_group_update(ED4_base *base) {
+    if (base->is_multi_species_manager()) {
+        base->to_multi_species_manager()->update_requested_by_child();
+    }
+    return NULL;
+}
+
 ED4_returncode ED4_root::create_hierarchy(char *area_string_middle, char *area_string_top) // creates internal hierarchy of editor
 {
@@ -530 +541 @@
     ED4_index y = 0, help = 0;
     ED4_base *x_link, *y_link, *width_link, *height_link;
-    ED4_window *new_window;
     long total_no_of_species, total_no_of_groups, group_count, species_count;
 
@@ -629 +639 @@
 
                 y += TOP_MID_SPACER_HEIGHT; // add top-mid_spacer_terminal height
-
-                top_multi_species_manager->generate_id_for_groups();
             }
 
@@ -671 +679 @@
                 tree_terminal->extension.size[HEIGHT] = y - help;
 
-                mid_multi_species_manager->generate_id_for_groups();
-                y += 10;                                                // add top-mid_spacer_terminal height
+                y += 10; // add top-mid_spacer_terminal height
 
                 mid_bot_line_terminal = new ED4_line_terminal("Mid_Bot_Line_Terminal", 0, y, 0, 3, device_manager);    // width will be set below
@@ -708 +715 @@
 
 
+    main_manager->route_down_hierarchy(force_group_update).expect_no_error();
+
     // build consensi
     {
@@ -731 +740 @@
     height_link = y_link;
 
-    new_window = first_window;
-
-    while (new_window) {
-        new_window->set_scrolled_rectangle(x_link, y_link, width_link, height_link);
-        new_window->aww->show();
-        new_window->update_scrolled_rectangle();
-        ED4_refresh_window(new_window->aww);
-        new_window = new_window->next;
-    }
-
-    aw_root->add_timed_callback(2000, ED4_timer, (AW_CL)0, (AW_CL)0);
+    ED4_window *win = first_window;
+    while (win) {
+        win->set_scrolled_rectangle(x_link, y_link, width_link, height_link);
+        win->aww->show();
+        win->update_scrolled_rectangle();
+        win = win->next;
+    }
+
+    aw_root->add_timed_callback(200, ED4_timer, (AW_CL)0, (AW_CL)0);
 
     ED4_finish_and_show_notFoundMessage();
@@ -1329 +1336 @@
 }
 
-ED4_returncode ED4_root::generate_window(AW_device **device,    ED4_window **new_window)
+ED4_returncode ED4_root::generate_window(AW_device **device, ED4_window **new_window)
 {
     AW_window_menu_modes *awmm;

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -632 +632 @@
 
                                     if (member->is_area_manager()) {
-                                        member->to_area_manager()->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->generate_id_for_groups();
+                                        member->to_area_manager()->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->update_requested_by_child();
                                     }
                                 }
@@ -673 +673 @@
     return ED4_R_OK;
 }
+
+void ED4_terminal::update_requested_children() {}
 
 bool ED4_terminal::calc_bounding_box() {

branches/e4fix/EDIT4/ed4_class.hxx

@@ -1095 +1095 @@
 
     // functions which refer to the object as a child, i.e. travelling down the hierarchy
-    virtual ED4_returncode  set_refresh (int clear=1)=0;
+    virtual ED4_returncode  set_refresh(int clear=1)=0;
     virtual ED4_returncode  resize_requested_by_child()=0;
-    virtual ED4_returncode  resize_requested_by_parent()=0;
+    virtual ED4_returncode  resize_requested_by_parent()=0; // @@@ name is wrong! should be resize_requested_children!
 
     virtual void delete_requested_children() = 0;
     virtual void Delete()                    = 0;
+    
+    inline void set_update();
+    virtual void update_requested_children() = 0;
 
     virtual ED4_returncode  calc_size_requested_by_parent()=0;
@@ -1106 +1109 @@
     virtual ED4_returncode  event_sent_by_parent(AW_event *event, AW_window *aww);
     virtual ED4_returncode  move_requested_by_child(ED4_move_info *moveinfo)=0;
+
 
     virtual ED4_returncode  handle_move(ED4_move_info *moveinfo) = 0;
@@ -1204 +1208 @@
         return const_cast<Class*>(const_cast<const ED4_base*>(this)->toName()); \
     }
-    
+
 #define E4B_DECL_CASTOP(name) E4B_DECL_CASTOP_helper(concat(ED4_,name), concat(to_,name), concat(is_,name))
 #define E4B_IMPL_CASTOP(name) E4B_IMPL_CASTOP_helper(concat(ED4_,name), concat(to_,name), concat(is_,name))
@@ -1259 +1263 @@
     virtual ED4_returncode  resize_requested_by_parent();
 
+    virtual void update_requested_children();
+
     virtual void delete_requested_children();
     virtual void Delete();
@@ -1281 +1287 @@
     virtual ED4_returncode  refresh_requested_by_child();
     void delete_requested_by_child();
+    void update_requested_by_child();
     
     ED4_base *get_defined_level(ED4_level lev) const;
@@ -1327 +1334 @@
     virtual ~ED4_manager();
 };
-
 
 class ED4_terminal : public ED4_base { // derived from a Noncopyable
@@ -1362 +1368 @@
     virtual ED4_returncode resize_requested_by_parent();
 
+    virtual void update_requested_children();
     virtual void delete_requested_children();
     virtual void Delete();
@@ -1603 +1610 @@
     ED4_device_manager  (const char *id, AW_pos x, AW_pos y, AW_pos width, AW_pos height, ED4_manager *parent);
 
-    void generate_id_for_groups();
     DECLARE_DUMP_FOR_LEAFCLASS(ED4_manager);
 };
@@ -1634 +1640 @@
     DECLARE_DUMP_FOR_LEAFCLASS(ED4_manager);
 
+    virtual void update_requested_children();
+    virtual void delete_requested_children();
+
     int           count_visible_children(); // is called by a multi_species_manager
-    int           count_all_children_and_set_group_id(); // counts all children of a parent
     ED4_terminal *get_consensus_terminal(); // returns the consensus-terminal or 0
     ED4_species_manager *get_consensus_manager() const; // returns the consensus-manager or 0
@@ -1643 +1651 @@
     int         get_no_of_species();
 
-    void generate_id_for_groups();
+    void update_group_id();
 
     void        invalidate_species_counters();
@@ -2114 +2122 @@
 // ----------------------------------------------
 //      inlines which need complete classdefs
+
+inline void ED4_base::set_update() {
+    if (!update_info.update_requested) {
+        update_info.update_requested = 1;
+        if (parent) parent->update_requested_by_child();
+    }
+}
 
 inline bool ED4_terminal::setCursorTo(ED4_cursor *cursor, int seq_pos, bool unfoldGroups, ED4_CursorJumpType jump_type) {
@@ -2259 +2274 @@
 #endif
 
-

branches/e4fix/EDIT4/ed4_defs.hxx

@@ -324 +324 @@
     unsigned int refresh_vertical_scrolling : 1;
     unsigned int delete_requested : 1;
+    unsigned int update_requested : 1;
 
     void set_clear_at_refresh(int value) {