Changeset 8337 for branches

Timestamp:

20/01/12 17:09:02 (4 months ago)

Author:

westram

Message:

• set_properties
  • inlined
  • renamed -> set_property
  • removed several unneeded casts from calls
  • added inverse function clr_property
• ED4_manager::un/fold_group moved to ED4_bracket_terminal::un/fold
  • avoids unneccessary search of brackets via id

Location:

branches/e4fix/EDIT4

Files:

• ED4_ProteinViewer.cxx (modified) (2 diffs)
• ED4_base.cxx (modified) (7 diffs)
• ED4_cursor.cxx (modified) (1 diff)
• ED4_no_class.cxx (modified) (3 diffs)
• ED4_terminal.cxx (modified) (2 diffs)
• EDB_root_bact.cxx (modified) (9 diffs)
• ed4_class.hxx (modified) (4 diffs)

branches/e4fix/EDIT4/ED4_ProteinViewer.cxx

@@ -792 +792 @@
             ED4_multi_sequence_manager *multiSeqManager = speciesManager->search_spec_child_rek(ED4_L_MULTI_SEQUENCE)->to_multi_sequence_manager();
             ED4_sequence_manager         *new_SeqManager = new ED4_sequence_manager(namebuffer, 0, 0, 0, 0, multiSeqManager);
-            new_SeqManager->set_properties(ED4_P_MOVABLE);
+            new_SeqManager->set_property(ED4_P_MOVABLE);
             multiSeqManager->children->append_member(new_SeqManager);
 
@@ -803 +803 @@
                 sprintf(namebuffer, "DBProteinInfo_Term%ld.%d", ED4_counter, count++);
             new_SeqInfoTerminal = new ED4_sequence_info_terminal(namebuffer, 0, 0, SEQUENCEINFOSIZE, TERMINALHEIGHT, new_SeqManager);
-            new_SeqInfoTerminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
+            new_SeqInfoTerminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
             ED4_sequence_info_terminal *seqInfoTerminal = speciesManager->search_spec_child_rek(ED4_L_SEQUENCE_INFO)->to_sequence_info_terminal();
             new_SeqInfoTerminal->set_links(seqInfoTerminal, seqInfoTerminal);

branches/e4fix/EDIT4/ED4_base.cxx

@@ -121 +121 @@
     bool was_consensus_relevant = dynamic_prop & ED4_P_CONSENSUS_RELEVANT;
 
-    dynamic_prop = ED4_properties(dynamic_prop&~(ED4_P_CONSENSUS_RELEVANT|ED4_P_ALIGNMENT_DATA));
+    clr_property(ED4_properties(ED4_P_CONSENSUS_RELEVANT|ED4_P_ALIGNMENT_DATA));
 
     if (was_consensus_relevant) { 
@@ -279 +279 @@
     (*group_manager)->children->append_member(multi_species_manager);                                   // auszeichnen
 
-    (*group_manager)->set_properties((ED4_properties) (ED4_P_MOVABLE));
-    multi_species_manager->set_properties((ED4_properties) (ED4_P_IS_HANDLE));
-    bracket_terminal->set_properties((ED4_properties) (ED4_P_IS_HANDLE));
+    (*group_manager)->set_property(ED4_P_MOVABLE);
+    multi_species_manager->set_property(ED4_P_IS_HANDLE);
+    bracket_terminal->set_property(ED4_P_IS_HANDLE);
     bracket_terminal->set_links(NULL, multi_species_manager);
 
@@ -290 +290 @@
     sprintf(buffer, "Consensus_Manager.%ld", ED4_counter);                                                     // Create competence terminal
     species_manager = new ED4_species_manager(buffer, 0, SPACERHEIGHT, 0, 0, multi_species_manager);
-    species_manager->set_properties(ED4_P_MOVABLE);
+    species_manager->set_property(ED4_P_MOVABLE);
     species_manager->flag.is_consensus = 1;
     multi_species_manager->children->append_member(species_manager);
@@ -296 +296 @@
 
     species_name_terminal = new ED4_species_name_terminal(group_name, 0, 0, MAXSPECIESWIDTH - BRACKETWIDTH, TERMINALHEIGHT, species_manager);
-    species_name_terminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));      // only some terminals
+    species_name_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));      // only some terminals
     species_name_terminal->set_links(NULL, ED4_ROOT->ref_terminals.get_ref_sequence());
     species_manager->children->append_member(species_name_terminal);                                                    // properties
