Changeset 8341

Timestamp:

26/01/12 15:58:39 (4 months ago)

Author:

westram

Message:

• set_refresh
  • renamed to request_refresh
  • calls parent->refresh_requested_by_child
  • removed unused result
  • removed params matching default
• removed duplicated refresh-request in ED4_consensus_definition_changed

Location:

branches/e4fix/EDIT4

Files:

• ED4_base.cxx (modified) (3 diffs)
• ED4_block.cxx (modified) (6 diffs)
• ED4_cursor.cxx (modified) (3 diffs)
• ED4_manager.cxx (modified) (5 diffs)
• ED4_mini_classes.cxx (modified) (1 diff)
• ED4_no_class.cxx (modified) (3 diffs)
• ED4_root.cxx (modified) (6 diffs)
• ED4_terminal.cxx (modified) (5 diffs)
• ed4_class.hxx (modified) (3 diffs)

branches/e4fix/EDIT4/ED4_base.cxx

@@ -28 +28 @@
 }
 
-void ED4_manager::changed_by_database() {
-    set_refresh(1);
-    if (parent) parent->refresh_requested_by_child();
-}
+void ED4_manager::changed_by_database() { request_refresh(); }
 
 void ED4_terminal::changed_by_database()
@@ -73 +70 @@
                 if (dynamic_prop & ED4_P_CONSENSUS_RELEVANT) {
                     ED4_multi_species_manager *multiman = get_parent(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
-
                     multiman->update_bases_and_rebuild_consensi(dup_data, data_len, spman, ED4_U_UP);
-
-                    set_refresh(1);
-                    parent->refresh_requested_by_child();
+                    request_refresh();
                 }
 
@@ -644 +638 @@
         freeset(consensus_name_terminal->id, name);
 
-        consensus_name_terminal->set_refresh();
-        consensus_name_terminal->parent->refresh_requested_by_child();
+        consensus_name_terminal->request_refresh();
     }
 }

branches/e4fix/EDIT4/ED4_block.cxx

@@ -46 +46 @@
 
 static void col_block_refresh_on_seq_term(ED4_sequence_terminal *seq_term) {
-    seq_term->set_refresh(1);
-    seq_term->parent->refresh_requested_by_child();
+    seq_term->request_refresh();
 
     // @@@ code below is more than weird. why do sth with column-stat here ? why write probe match awars here ? 
@@ -56 +55 @@
 
         if (len>=4) {
-            colStatTerm->set_refresh(1);
-            colStatTerm->parent->refresh_requested_by_child();
+            colStatTerm->request_refresh();
 
             // automatically set probe-match awars to appropriate values:
@@ -69 +67 @@
 }
 
-static void refresh_selected(bool refresh_name_terminals) {
+static void refresh_selected(bool refresh_name_terminals) { // @@@ rename
     ED4_list_elem *listElem = ED4_ROOT->selected_objects.first();
     while (listElem) {
@@ -76 +74 @@
         ED4_sequence_terminal     *seq_term  = name_term->corresponding_sequence_terminal();
 
-        if (refresh_name_terminals) {
-            name_term->set_refresh(1);
-            name_term->parent->refresh_requested_by_child();
-        }
+        if (refresh_name_terminals) name_term->request_refresh();
         if (seq_term) col_block_refresh_on_seq_term(seq_term);
 
@@ -189 +184 @@
             if (!error) {
                 error = GB_write_string(gbd, seq);
-                if (!error) {
-                    term->set_refresh();
-                    term->parent->refresh_requested_by_child();
-                }
+                if (!error) term->request_refresh();
             }
             free(new_seq);
@@ -247 +239 @@
             if (!error) {
                 error = GB_write_as_string(gbd, seq);
-                if (!error) {
-                    term->set_refresh();
-                    term->parent->refresh_requested_by_child();
-                }
+                if (!error) term->request_refresh();
             }
         }

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -304 +304 @@
     // refresh own terminal + terminal above + terminal below
 
-    target_terminal->set_refresh();
-    target_terminal->parent->refresh_requested_by_child();
+    target_terminal->request_refresh();
 
     {
@@ -319 +318 @@
             }
             else if ((term->is_sequence_terminal()) && !term->is_in_folded_group()) {
-                term->set_refresh();
-                term->parent->refresh_requested_by_child();
+                term->request_refresh();
                 done = 1;
             }
@@ -1391 +1389 @@
         }
 
-        owner_of_cursor->set_refresh(); // we have to refresh old owner of cursor
-        owner_of_cursor->parent->refresh_requested_by_child();
+        owner_of_cursor->request_refresh(); // we have to refresh old owner of cursor
         owner_of_cursor = NULL;
         ED4_ROOT->refresh_window(0);

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -1286 +1286 @@
         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();
-        }
+        if (bracket_base) bracket_base->request_refresh();
     }
 }
