Changeset 8340 for branches

Timestamp:

25/01/12 19:14:54 (4 months ago)

Author:

westram

Message:

• changed refresh behavior
  • refresh_all_windows
    • call via timer (currently 5 times/second). Some things get a bit slow by this patch, fix later
    • replaced by refresh-requests where needed (other calls removed)
  • lasting refresh problems in
    • protein viewer (code too bad to fix anything there now)

Location:

branches/e4fix/EDIT4

Files:

• ED4_ProteinViewer.cxx (modified) (1 diff)
• ED4_base.cxx (modified) (2 diffs)
• ED4_cursor.cxx (modified) (3 diffs)
• ED4_manager.cxx (modified) (4 diffs)
• ED4_mini_classes.cxx (modified) (2 diffs)
• ED4_no_class.cxx (modified) (8 diffs)
• ED4_root.cxx (modified) (4 diffs)
• ED4_search.cxx (modified) (1 diff)
• ED4_terminal.cxx (modified) (10 diffs)
• ED4_visualizeSAI.cxx (modified) (5 diffs)
• ed4_class.hxx (modified) (4 diffs)

branches/e4fix/EDIT4/ED4_ProteinViewer.cxx

@@ -402 +402 @@
     }
     // Refresh all windows
-    ED4_ROOT->refresh_all_windows(0);
+    // ED4_ROOT->refresh_all_windows(0);
 }
 

branches/e4fix/EDIT4/ED4_base.cxx

@@ -30 +30 @@
 void ED4_manager::changed_by_database() {
     set_refresh(1);
-    if (parent) {
-        parent->refresh_requested_by_child();
-    }
-    else {
-#if defined(DEBUG)
-        printf("ED4_manager::changed_by_database: I have no parent!\n");
-#endif // DEBUG
-    }
-
-    ED4_ROOT->refresh_all_windows(0);
+    if (parent) parent->refresh_requested_by_child();
 }
 
@@ -148 +139 @@
 
         if (parent) parent->resize_requested_by_child();
-        ED4_ROOT->refresh_all_windows(0);
-
-        parent = 0;
-        //      delete this; // @@@ crashes when removing callback deleted_from_database()
+        // parent = 0;
+        // delete this; // @@@ crashes when removing callback deleted_from_database()
     }
     else {

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -670 +670 @@
     if (name && name[0]) {
         ED4_get_and_jump_to_species(name);
-        ED4_ROOT->refresh_all_windows(0);
     }
     else {
@@ -679 +678 @@
 void ED4_get_and_jump_to_current_from_menu(AW_window *aw, AW_CL cl, AW_CL) {
     ED4_get_and_jump_to_current(aw, cl);
-    ED4_ROOT->refresh_all_windows(0);
 }
 
@@ -775 +773 @@
 
 #undef BUFFERSIZE
-
-    ED4_ROOT->refresh_all_windows(0);
 }
 

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -13 +13 @@
 #include "ed4_protein_2nd_structure.hxx"
 
-// #define TEST_REFRESH_FLAG
-
+#if defined(DEBUG)
+#define TEST_REFRESH_FLAG
+#endif
 
 // -----------------------------------------------------------------
@@ -259 +260 @@
             GB_ERROR err = ED4_pfold_set_SAI(&ED4_ROOT->protstruct, GLOBAL_gb_main, ED4_ROOT->alignment_name, &ED4_ROOT->protstruct_len);
             if (err) { aw_message(err); result = ED4_R_WARNING; }
-            ED4_ROOT->refresh_all_windows(0); // @@@ crazy slowdown ? 
-            ED4_expose_all_windows();
+            // ED4_ROOT->refresh_all_windows(0); // @@@ crazy slowdown ? 
+            // ED4_expose_all_windows();
         }
     }
@@ -744 +745 @@
         if (child->update_info.refresh==1 && update_info.refresh==0) {
             printf("Forgotten refresh-flag in '%s' (son of '%s')\n", child->id, id);
+            fflush(stdout);
             return 0;
         }
@@ -931 +933 @@
     e4_assert(refresh_flag_ok());
 #endif