@@ -302 +302 @@
     sprintf(buffer, "Consensus_Seq_Manager.%ld", ED4_counter);
     sequence_manager = new ED4_sequence_manager(buffer, MAXSPECIESWIDTH, 0, 0, 0, species_manager);
-    sequence_manager->set_properties(ED4_P_MOVABLE);
+    sequence_manager->set_property(ED4_P_MOVABLE);
     species_manager->children->append_member(sequence_manager);
 
     sequence_info_terminal = new ED4_sequence_info_terminal("DATA", 0, 0, SEQUENCEINFOSIZE, TERMINALHEIGHT, sequence_manager);        // Info fuer Gruppe
     sequence_info_terminal->set_links(ED4_ROOT->ref_terminals.get_ref_sequence_info(), ED4_ROOT->ref_terminals.get_ref_sequence_info());
-    sequence_info_terminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
+    sequence_info_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
     sequence_manager->children->append_member(sequence_info_terminal);
 
     sequence_terminal = new ED4_consensus_sequence_terminal("", SEQUENCEINFOSIZE, 0, 0, TERMINALHEIGHT, sequence_manager);
-    sequence_terminal->set_properties(ED4_P_CURSOR_ALLOWED);
+    sequence_terminal->set_property(ED4_P_CURSOR_ALLOWED);
     sequence_terminal->set_links(ED4_ROOT->ref_terminals.get_ref_sequence(),   ED4_ROOT->ref_terminals.get_ref_sequence());
     sequence_manager->children->append_member(sequence_terminal);
@@ -1032 +1032 @@
 }
 
