Changeset 8276

Timestamp:

03/12/11 12:40:39 (6 months ago)

Author:

westram

Message:

• denglish (actual->current)

Location:

branches/e4fix/EDIT4

Files:

• ED4_base.cxx (modified) (3 diffs)
• ED4_cursor.cxx (modified) (2 diffs)
• ED4_no_class.cxx (modified) (3 diffs)
• ED4_root.cxx (modified) (4 diffs)
• ED4_terminal.cxx (modified) (2 diffs)
• EDB_root_bact.cxx (modified) (5 diffs)
• ed4_class.hxx (modified) (7 diffs)

branches/e4fix/EDIT4/ED4_base.cxx

@@ -116 +116 @@
 void ED4_terminal::changed_by_database()
 {
-    if (GB_read_clock(GLOBAL_gb_main) > actual_timestamp) { // only if timer_cb occurred after last change by EDIT4
+    if (GB_read_clock(GLOBAL_gb_main) > curr_timestamp) { // only if timer_cb occurred after last change by EDIT4
 
         // test if alignment length has changed:
@@ -1354 +1354 @@
 }
 
-int ED4_base::actualTimestamp = 1;
+int ED4_base::currTimestamp = 1;
 void ED4_base::update_world_coords_cache() {
     if (parent) {
@@ -1365 +1365 @@
     lastXpos += extension.position[X_POS];
     lastYpos += extension.position[Y_POS];
-    timestamp = actualTimestamp;
+    timestamp = currTimestamp;
 }
 

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -676 +676 @@
 }
 
-void ED4_get_and_jump_to_actual(AW_window *aww, AW_CL) { // @@@ fix name
+void ED4_get_and_jump_to_current(AW_window *aww, AW_CL) {
     ED4_LocalWinContext uses(aww);
     char *name = GBT_read_string(GLOBAL_gb_main, AWAR_SPECIES_NAME);
@@ -688 +688 @@
 }
 
-void ED4_get_and_jump_to_actual_from_menu(AW_window *aw, AW_CL cl, AW_CL) {
-    ED4_get_and_jump_to_actual(aw, cl);
+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);
 }

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -2077 +2077 @@
                                                 }
                                                 else { // different field contents
-                                                    int actualStat;
-                                                    for (actualStat=1; actualStat<nextStat; actualStat++) {
+                                                    int currStat;
+                                                    for (currStat=1; currStat<nextStat; currStat++) {
                                                         int names_len = 1; // open bracket
                                                         SpeciesMergeList *sl2 = sml;
@@ -2085 +2085 @@
 
                                                         while (sl2) {
-                                                            if (fieldStat[i]==actualStat) {
+                                                            if (fieldStat[i]==currStat) {
                                                                 names_len += strlen(sl2->species_name)+1;
                                                                 if (!content) {
@@ -2106 +2106 @@
                                                         int first = 1;
                                                         while (sl2) {
-                                                            if (fieldStat[i]==actualStat) {
+                                                            if (fieldStat[i]==currStat) {
                                                                 add += sprintf(add, "%c%s", first ? '{' : ';', sl2->species_name);
                                                                 first = 0;

branches/e4fix/EDIT4/ED4_root.cxx

@@ -909 +909 @@
 }
 
-static ED4_list_elem *actual_aligner_elem = 0;
+static ED4_list_elem *curr_aligner_elem = 0;
 static GBDATA *get_next_selected_species()
 {
-    if (!actual_aligner_elem) return 0;
-
-    ED4_selection_entry *selectionEntry = (ED4_selection_entry*)actual_aligner_elem->elem();
+    if (!curr_aligner_elem) return 0;
+
+    ED4_selection_entry *selectionEntry = (ED4_selection_entry*)curr_aligner_elem->elem();
     ED4_species_manager *specMan = selectionEntry->object->get_parent(ED4_L_SPECIES)->to_species_manager();
 
-    actual_aligner_elem = actual_aligner_elem->next();
+    curr_aligner_elem = curr_aligner_elem->next();
     return specMan->get_species_pointer();
 }
@@ -929 +929 @@
 
     if (selected) {
-        actual_aligner_elem = ED4_ROOT->selected_objects.first();
+        curr_aligner_elem = ED4_ROOT->selected_objects.first();
     }
     else {
-        actual_aligner_elem = 0;
+        curr_aligner_elem = 0;
     }
 
@@ -1470 +1470 @@
 
     awmm->create_menu("Edit", "E", AWM_ALL);
-    awmm->insert_menu_topic("refresh",     "Refresh [Ctrl-L]",           "f", 0, AWM_ALL, (AW_CB)ED4_refresh_window,            0, 0);
-    awmm->insert_menu_topic("load_actual", "Load current species [GET]", "G", 0, AWM_ALL, ED4_get_and_jump_to_actual_from_menu, 0, 0);
-    awmm->insert_menu_topic("load_marked", "Load marked species",        "m", 0, AWM_ALL, ED4_get_marked_from_menu,             0, 0);
+    awmm->insert_menu_topic("refresh",      "Refresh [Ctrl-L]",           "f", 0, AWM_ALL, (AW_CB)ED4_refresh_window,            0, 0);
+    awmm->insert_menu_topic("load_current", "Load current species [GET]", "G", 0, AWM_ALL, ED4_get_and_jump_to_current_from_menu, 0, 0);
+    awmm->insert_menu_topic("load_marked",  "Load marked species",        "m", 0, AWM_ALL, ED4_get_marked_from_menu,             0, 0);
     SEP________________________SEP;
     awmm->insert_menu_topic("refresh_ecoli",       "Reload Ecoli sequence",        "E", "ecoliref.hlp", AWM_ALL, (AW_CB)ED4_reload_ecoli_cb, 0, 0);
@@ -1755 +1755 @@
 
     awmm->at("get");
-    awmm->callback(ED4_get_and_jump_to_actual, 0);
+    awmm->callback(ED4_get_and_jump_to_current, 0);
     awmm->help_text("e4.hlp");
     awmm->create_button("GET", "Get");

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -244 +244 @@
     if (!err && dynamic_prop&ED4_P_CONSENSUS_RELEVANT) {
         if (old_seq) {
-            actual_timestamp = GB_read_clock(GLOBAL_gb_main);
+            curr_timestamp = GB_read_clock(GLOBAL_gb_main);
 
             get_parent(ED4_L_MULTI_SPECIES)->to_multi_species_manager()
@@ -792 +792 @@
     memset((char*)&tflag, 0, sizeof(tflag));
     selection_info   = 0;
-    actual_timestamp = 0;
+    curr_timestamp = 0;
 }
 

branches/e4fix/EDIT4/EDB_root_bact.cxx

@@ -50 +50 @@
                                         char                       *str,
                                         ED4_index                  *y,
-                                        ED4_index                   actual_local_position,
+                                        ED4_index                   curr_local_position,
                                         ED4_index                  *length_of_terminals,
                                         int                         group_depth,
@@ -101 +101 @@
 
     terminal_height = TERMINALHEIGHT;
-    local_count_position = actual_local_position;
+    local_count_position = curr_local_position;
 
     sprintf(namebuffer, "Species_Manager.%ld.%d", ED4_counter, count_too);
@@ -144 +144 @@
 
     if (!(multi_species_manager->flag.hidden)) {
-        *length_of_terminals = local_count_position-actual_local_position;
+        *length_of_terminals = local_count_position-curr_local_position;
         *y += *length_of_terminals; // needed for global coordinates of manager
     }
@@ -326 +326 @@
                                             int                        *index,
                                             ED4_index                  *y,
-                                            ED4_index                   actual_local_position,
+                                            ED4_index                   curr_local_position,
                                             ED4_index                  *length_of_terminals, // height of terminals is meant
                                             int                         group_depth,
@@ -342 +342 @@
 
     ship = (char*)GB_calloc(SHIPSIZE, sizeof(*ship));
-    local_count_position = actual_local_position;
+    local_count_position = curr_local_position;
 
     do {

branches/e4fix/EDIT4/ed4_class.hxx

@@ -173 +173 @@
                                 int                        *index,
                                 ED4_index                  *y,
-                                ED4_index                   actual_local_position,
+                                ED4_index                   curr_local_position,
                                 ED4_index                  *length_of_terminals,
                                 int                         group_depth,
@@ -183 +183 @@
                              char                       *string,
                              ED4_index                  *y,
-                             ED4_index                   actual_local_position,
+                             ED4_index                   curr_local_position,
                              ED4_index                  *length_of_terminals,
                              int                         group_depth,
@@ -981 +981 @@
     // cache world coordinates:
 
-    static int actualTimestamp;
+    static int currTimestamp;
     AW_pos     lastXpos;
     AW_pos     lastYpos;
@@ -1048 +1048 @@
 
     void calc_world_coords(AW_pos *x, AW_pos *y) {
-        bool cache_up_to_date = timestamp == actualTimestamp;
+        bool cache_up_to_date = timestamp == currTimestamp;
         if (!cache_up_to_date) {
             update_world_coords_cache();
@@ -1057 +1057 @@
 
     static void touch_world_cache() {
-        actualTimestamp++;
+        currTimestamp++;
     }
 
@@ -1299 +1299 @@
     } tflag;
     ED4_selection_entry *selection_info;            // Info about i.e. Position
-    long                 actual_timestamp;
+    long                 curr_timestamp;
 
     DECLARE_DUMP_FOR_BASECLASS(ED4_terminal,ED4_base);
@@ -2169 +2169 @@
 
 void ED4_jump_to_current_species     (AW_window *, AW_CL);
-void ED4_get_and_jump_to_actual      (AW_window *, AW_CL);
-void ED4_get_and_jump_to_actual_from_menu    (AW_window *aw, AW_CL cl, AW_CL);
+void ED4_get_and_jump_to_current      (AW_window *, AW_CL);
+void ED4_get_and_jump_to_current_from_menu    (AW_window *aw, AW_CL cl, AW_CL);
 void ED4_get_and_jump_to_species     (GB_CSTR species_name);
 void ED4_get_marked_from_menu        (AW_window *, AW_CL, AW_CL);