-#if defined(DEBUG) && 0
-    printf("Show main_manager\n");
-#endif
 
     AW_device *device = current_device();

branches/e4fix/EDIT4/ED4_mini_classes.cxx

@@ -437 +437 @@
     delete BK; BK = 0; // invalidate
 
-    ED4_ROOT->refresh_all_windows(1);
+    ED4_ROOT->request_refresh_for_consensus_terminals();
 }
 
@@ -463 +463 @@
     int show = root->awar(ED4_AWAR_CONSENSUS_SHOW)->read_int();
     ED4_ROOT->root_group_man->route_down_hierarchy(toggle_consensus_display, show).expect_no_error();
-    ED4_ROOT->refresh_all_windows(1);
 }
 

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -328 +328 @@
                     error = edit_string->edit(work_info);
 
-                    ED4_ROOT->main_manager->Show(1, 0);         // @@@ temporary fix for worst-refresh problems
+                    ED4_ROOT->main_manager->Show(1, 0); // temporary fix for worst-refresh problems (@@@ fixme)
                     // ED4_ROOT->main_manager->Show(); // original version
 
@@ -349 +349 @@
                         seq_term->results().searchAgain();
                     }
-                    ED4_ROOT->refresh_all_windows(0);
                 }
 
@@ -842 +841 @@
 
 void ED4_timer_refresh() {
-    GB_begin_transaction(GLOBAL_gb_main);                  // for callbacks from database
+    // get all changes from server
+    GB_begin_transaction(GLOBAL_gb_main);
     GB_tell_server_dont_wait(GLOBAL_gb_main);
     GB_commit_transaction(GLOBAL_gb_main);
 
-    // @@@ need to ED4_ROOT->refresh_all_windows(0) here
-}
-
-void ED4_timer(AW_root *, AW_CL cd1, AW_CL cd2)
-{
+    ED4_ROOT->refresh_all_windows(0); // do delayed refresh
+}
+
+void ED4_timer(AW_root *, AW_CL cd1, AW_CL cd2) {
     ED4_timer_refresh();
     ED4_ROOT->aw_root->add_timed_callback(200, ED4_timer, cd1, cd2);
@@ -929 +928 @@
 }
 
-void ED4_set_col_stat_threshold(AW_window * /* aww */, AW_CL cl_do_refresh, AW_CL) {
+void ED4_set_col_stat_threshold(AW_window *, AW_CL, AW_CL) {
     double default_threshold = 90.0;
     if (ED4_columnStat_terminal::threshold_is_set()) {
@@ -946 +945 @@
         else {
             ED4_columnStat_terminal::set_threshold(input_threshold);
-            if (int(cl_do_refresh)) {
-                ED4_ROOT->refresh_all_windows(1);
-            }
+            ED4_ROOT->request_refresh_for_specific_terminals(ED4_L_COL_STAT);
         }
         free(input);
@@ -1027 +1024 @@
         new_seq_man->resize_requested_by_child();
     }
-    ED4_ROOT->refresh_all_windows(0);
 }
 
@@ -1340 +1336 @@
 
     ED4_ROOT->create_hierarchy(config_data_middle, config_data_top);
-    ED4_ROOT->refresh_all_windows(1);
 
     free(config_data_middle);
@@ -2201 +2196 @@
             }
 
-            if (error) {
-                GB_abort_transaction(GLOBAL_gb_main);
-            }
-            else {
-                GB_pop_transaction(GLOBAL_gb_main);
-
-                ED4_get_and_jump_to_species(new_species_name);
-                ED4_ROOT->refresh_all_windows(1);
-            }
+            error = GB_end_transaction(GLOBAL_gb_main, error);
+            if (!error) ED4_get_and_jump_to_species(new_species_name);
         }
 

branches/e4fix/EDIT4/ED4_root.cxx

@@ -53 +53 @@
 }
 