-ED4_returncode ED4_manager::unfold_group(char *bracket_ID_to_unfold)
-{
-    int i;
-
-    ED4_base *bracket_terminal = search_ID(bracket_ID_to_unfold);
-    if (!bracket_terminal) return ED4_R_WARNING;
-
-    ED4_manager *temp_parent = bracket_terminal->parent;
-    if (!temp_parent) return ED4_R_WARNING;
-
-    ED4_multi_species_manager *multi_species_manager = NULL;
-    temp_parent->get_area_level(&multi_species_manager);
-
-    for (i=0; i < temp_parent->children->members(); i++) {
-        ED4_base *member = temp_parent->children->member(i);
-
-        if (member->is_multi_species_manager()) {
-            multi_species_manager = member->to_multi_species_manager();
-            multi_species_manager->unhide_children();
-            multi_species_manager->dynamic_prop = ED4_properties(multi_species_manager->dynamic_prop & ~ED4_P_IS_FOLDED);
-
-            ED4_spacer_terminal *spacer = multi_species_manager->get_defined_level(ED4_L_SPACER)->to_spacer_terminal();
-            spacer->extension.size[HEIGHT] = SPACERHEIGHT;
-        }
-    }
-
-    bracket_terminal->dynamic_prop =  ED4_properties(bracket_terminal->dynamic_prop & ~ED4_P_IS_FOLDED);
-    temp_parent->dynamic_prop =  ED4_properties(temp_parent->dynamic_prop & ~ED4_P_IS_FOLDED);
-
-    ED4_ROOT->main_manager->update_info.set_resize(1);
-    ED4_ROOT->main_manager->resize_requested_by_parent();
-
-    return ED4_R_OK;
-}
-
-ED4_returncode ED4_manager::fold_group(char *bracket_ID_to_fold)
-{
-    ED4_base *bracket_terminal;
-    ED4_manager *temp_parent;
-
-    bracket_terminal = search_ID(bracket_ID_to_fold);
-
-    if (!bracket_terminal) return ED4_R_WARNING;
-
-    temp_parent = bracket_terminal->parent;
-    if (!temp_parent) return ED4_R_WARNING;
-
-    ED4_multi_species_manager *multi_species_manager = temp_parent->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
-    ED4_manager *consensus_manager = NULL;
-
-    int consensus_shown = 0;
-    if (!(multi_species_manager->children->member(1)->flag.is_consensus)) { // if consensus is not a top => move to top
-        ED4_members *multi_children = multi_species_manager->children;
-        int i;
-
-        for (i=0; i<multi_children->members(); i++) { // search for consensus
-            if (multi_children->member(i)->flag.is_consensus) {
-                consensus_manager = multi_children->member(i)->to_manager();
-                break;
-            }
-        }
-
-        if (consensus_manager) {
-            multi_children->move_member(i, 1); // move Consensus to top of list
-            consensus_manager->extension.position[Y_POS] = SPACERHEIGHT;
-            ED4_base::touch_world_cache();
+void ED4_bracket_terminal::unfold() {
+    if (parent) {
+        for (int i=0; i < parent->children->members(); i++) {
+            ED4_base *member = parent->children->member(i);
+
+            if (member->is_multi_species_manager()) {
+                ED4_multi_species_manager *multi_species_manager = member->to_multi_species_manager();
+                multi_species_manager->unhide_children();
+                multi_species_manager->clr_property(ED4_P_IS_FOLDED);
+
+                ED4_spacer_terminal *spacer = multi_species_manager->get_defined_level(ED4_L_SPACER)->to_spacer_terminal();
+                spacer->extension.size[HEIGHT] = SPACERHEIGHT;
+            }
+        }
+
+        clr_property(ED4_P_IS_FOLDED);
+        parent->clr_property(ED4_P_IS_FOLDED);
+    }
+}
+
+void ED4_bracket_terminal::fold() {
+    if (parent) {
+        ED4_multi_species_manager *multi_species_manager = parent->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager();
+        ED4_manager               *consensus_manager     = NULL;
+
+        int consensus_shown = 0;
+        if (!(multi_species_manager->children->member(1)->flag.is_consensus)) { // if consensus is not a top => move to top
+            ED4_members *multi_children = multi_species_manager->children;
+
+            int i;
+            for (i=0; i<multi_children->members(); i++) { // search for consensus
+                if (multi_children->member(i)->flag.is_consensus) {
+                    consensus_manager = multi_children->member(i)->to_manager();
+                    break;
+                }
+            }
+
+            if (consensus_manager) {
+                multi_children->move_member(i, 1); // move Consensus to top of list
+                consensus_manager->extension.position[Y_POS] = SPACERHEIGHT;
+                ED4_base::touch_world_cache();
+                consensus_shown = 1;
+            }
+        }
+        else {
             consensus_shown = 1;
         }
-    }
-    else {
-        consensus_shown = 1;
-    }
-
-    if (consensus_shown && ED4_ROOT->aw_root->awar(ED4_AWAR_CONSENSUS_SHOW)->read_int()==0) {
-        consensus_shown = 0;
-    }
-
-    ED4_spacer_terminal *spacer = multi_species_manager->get_defined_level(ED4_L_SPACER)->to_spacer_terminal();
-    if (spacer) {
-        spacer->extension.size[HEIGHT] = consensus_shown ? SPACERHEIGHT : SPACERNOCONSENSUSHEIGHT;
-    }
-
-    multi_species_manager->hide_children();
-    multi_species_manager->set_properties((ED4_properties) (ED4_P_IS_FOLDED));
-
-    bracket_terminal->set_properties((ED4_properties) (ED4_P_IS_FOLDED));
-    temp_parent->set_properties((ED4_properties) (ED4_P_IS_FOLDED));
-
-    // fix scrollbars:
-    ED4_ROOT->main_manager->update_info.set_resize(1);
-    ED4_ROOT->main_manager->resize_requested_by_parent();
-
-    return ED4_R_OK;
-}
-
+
+        if (consensus_shown && ED4_ROOT->aw_root->awar(ED4_AWAR_CONSENSUS_SHOW)->read_int()==0) {
+            consensus_shown = 0;
+        }
+
+        ED4_spacer_terminal *spacer = multi_species_manager->get_defined_level(ED4_L_SPACER)->to_spacer_terminal();
+        if (spacer) {
+            spacer->extension.size[HEIGHT] = consensus_shown ? SPACERHEIGHT : SPACERNOCONSENSUSHEIGHT;
+        }
+
+        multi_species_manager->hide_children();
+        multi_species_manager->set_property(ED4_P_IS_FOLDED);
+
+        set_property(ED4_P_IS_FOLDED);
+        parent->set_property(ED4_P_IS_FOLDED);
+
+    }
+}
 
 void ED4_base::check_all()
@@ -1151 +1121 @@
     return current_device()->reduceClipBorders(int(y), int(y+extension.size[HEIGHT]-1), int(x), int(x+extension.size[WIDTH]-1));
 }