@@ -1334 +1330 @@
 }
 
-ED4_returncode ED4_manager::set_refresh(int clear) {
-    // sets refresh flag of current object and his children
-    ED4_index   current_index;
-    ED4_base    *current_child;
-
+void ED4_manager::request_refresh(int clear) {
+    // sets refresh flag of current object and its children
     update_info.set_refresh(1);
     update_info.set_clear_at_refresh(clear);
 
-    current_index = 0;
+    if (parent) parent->refresh_requested_by_child();
+
+    ED4_index  current_index = 0;
+    ED4_base  *current_child;
     while ((current_child = children->member(current_index++)) != NULL) {
-        current_child->set_refresh(0);
-    }
-
-    return (ED4_R_OK);
+        current_child->request_refresh(0); // do not trigger clear for childs
+    }
 }
 
@@ -1487 +1481 @@
 
         ED4_base *gm = get_parent(ED4_L_GROUP);
-        if (gm) {
-            ED4_bracket_terminal *bracket = gm->to_manager()->search_spec_child_rek(ED4_L_BRACKET)->to_bracket_terminal();
-            bracket->set_refresh();
-            bracket->parent->refresh_requested_by_child();
-        }
+        if (gm) gm->to_manager()->search_spec_child_rek(ED4_L_BRACKET)->request_refresh();
 
         ED4_base *ms = get_parent(ED4_L_MULTI_SPECIES);
@@ -2111 +2101 @@
 }
 
-int ED4_root_group_manager::update_remap()
-{
+int ED4_root_group_manager::update_remap() {
     int remapped = 0;
 
@@ -2118 +2107 @@
         my_remap.compile(this);
         if (my_remap.was_changed()) {
-            ED4_ROOT->main_manager->set_refresh();
-            ED4_ROOT->main_manager->refresh_requested_by_child();
+            ED4_ROOT->main_manager->request_refresh();
             remapped = 1;
         }

branches/e4fix/EDIT4/ED4_mini_classes.cxx

@@ -424 +424 @@
 
 void ED4_consensus_definition_changed(AW_root*, AW_CL, AW_CL) {
-    ED4_terminal *terminal = ED4_ROOT->root_group_man->get_first_terminal();
-
-    e4_assert(terminal);
-    while (terminal) {
-        if (terminal->parent->parent->flag.is_consensus) {
-            terminal->set_refresh();
-            terminal->parent->refresh_requested_by_child();
-        }
-        terminal = terminal->get_next_terminal();
-    }
-
     delete BK; BK = 0; // invalidate
-
     ED4_ROOT->request_refresh_for_consensus_terminals();
 }

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -211 +211 @@
 
                 if (new_work_info.refresh_needed) {
-                    object->set_refresh();
-                    object->parent->refresh_requested_by_child();
-
+                    object->request_refresh();
                     if (object->is_sequence_terminal()) {
                         ED4_sequence_terminal *seq_term = object->to_sequence_terminal();
@@ -343 +341 @@
                     GB_transaction dummy(GLOBAL_gb_main);
 
-                    terminal->set_refresh();
-                    terminal->parent->refresh_requested_by_child();
+                    terminal->request_refresh();
                     if (terminal->is_sequence_terminal()) {
                         ED4_sequence_terminal *seq_term = terminal->to_sequence_terminal();
@@ -1380 +1377 @@
 
         ED4_base *sequence_data_terminal = object->search_spec_child_rek(ED4_L_SEQUENCE_STRING);
-
-        sequence_data_terminal->set_refresh();
-        sequence_data_terminal->parent->refresh_requested_by_child();
+        sequence_data_terminal->request_refresh();
     }
     return NULL;

branches/e4fix/EDIT4/ED4_root.cxx

@@ -56 +56 @@
     ED4_level lev = ED4_level(cl_level);
     if (lev == ED4_L_NO_LEVEL || (base->spec.level&lev) != 0) {
-        if (base->is_terminal()) {
-            ED4_terminal *term = base->to_terminal();
-            term->set_refresh();
-            term->parent->refresh_requested_by_child();
-        }
+        if (base->is_terminal()) base->request_refresh();
     }
     return NULL;
@@ -345 +341 @@
 #endif
 
-            name_term->set_refresh(1);
-            name_term->parent->refresh_requested_by_child();
-
+            name_term->request_refresh();
             ED4_sequence_terminal *seq_term = object->to_species_name_terminal()->corresponding_sequence_terminal();
-            if (seq_term) {
-                seq_term->set_refresh(1);
-                seq_term->parent->refresh_requested_by_child();
-            }
+            if (seq_term) seq_term->request_refresh();
 
             // ProtView: Refresh corresponding orf terminals
@@ -363 +354 @@
         }
         else {
-            object->set_refresh();
-            object->parent->refresh_requested_by_child();
+            object->request_refresh();
         }
     }
@@ -453 +443 @@
 #endif
 
-            name_term->set_refresh();
-            name_term->parent->refresh_requested_by_child();
-
+            name_term->request_refresh();
             ED4_sequence_terminal *seq_term = object->to_species_name_terminal()->corresponding_sequence_terminal();
-            if (seq_term) {
-                seq_term->set_refresh();
-                seq_term->parent->refresh_requested_by_child();
-            }
+            if (seq_term) seq_term->request_refresh();
 
             // ProtView: Refresh corresponding orf terminals
@@ -472 +457 @@
         else {
             e4_assert(0); // test ob ueberhaupt was anderes als species_name_terminals verwendet wird
-            object->set_refresh();
-            object->parent->refresh_requested_by_child();
+            object->request_refresh();
         }
 
@@ -1116 +1100 @@
         GB_commit_transaction(GLOBAL_gb_main);
         ED4_cursor *cursor = &current_cursor();
-        if (cursor->owner_of_cursor) {
-            ED4_terminal *terminal = cursor->owner_of_cursor->to_terminal();
-
-            terminal->set_refresh();
-            terminal->parent->refresh_requested_by_child();
-        }
+        if (cursor->owner_of_cursor) cursor->owner_of_cursor->request_refresh();
     }
 }

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -253 +253 @@
         }
 