-ED4_returncode ED4_root::refresh_window_simple(int redraw)
-{
+static ARB_ERROR request_terminal_refresh(ED4_base *base, AW_CL cl_level) {
+    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();
+        }
+    }
+    return NULL;
+}
+
+void ED4_root::request_refresh_for_all_terminals() {
+    main_manager->route_down_hierarchy(request_terminal_refresh, ED4_L_NO_LEVEL).expect_no_error();
+}
+
+void ED4_root::request_refresh_for_specific_terminals(ED4_level lev) {
+    main_manager->route_down_hierarchy(request_terminal_refresh, lev).expect_no_error();
+}
+
+
+static ARB_ERROR request_sequence_refresh(ED4_base *base, AW_CL cl_consensi) {
+    ARB_ERROR error;
+    if (base->spec.level & ED4_L_SPECIES) {
+        bool consensi = bool(cl_consensi);
+        if (base->flag.is_consensus == consensi) {
+            error = base->to_manager()->route_down_hierarchy(request_terminal_refresh, ED4_L_SEQUENCE_STRING);
+        }
+    }
+    return error;
+}
+
+// if you want to refresh consensi AND sequences you may use request_refresh_for_specific_terminals(ED4_L_SEQUENCE_STRING)
+void ED4_root::request_refresh_for_consensus_terminals() {
+    main_manager->route_down_hierarchy(request_sequence_refresh, true).expect_no_error();
+}
+void ED4_root::request_refresh_for_sequence_terminals() {
+    main_manager->route_down_hierarchy(request_sequence_refresh, false).expect_no_error();
+}
+
+ED4_returncode ED4_root::refresh_window_simple(bool redraw) {
     e4_assert(!main_manager->update_info.delete_requested);
+    e4_assert(!main_manager->update_info.update_requested);
     e4_assert(!main_manager->update_info.resize);
 
@@ -67 +107 @@
 }
 
-ED4_returncode ED4_root::refresh_window(int redraw) // this function should only be used for window specific updates (i.e. cursor placement)
-{
+void ED4_root::handle_update_requests(bool& redraw) {
     if (main_manager->update_info.delete_requested) {
         main_manager->delete_requested_children();
-        redraw = 1;
+        redraw = true;
+    }
+
+    if (main_manager->update_info.update_requested) {
+        main_manager->update_requested_children();
+        redraw = true;
     }
 
     while (main_manager->update_info.resize) {
         main_manager->resize_requested_by_parent();
-        redraw = 1;
-    }
-
+        redraw = true;
+    }
+}
+
+ED4_returncode ED4_root::refresh_window(bool redraw) {
+    // this function should only be used for window specific updates (i.e. cursor placement)
+    handle_update_requests(redraw); // @@@ problematic (causes refresh w/o win-context, clears flags w/o handling all windows)
     return refresh_window_simple(redraw);
 }
 