-
-
-void ED4_base::set_properties(ED4_properties prop)
-{
-    dynamic_prop = (ED4_properties) (dynamic_prop | prop);
-}
-
 
 ED4_returncode ED4_base::set_links(ED4_base *temp_width_link, ED4_base *temp_height_link)       // sets links in hierarchy :

branches/e4fix/EDIT4/ED4_cursor.cxx

@@ -404 +404 @@
 
     if (unfold_groups) {
-        bool unfolded = false;
+        bool did_unfold = false;
 
         while (group_manager_to_unfold && unfold_groups) {
             ED4_base *base = group_manager_to_unfold->search_spec_child_rek(ED4_L_BRACKET);
             if (!base) break;
-            ED4_bracket_terminal *bracket = base->to_bracket_terminal();
-            group_manager_to_unfold->unfold_group(bracket->id);
-            unfolded = true;
+
+            base->to_bracket_terminal()->unfold();
+            did_unfold = true;
+
             group_manager_to_unfold = is_in_folded_group();
         }
 
-        if (unfolded) ED4_ROOT->refresh_all_windows(1);
+        if (did_unfold) ED4_ROOT->refresh_all_windows(1); // needed to recalculate world cache of target terminal
     }
 

branches/e4fix/EDIT4/ED4_no_class.cxx

@@ -995 +995 @@
 
         ED4_sequence_manager *new_seq_man = new ED4_sequence_manager(buffer, 0, 0, 0, 0, multi_seq_man);
-        new_seq_man->set_properties(ED4_P_MOVABLE);
+        new_seq_man->set_property(ED4_P_MOVABLE);
         multi_seq_man->children->append_member(new_seq_man);
 
@@ -1013 +1013 @@
 
         ED4_sequence_info_terminal *new_colStat_info_term = new ED4_sequence_info_terminal("CStat", 0, 0, SEQUENCEINFOSIZE, columnStatHeight, new_seq_man);
-        new_colStat_info_term->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
+        new_colStat_info_term->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
         new_colStat_info_term->set_links(ref_colStat_info_terminal, ref_colStat_terminal);
         new_seq_man->children->append_member(new_colStat_info_term);
@@ -1132 +1132 @@
     {
         ED4_bracket_terminal *bracket = group_manager->get_defined_level(ED4_L_BRACKET)->to_bracket_terminal();
-
-        if (bracket) {
-            group_manager->fold_group(bracket->id);
-        }
+        if (bracket) bracket->fold();
     }
 

branches/e4fix/EDIT4/ED4_terminal.cxx