-        set_refresh();
-        parent->refresh_requested_by_child();
+        request_refresh();
     }
 
@@ -269 +268 @@
         tflag.deleted = 1; // @@@ why ?
         clr_property(ED4_P_CURSOR_ALLOWED);
-
-        set_refresh();
-        parent->refresh_requested_by_child();
+        request_refresh();
     }
     return ED4_R_OK;
@@ -454 +451 @@
                                 if (gbd) {
                                     GB_write_flag(gbd, !GB_read_flag(gbd));
-                                    set_refresh();
-                                    parent->refresh_requested_by_child();
+                                    request_refresh();
                                     // ProtView: Refreshing orf terminals
                                     if (ED4_ROOT->alignment_type ==  GB_AT_DNA) {
@@ -692 +688 @@
         }
 
-        set_refresh(1); // clear on refresh (was done anyway due to default parameter)
-        parent->refresh_requested_by_child();
+        request_refresh();
     }
 
@@ -710 +705 @@
 
 
-ED4_returncode ED4_terminal::set_refresh(int clear)                 // sets refresh flag of current object
-{
+void ED4_terminal::request_refresh(int clear) {
     update_info.set_refresh(1);
     update_info.set_clear_at_refresh(clear);
-    return (ED4_R_OK);
+    if (parent) parent->refresh_requested_by_child();
 }
 

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 void request_refresh(int clear=1)=0;
     virtual ED4_returncode  resize_requested_by_child()=0;
     virtual ED4_returncode  resize_requested_by_parent()=0; // @@@ name is wrong! should be resize_requested_children!
@@ -1258 +1258 @@
 
     // top-down functions, means travelling down the hierarchy
-    virtual ED4_returncode  event_sent_by_parent(AW_event *event, AW_window *aww);
-    virtual ED4_returncode  set_refresh(int clear=1);
-    ED4_returncode          clear_refresh();
-    virtual ED4_returncode  resize_requested_by_parent();
+    virtual ED4_returncode event_sent_by_parent(AW_event *event, AW_window *aww);
+    virtual void request_refresh(int clear=1);
+    ED4_returncode clear_refresh();
+    virtual ED4_returncode resize_requested_by_parent();
 
     virtual void update_requested_children();
@@ -1364 +1364 @@
 
     // functions which concern the object as a child
-    virtual ED4_returncode set_refresh(int clear=1);
+    virtual void request_refresh(int clear=1);
     virtual ED4_returncode resize_requested_by_child();
     virtual ED4_returncode resize_requested_by_parent();