-ED4_returncode ED4_root::refresh_all_windows(int redraw) {
+ED4_returncode ED4_root::refresh_all_windows(bool redraw) {
+    GB_transaction dummy(GLOBAL_gb_main);
     last_window_reached = 0;
 
-    if (main_manager->update_info.delete_requested) {
-        main_manager->delete_requested_children();
-        redraw = 1;
-    }
-
-    if (main_manager->update_info.update_requested) {
-        main_manager->update_requested_children();
-        redraw = 1;
-    }
-
-    while (main_manager->update_info.resize) {
-        main_manager->resize_requested_by_parent();
-        redraw = 1;
-    }
-
+    handle_update_requests(redraw);
+    
     ED4_window *window = first_window;
-    GB_transaction dummy(GLOBAL_gb_main);
     while (window) {
         if (!window->next) last_window_reached = 1;
@@ -1033 +1068 @@
 #endif
 
-static void col_stat_activated(AW_window *)
-{
-    ED4_ROOT->column_stat_initialized = 1;
-    ED4_ROOT->column_stat_activated = 1;
-    ED4_ROOT->refresh_all_windows(1);
-}
-
-void ED4_activate_col_stat(AW_window *aww, AW_CL, AW_CL) {
+inline void set_col_stat_activated_and_refresh(bool activated) {
+    ED4_ROOT->column_stat_activated = activated;
+    ED4_ROOT->request_refresh_for_sequence_terminals(); 
+}
+
+static void col_stat_activated(AW_window *) {
+    ED4_ROOT->column_stat_initialized  = 1;
+    set_col_stat_activated_and_refresh(true);
+}
+
+static void activate_col_stat(AW_window *aww, AW_CL, AW_CL) {
     if (!ED4_ROOT->column_stat_initialized) {
         AW_window *aww_st = STAT_create_main_window(ED4_ROOT->aw_root, ED4_ROOT->st_ml, (AW_CB0)col_stat_activated, (AW_window *)aww);
         aww_st->show();
-        return;
     }
     else { // re-activate
-        ED4_ROOT->column_stat_activated = 1;
-        ED4_ROOT->refresh_all_windows(1);
+        set_col_stat_activated_and_refresh(true);
     }
 }
 static void disable_col_stat(AW_window *, AW_CL, AW_CL) {
     if (ED4_ROOT->column_stat_initialized && ED4_ROOT->column_stat_activated) {
-        ED4_ROOT->column_stat_activated = 0;
-        ED4_ROOT->refresh_all_windows(1);
+        set_col_stat_activated_and_refresh(false);
     }
 }
@@ -1559 +1594 @@
     awmm->insert_menu_topic("show_diff",     "Show only differences to selected", "d", "set_reference.hlp", AWM_ALL, ED4_set_reference_species, 0, 0);
     SEP________________________SEP;
-    awmm->insert_menu_topic("enable_col_stat",  "Activate column statistics", "v", "st_ml.hlp", AWM_EXP, ED4_activate_col_stat,          0, 0);
-    awmm->insert_menu_topic("disable_col_stat", "Disable column statistics",  "i", "st_ml.hlp", AWM_EXP, disable_col_stat,               0, 0);
+    awmm->insert_menu_topic("enable_col_stat",  "Activate column statistics", "v", "st_ml.hlp", AWM_EXP, activate_col_stat,                0, 0);
+    awmm->insert_menu_topic("disable_col_stat", "Disable column statistics",  "i", "st_ml.hlp", AWM_EXP, disable_col_stat,                 0, 0);
     awmm->insert_menu_topic("detail_col_stat",  "Toggle detailed Col.-Stat.", "c", "st_ml.hlp", AWM_EXP, ED4_toggle_detailed_column_stats, 0, 0);
-    awmm->insert_menu_topic("dcs_threshold",    "Set threshold for D.c.s.",   "f", "st_ml.hlp", AWM_EXP, ED4_set_col_stat_threshold,     1, 0);
+    awmm->insert_menu_topic("dcs_threshold",    "Set threshold for D.c.s.",   "f", "st_ml.hlp", AWM_EXP, ED4_set_col_stat_threshold,       0, 0);
     SEP________________________SEP;
     awmm->insert_menu_topic("visualize_SAI", "Visualize SAIs", "z", "visualizeSAI.hlp", AWM_ALL, AW_POPUP, (AW_CL)ED4_createVisualizeSAI_window, 0);

branches/e4fix/EDIT4/ED4_search.cxx

@@ -773 +773 @@
     }
 
-    if (action & REFRESH_ALWAYS) {
-        bool old_update                        = ED4_update_global_cursor_awars_allowed;
-        ED4_update_global_cursor_awars_allowed = false;
-        ED4_ROOT->refresh_all_windows(1);
-        ED4_update_global_cursor_awars_allowed = old_update;
-    }
-
+    if (action & REFRESH_ALWAYS) ED4_ROOT->request_refresh_for_sequence_terminals();
     root->awar(ED4_AWAR_SEARCH_RESULT_CHANGED)->touch(); // trigger refresh in SECEDIT
 }

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -308 +308 @@
     }
 
-    ED4_ROOT->refresh_all_windows(0);
-
     return ED4_R_OK;
 }
@@ -399 +397 @@
 }
 