@@ -267 +267 @@
     if (get_species_pointer()) {
         set_species_pointer(0);
-        tflag.deleted = 1; // @@@ why ? 
-        dynamic_prop = (ED4_properties) (dynamic_prop & ~ED4_P_CURSOR_ALLOWED);
+        tflag.deleted = 1; // @@@ why ?
+        clr_property(ED4_P_CURSOR_ALLOWED);
 
         set_refresh();
@@ -469 +469 @@
                     else if (is_bracket_terminal()) { // fold/unfold group
                         if (dynamic_prop & ED4_P_IS_FOLDED) {
-                            ED4_ROOT->main_manager->unfold_group(id);
+                            to_bracket_terminal()->unfold();
                         }
                         else {
-                            ED4_ROOT->main_manager->fold_group(id);
+                            to_bracket_terminal()->fold();
                         }
                         ED4_ROOT->refresh_all_windows(1);

branches/e4fix/EDIT4/EDB_root_bact.cxx

@@ -106 +106 @@
 
     species_manager = new ED4_species_manager(namebuffer, 0, local_count_position, 0, 0, multi_species_manager);
-    species_manager->set_properties(ED4_P_MOVABLE);
+    species_manager->set_property(ED4_P_MOVABLE);
     if (datamode == ED4_D_EXTENDED) {
         species_manager->flag.is_SAI = 1;
@@ -125 +125 @@
     sprintf(namebuffer, "Name_Manager%ld.%d", ED4_counter, count_too ++);                          // hier fehlt noch y
     name_manager = new ED4_name_manager(namebuffer, 0, 0*terminal_height, 0, 0, multi_name_manager);            // hier fehlt noch y
-    name_manager->set_properties(ED4_P_MOVABLE);                            // only Speciesname should be movable !!!!
+    name_manager->set_property(ED4_P_MOVABLE);                            // only Speciesname should be movable !!!!
     multi_name_manager->children->append_member(name_manager);
 
     sprintf(namebuffer, "Species_Name_Term%ld.%d", ED4_counter, count_too ++);
     species_name_terminal = new ED4_species_name_terminal(namebuffer, 0, 0, MAXSPECIESWIDTH-(group_depth*BRACKETWIDTH), terminal_height, name_manager);
-    species_name_terminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
+    species_name_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
     species_name_terminal->set_links(NULL, ref_sequence_terminal);
     species_name_terminal->set_species_pointer(GB_entry(gb_datamode, "name"));
@@ -195 +195 @@
                 sprintf(namebuffer, "Sequence_Manager.%ld.%d", ED4_counter, count_too++);
                 ED4_sequence_manager *seq_manager = new ED4_sequence_manager(namebuffer, 0, j*TERMINALHEIGHT, 0, 0, multi_sequence_manager);
-                seq_manager->set_properties(ED4_P_MOVABLE);
+                seq_manager->set_property(ED4_P_MOVABLE);
                 multi_sequence_manager->children->append_member(seq_manager);
 
                 ED4_sequence_info_terminal *sequence_info_terminal =
                     new ED4_sequence_info_terminal(key_string, 0, 0, SEQUENCEINFOSIZE, TERMINALHEIGHT, seq_manager);
-                sequence_info_terminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
+                sequence_info_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
                 sequence_info_terminal->set_links(ref_sequence_info_terminal, ref_sequence_info_terminal);
                 sequence_info_terminal->set_species_pointer(gb_alignment);
@@ -221 +221 @@
                     seq_term->species_name = seq_term->get_name_of_species();
 
-                    if (is_seq_data) seq_term->set_properties(ED4_P_CONSENSUS_RELEVANT);
-                    seq_term->set_properties(ED4_P_ALIGNMENT_DATA);
+                    if (is_seq_data) seq_term->set_property(ED4_P_CONSENSUS_RELEVANT);
+                    seq_term->set_property(ED4_P_ALIGNMENT_DATA);
 
                     text_terminal = seq_term;
@@ -231 +231 @@
                 }
 
-                text_terminal->set_properties(ED4_P_CURSOR_ALLOWED);
+                text_terminal->set_property(ED4_P_CURSOR_ALLOWED);
                 text_terminal->set_links(ref_sequence_terminal, ref_sequence_terminal);
                 seq_manager->children->append_member(text_terminal);
@@ -541 +541 @@
     if (is_folded)                                              // only set FOLDED-flag if group
     {                                                   // is folded
-        group_manager->set_properties((ED4_properties) (ED4_P_IS_FOLDED | ED4_P_MOVABLE));
-        (*multi_species_manager)->set_properties((ED4_properties) (ED4_P_IS_FOLDED | ED4_P_IS_HANDLE));
-        (*bracket_terminal)->set_properties((ED4_properties) (ED4_P_IS_FOLDED | ED4_P_IS_HANDLE));
+        group_manager->set_property((ED4_properties) (ED4_P_IS_FOLDED | ED4_P_MOVABLE));
+        (*multi_species_manager)->set_property((ED4_properties) (ED4_P_IS_FOLDED | ED4_P_IS_HANDLE));
+        (*bracket_terminal)->set_property((ED4_properties) (ED4_P_IS_FOLDED | ED4_P_IS_HANDLE));
     }
     else
     {
-        group_manager->set_properties((ED4_properties) (ED4_P_MOVABLE));
-        (*multi_species_manager)->set_properties((ED4_properties) (ED4_P_IS_HANDLE));
-        (*bracket_terminal)->set_properties((ED4_properties) (ED4_P_IS_HANDLE));
+        group_manager->set_property(ED4_P_MOVABLE);
+        (*multi_species_manager)->set_property(ED4_P_IS_HANDLE);
+        (*bracket_terminal)->set_property(ED4_P_IS_HANDLE);
     }
 
@@ -558 +558 @@
     sprintf(namebuffer, "Consensus_Manager.%ld", ED4_counter);                             // Create competence terminal
     species_manager = new ED4_species_manager(namebuffer, 0, height_spacer, 0, 0, *multi_species_manager);
-    species_manager->set_properties(ED4_P_MOVABLE);
+    species_manager->set_property(ED4_P_MOVABLE);
     species_manager->flag.is_consensus = 1;
     (*multi_species_manager)->children->append_member(species_manager);
 
     species_name_terminal = new ED4_species_name_terminal(groupname, 0, 0, MAXSPECIESWIDTH-(group_depth*BRACKETWIDTH),   height_terminal, species_manager);
-    species_name_terminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));      // only some terminals
+    species_name_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));      // only some terminals
     species_name_terminal->set_links(NULL, ref_sequence_terminal);
     species_manager->children->append_member(species_name_terminal);                            // properties
