Changeset 8265 for trunk

Timestamp:

30/11/11 12:15:57 (6 months ago)

Author:

westram

Message:

• removed unused, experimental code (limiting the height of the top-area in EDIT4)

Location:

trunk/EDIT4

Files:

• ED4_base.cxx (modified) (1 diff)
• ED4_manager.cxx (modified) (2 diffs)
• ed4_class.hxx (modified) (1 diff)

trunk/EDIT4/ED4_base.cxx

@@ -1241 +1241 @@
 
     ED4_multi_species_manager *multi_species_manager = NULL;
-
-
-#if defined(LIMIT_TOP_AREA_SPACE)
-    int nr_of_visible_species   = 0;
-    int nr_of_children_in_group = 0;
-    ED4_AREA_LEVEL level = temp_parent->get_area_level(&multi_species_manager);
-    if (level==ED4_A_TOP_AREA || level==ED4_A_BOTTOM_AREA) { // check if there are any unfolding restrictions
-        nr_of_visible_species = multi_species_manager->count_visible_children();
-
-        if (nr_of_visible_species >= MAX_TOP_AREA_SIZE) {
-            aw_message("Top area limited to " MAX_TOP_AREA_SIZE " species\n"
-                       "Advice: Move group to main area and try again");
-            return ED4_R_IMPOSSIBLE;
-        }
-
-        nr_of_children_in_group = temp_parent->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->count_visible_children();
-
-        if (nr_of_children_in_group + nr_of_visible_species - 1 > MAX_TOP_AREA_SIZE) {
-            aw_message("Top area limited to " MAX_TOP_AREA_SIZE " species\n"
-                       "Advice: Move group to main area and try again");
-            return ED4_R_IMPOSSIBLE;
-        }
-    }
-#else // LIMIT_TOP_AREA_SPACE
     temp_parent->get_area_level(&multi_species_manager);
-#endif
 
     for (i=0; i < temp_parent->children->members(); i++) {

trunk/EDIT4/ED4_manager.cxx

@@ -510 +510 @@
     ED4_extension        loc;
 
-#if defined(LIMIT_TOP_AREA_SPACE)
-    int nr_of_visible_species   = 0;
-    int nr_of_children_in_group = 0;
-#endif
-
     if ((mi == NULL) || (mi->object->spec->level <= spec->level)) {
         return (ED4_R_IMPOSSIBLE);
@@ -551 +546 @@
 
         old_parent = object->parent;
-
-#if defined(LIMIT_TOP_AREA_SPACE)
-        if (old_parent->get_area_level() != level) { // when moving between two different areas we have to
-            if (level == ED4_A_TOP_AREA || level == ED4_A_BOTTOM_AREA) { // check restrictions
-                nr_of_visible_species = multi_species_manager->count_visible_children();
-
-                if (nr_of_visible_species >= MAX_TOP_AREA_SIZE) {
-                    return ED4_R_IMPOSSIBLE;
-                }
-
-                if (object->is_group_manager()) {
-                    ED4_group_manager *group_manager = object->to_group_manager();
-
-                    if (object->dynamic_prop & ED4_P_IS_FOLDED) {
-                        nr_of_children_in_group = 1;
-                    }
-                    else {
-                        nr_of_children_in_group = group_manager->get_defined_level(ED4_L_MULTI_SPECIES)->to_multi_species_manager()->count_visible_children();
-                    }
-
-                    if (nr_of_children_in_group + nr_of_visible_species > MAX_TOP_AREA_SIZE) {
-                        return ED4_R_IMPOSSIBLE;
-                    }
-                }
-            }
-        }
-#endif // LIMIT_TOP_AREA_SPACE
 
         x_off = 0;

trunk/EDIT4/ed4_class.hxx

@@ -10 +10 @@
 #ifdef DEBUG
 # define IMPLEMENT_DUMP         // comment out this line to skip compilation of the dump() methods
-#endif
-
-// #define LIMIT_TOP_AREA_SPACE // // if defined, top area is size-limited // @@@ remove this
-#ifdef LIMIT_TOP_AREA_SPACE
-#define MAX_TOP_AREA_SIZE 10    // size limit for top-area
 #endif