+void ED4_multi_species_manager::toggle_selected_species() {
+    if (all_are_selected()) deselect_all_species();
+    else select_all_species();
+
+    ED4_correctBlocktypeAfterSelection();
+}
+
 #if defined(DEBUG) && 1
 static inline void dumpEvent(const char *where, AW_event *event) {
@@ -423 +428 @@
                         switch (ED4_ROOT->species_mode) {
                             case ED4_SM_KILL: {
-                                if (tflag.selected) {
-                                    ED4_ROOT->remove_from_selected(this);
-                                }
+                                if (tflag.selected) ED4_ROOT->remove_from_selected(this);
                                 kill_object();
-                                ED4_ROOT->refresh_all_windows(0);
                                 return ED4_R_BREAK;
                             }
@@ -474 +476 @@
                             to_bracket_terminal()->fold();
                         }
-                        ED4_ROOT->refresh_all_windows(1);
                     }
                     else {
@@ -490 +491 @@
                         if (group) {
                             ED4_multi_species_manager *multi_man = group->to_group_manager()->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
-                            multi_man->deselect_all_species();
-                            ED4_correctBlocktypeAfterSelection();
-                            ED4_ROOT->refresh_all_windows(0);
+                            multi_man->toggle_selected_species();
                         }
                     }
@@ -500 +499 @@
                         if (parent->flag.is_consensus) { // click on consensus-name
                             ED4_multi_species_manager *multi_man = parent->get_parent(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
-                            int species = multi_man->get_no_of_species();
-                            int selected = multi_man->get_no_of_selected_species();
-
-                            if (selected==species) { // all species selected => deselect all
-                                multi_man->deselect_all_species();
-                            }
-                            else { // otherwise => select all
-                                multi_man->select_all_species();
-                            }
-
-                            ED4_correctBlocktypeAfterSelection();
-                            ED4_ROOT->refresh_all_windows(0);
-                            return (ED4_R_BREAK);
+                            multi_man->toggle_selected_species();
+                            // return (ED4_R_BREAK);
                         }
                         else if (species_man->flag.is_SAI) {
@@ -519 +507 @@
                         else { // click on species name
                             if (!tflag.selected) { // select if not selected
-                                if (ED4_ROOT->add_to_selected(this) == ED4_R_OK) {
-                                    ED4_correctBlocktypeAfterSelection();
-                                    ED4_ROOT->refresh_all_windows(0);
-                                }
+                                if (ED4_ROOT->add_to_selected(this) == ED4_R_OK) ED4_correctBlocktypeAfterSelection();
                             }
                             else { // deselect if already selected
                                 ED4_ROOT->remove_from_selected(this);
                                 ED4_correctBlocktypeAfterSelection();
-                                ED4_ROOT->refresh_all_windows(0);
-                                return (ED4_R_BREAK);   // in case we were called by event_to selected()
+                                // return (ED4_R_BREAK);   // in case we were called by event_to selected() @@@ why? 
                             }
                         }
@@ -538 +522 @@
                         ED4_setColumnblockCorner(event, to_sequence_terminal()); // mark columnblock
                         right_button_started_on_sequence_term = 1;
-                        ED4_ROOT->refresh_all_windows(0);
                     }
                     break;
@@ -593 +576 @@
                         ED4_no_dangerous_modes();
                         ED4_setColumnblockCorner(event, to_sequence_terminal()); // mark columnblock
-                        ED4_ROOT->refresh_all_windows(0);
                     }
                     break;
@@ -654 +636 @@
                         ED4_no_dangerous_modes();
                         ED4_setColumnblockCorner(event, to_sequence_terminal()); // mark columnblock
-                        ED4_ROOT->refresh_all_windows(0);
                     }
                     break;

branches/e4fix/EDIT4/ED4_visualizeSAI.cxx

@@ -82 +82 @@
 static void setVisualizeSAI_cb(AW_root *awr) {
     ED4_ROOT->visualizeSAI = awr->awar(AWAR_SAI_ENABLE)->read_int();
-    ED4_ROOT->refresh_all_windows(1); // refresh editor
+    ED4_ROOT->request_refresh_for_sequence_terminals();
 }
 
 static void setVisualizeSAI_options_cb(AW_root *awr) {
     ED4_ROOT->visualizeSAI_allSpecies = awr->awar(AWAR_SAI_ALL_SPECIES)->read_int();
-    ED4_ROOT->refresh_all_windows(1); // refresh editor
+    ED4_ROOT->request_refresh_for_sequence_terminals();
 }
 