@@ -569 +569 @@
     sprintf(namebuffer, "Consensus_Seq_Manager.%ld", ED4_counter);
     sequence_manager = new ED4_sequence_manager(namebuffer, MAXSPECIESWIDTH-(group_depth*BRACKETWIDTH), 0, 0, 0, species_manager);
-    sequence_manager->set_properties(ED4_P_MOVABLE);
+    sequence_manager->set_property(ED4_P_MOVABLE);
     species_manager->children->append_member(sequence_manager);
 
     sequence_info_terminal = new ED4_sequence_info_terminal("CONS", 0, 0, SEQUENCEINFOSIZE, height_terminal, sequence_manager);  // Info fuer Gruppe
     sequence_info_terminal->set_links(ref_sequence_info_terminal, ref_sequence_info_terminal);
-    sequence_info_terminal->set_properties((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
+    sequence_info_terminal->set_property((ED4_properties) (ED4_P_SELECTABLE | ED4_P_DRAGABLE | ED4_P_IS_HANDLE));
     sequence_manager->children->append_member(sequence_info_terminal);
 
@@ -581 +581 @@
 
     sequence_terminal = new ED4_consensus_sequence_terminal(CONSENSUS, SEQUENCEINFOSIZE, 0, pixel_length + 10, height_terminal, sequence_manager);
-    sequence_terminal->set_properties(ED4_P_CURSOR_ALLOWED);
+    sequence_terminal->set_property(ED4_P_CURSOR_ALLOWED);
     sequence_terminal->set_links(ref_sequence_terminal, ref_sequence_terminal);
     sequence_manager->children->append_member(sequence_terminal);

branches/e4fix/EDIT4/ed4_class.hxx

@@ -1073 +1073 @@
 
     // functions concerned with special initialization
-    void set_properties  (ED4_properties prop);
-
+    void set_property(ED4_properties prop) { dynamic_prop = (ED4_properties) (dynamic_prop | prop); } 
+    void clr_property(ED4_properties prop) { dynamic_prop = (ED4_properties) (dynamic_prop & ~prop); }
+    
     // functions concerned with coordinate transformation
 
@@ -1313 +1314 @@
     ED4_terminal *get_first_terminal(int start_index=0) const;
     ED4_terminal *get_last_terminal(int start_index=-1) const;
-
-    // general folding functions
-    ED4_returncode  unfold_group(char *bracketID_to_unfold);
-    ED4_returncode  fold_group(char *bracketID_to_fold);
 
     ED4_returncode hide_children();
@@ -1893 +1890 @@
     virtual ED4_returncode Show(int refresh_all=0, int is_cleared=0);
 
+    void fold();
+    void unfold();
+
     ED4_bracket_terminal(const char *id, AW_pos x, AW_pos y, AW_pos width, AW_pos height, ED4_manager *parent);
 
@@ -2259 +2259 @@
 #endif
 
+