@@ -185 +185 @@
         inCallback = old_inCallback;
 
-        if (!inCallback) {
-            ED4_ROOT->refresh_all_windows(1); // refresh editor
-        }
+        if (!inCallback) ED4_ROOT->request_refresh_for_sequence_terminals();
 
         in_colorDefChanged_callback = false;
@@ -261 +259 @@
     free(clrTabName);
 
-    if (!inCallback && clrDefinitionsChanged) {
-        ED4_ROOT->refresh_all_windows(1); // refresh editor
-    }
+    if (!inCallback && clrDefinitionsChanged) ED4_ROOT->request_refresh_for_sequence_terminals();
 }
 
@@ -271 +267 @@
     {
         clrDefinitionsChanged = 1;
-        ED4_ROOT->refresh_all_windows(1); // refresh editor when current SAI is changed
+        ED4_ROOT->request_refresh_for_sequence_terminals();
     }
 }
@@ -313 +309 @@
 
     if (!inCallback && clrDefinitionsChanged) {
-        ED4_ROOT->refresh_all_windows(1); // refresh editor
         // SAI changed notify Global SAI Awar AWAR_SAI_GLOBAL
         awr->awar(AWAR_SAI_GLOBAL)->write_string(saiName);
+        ED4_ROOT->request_refresh_for_sequence_terminals();
     }
     free(saiName);

branches/e4fix/EDIT4/ed4_class.hxx

@@ -1462 +1462 @@
     void ED4_ROOT() const { e4_assert(0); } // avoid ED4_root-members use global ED4_ROOT
 
-    ED4_returncode refresh_window_simple(int redraw);
+    ED4_returncode refresh_window_simple(bool redraw);
+    void handle_update_requests(bool& redraw);
 
     ED4_window *most_recently_used_window;
@@ -1498 +1499 @@
     ed_key                  *edk;
     ED4_Edit_String         *edit_string;
-    int                      column_stat_activated;
-    int                      column_stat_initialized;
-    int                      visualizeSAI;
-    int                      visualizeSAI_allSpecies;
+    int                      column_stat_activated; // @@@ make bool
+    int                      column_stat_initialized; // @@@ make bool
+    int                      visualizeSAI; // @@@ make bool
+    int                      visualizeSAI_allSpecies; // @@@ make bool
     int                      temp_gc;
     AW_font_group            font_group;
@@ -1522 +1523 @@
     ED4_returncode resize_all();
 
-    ED4_returncode refresh_window(int redraw);
-    ED4_returncode refresh_all_windows(int redraw);
-
-    inline void announce_deletion(ED4_base *object); // before deleting an object, use this to announce 
+    ED4_returncode refresh_window(bool redraw);
+    ED4_returncode refresh_all_windows(bool redraw);
+
+    void request_refresh_for_all_terminals();
+    void request_refresh_for_specific_terminals(ED4_level lev);
+    void request_refresh_for_consensus_terminals();
+    void request_refresh_for_sequence_terminals();
+    
+    inline void announce_deletion(ED4_base *object); // before deleting an object, use this to announce
 
     // functions concerned with list of selected objects
@@ -1648 +1654 @@
 
     // functions concerned with selection
-    int         get_no_of_selected_species();
-    int         get_no_of_species();
+    int get_no_of_selected_species();
+    int get_no_of_species();
 
     void update_group_id();
 
-    void        invalidate_species_counters();
-    int         has_valid_counters() const      { return species!=-1 && selected_species!=-1; }
-
-    void        select_all_species();
-    void        deselect_all_species();
-    void        invert_selection_of_all_species();
-    void        select_marked_species(int select);
-    void        mark_selected_species(int mark);
+    void invalidate_species_counters();
+    int  has_valid_counters() const { return species != -1 && selected_species!=-1; }
+    bool all_are_selected() const { e4_assert(has_valid_counters()); return species == selected_species; }
+
+    void select_all_species();
+    void deselect_all_species();
+    void invert_selection_of_all_species();
+    void select_marked_species(int select);
+    void mark_selected_species(int mark);
+
+    void toggle_selected_species();
 };