Changeset 8232 for branches

Timestamp:

21/11/11 14:20:09 (6 months ago)

Author:

westram

Message:

• removed 'length' from ED4_folding_line (all are of infinite length now)

Location:

branches/e4fix/EDIT4

Files:

• ED4_manager.cxx (modified) (2 diffs)
• ED4_root.cxx (modified) (8 diffs)
• ED4_window.cxx (modified) (2 diffs)
• ed4_class.hxx (modified) (4 diffs)

branches/e4fix/EDIT4/ED4_manager.cxx

@@ -1007 +1007 @@
 
             if (flv) {
-                e4_assert(flv->length==INFINITE);
                 x2 = int(flv->window_pos[X_POS]);
                 if (!flv->next && x2==area_rect.r) {
@@ -1026 +1025 @@
 
                 if (flh) {
-                    e4_assert(flh->length==INFINITE);
                     y2 = int(flh->window_pos[Y_POS]);
                     if (!flh->next && y2==area_rect.b) {

branches/e4fix/EDIT4/ED4_root.cxx

@@ -114 +114 @@
     ED4_folding_line *current_fl = vertical_fl;                            // calculate x-offset due to vertical folding lines
     while ((current_fl != NULL) && (x >= current_fl->window_pos[X_POS])) {
-        if ((current_fl->length == INFINITE) ||
-            ((y >= current_fl->window_pos[Y_POS]) && (y <= (current_fl->window_pos[Y_POS] + current_fl->length))))
-        {
-            temp_x += current_fl->dimension;
-        }
+        temp_x += current_fl->dimension;
         current_fl = current_fl->next;
     }
@@ -124 +120 @@
     current_fl = horizontal_fl;                         // calculate y-offset due to horizontal folding lines
     while ((current_fl != NULL) && (y >= current_fl->window_pos[Y_POS])) {
-        if ((current_fl->length == INFINITE) ||
-            ((x >= current_fl->window_pos[X_POS]) && (x <= (current_fl->window_pos[X_POS] + current_fl->length))))
-        {
-            temp_y += current_fl->dimension;
-        }
+        temp_y += current_fl->dimension;
         current_fl = current_fl->next;
     }
@@ -146 +138 @@
     ED4_folding_line *current_fl = vertical_fl;                          // calculate x-offset due to vertical folding lines
     while (current_fl && (x>=current_fl->world_pos[X_POS])) {
-        if ((current_fl->length == INFINITE) ||
-            ((y >= current_fl->world_pos[Y_POS]) && (y <= current_fl->world_pos[Y_POS] + current_fl->length)))
-        {
-            temp_x -= current_fl->dimension;
-        }
+        temp_x -= current_fl->dimension;
         current_fl = current_fl->next;
     }
@@ -156 +144 @@
     current_fl = horizontal_fl;                     // calculate y-offset due to horizontal folding lines
     while (current_fl && (y >= current_fl->world_pos[Y_POS])) {
-        if ((current_fl->length == INFINITE) ||
-            ((x >= current_fl->world_pos[X_POS]) && (x <= (current_fl->world_pos[X_POS] + current_fl->length))))
-        {
-            temp_y -= current_fl->dimension;
-        }
+        temp_y -= current_fl->dimension;
         current_fl = current_fl->next;
     }
@@ -206 +190 @@
     ED4_foldable foldable;
 
-    ED4_folding_line *hor100 = foldable.insert_folding_line(AW::Position(0,   100), INFINITE, 0, ED4_P_HORIZONTAL);
-    ED4_folding_line *ver200 = foldable.insert_folding_line(AW::Position(200, 0),   INFINITE, 0, ED4_P_VERTICAL);
-    ED4_folding_line *hor200 = foldable.insert_folding_line(AW::Position(0,   200), INFINITE, 0, ED4_P_HORIZONTAL);
-    ED4_folding_line *ver300 = foldable.insert_folding_line(AW::Position(300, 100), INFINITE, 0, ED4_P_VERTICAL);
+    ED4_folding_line *hor100 = foldable.insert_folding_line(AW::Position(0,   100), 0, ED4_P_HORIZONTAL);
+    ED4_folding_line *ver200 = foldable.insert_folding_line(AW::Position(200, 0),   0, ED4_P_VERTICAL);
+    ED4_folding_line *hor200 = foldable.insert_folding_line(AW::Position(0,   200), 0, ED4_P_HORIZONTAL);
+    ED4_folding_line *ver300 = foldable.insert_folding_line(AW::Position(300, 100), 0, ED4_P_VERTICAL);
 
     // nothing folded yet
@@ -225 +209 @@
     TEST_ASSERT_WIN_UNFOLDED(400, 250);
 
-    for (int FACTOR = 1; FACTOR <= 100; FACTOR ++) {
+    // for (int FACTOR = 1; FACTOR <= 100; FACTOR ++) {
+    for (int FACTOR = 1; FACTOR <= 100; FACTOR += 7) {
         TEST_ANNOTATE_ASSERT(GBS_global_string("FACTOR=%i", FACTOR));
         int H1 = FACTOR* 10;
@@ -773 +758 @@
     for (const ED4_folding_line *flv=curr_ed4w()->get_vertical_folding(); ; flv = flv->next) {
         if (flv) {
-            e4_assert(flv->length==INFINITE);
             x2 = int(flv->window_pos[X_POS]);
         }
@@ -786 +770 @@
         for (const ED4_folding_line *flh=curr_ed4w()->get_horizontal_folding(); ; flh = flh->next) {
             if (flh) {
-                e4_assert(flh->length==INFINITE);
                 y2 = int(flh->window_pos[Y_POS]);
             }

branches/e4fix/EDIT4/ED4_window.cxx

@@ -95 +95 @@
 
 
-ED4_folding_line* ED4_foldable::insert_folding_line(AW::Position world_pos, AW_pos length, AW_pos dimension, ED4_properties prop) {
+ED4_folding_line* ED4_foldable::insert_folding_line(AW::Position world_pos, AW_pos dimension, ED4_properties prop) {
     ED4_folding_line *fl = NULL;
 
@@ -102 +102 @@
         fl->link      = NULL;
         fl->set_world_pos(world_pos);
-        fl->length    = length;
         fl->dimension = dimension;
 

branches/e4fix/EDIT4/ed4_class.hxx

@@ -285 +285 @@
 };
 
-class ED4_folding_line : virtual Noncopyable {
+class ED4_folding_line : virtual Noncopyable { // @@@ make members private
     // properties of an object, i.e. concerning rectangles on screen showing sequences
     ED4_folding_line(const ED4_folding_line&);      // copy-constructor not allowed
-public:
-    // @@@ make members of ED4_folding_line private 
-    AW_pos            world_pos[2];
-    AW_pos            window_pos[2];
-    AW_pos            length;
-    AW_pos            dimension; // amount of pixel folded away
-    ED4_base         *link;
+
+
+public:
+    AW_pos world_pos[2]; // @@@ what should world_pos be ? it could have a world-range, but no single position
+    AW_pos window_pos[2];
+    AW_pos dimension;    // amount of pixel folded away
+
+    ED4_base *link;
+
     ED4_folding_line *next;
 
@@ -334 +336 @@
     void win_to_world_coords(AW_pos *x, AW_pos *y);
 
-    ED4_folding_line *insert_folding_line(AW::Position pos, AW_pos length, AW_pos dimension, ED4_properties prop);
+    ED4_folding_line *insert_folding_line(AW::Position pos, AW_pos dimension, ED4_properties prop);
     ED4_returncode  delete_folding_line(ED4_folding_line *fl, ED4_properties prop);
 };
@@ -379 +381 @@
     void update_folding_line_positions() {
         scroll_top->set_pos(world.upper_left_corner());
-        if (scroll_top->length != INFINITE) scroll_top->length = world.width();
-
         scroll_bottom->set_world_pos(world.lower_left_corner());
-        if (scroll_bottom->length != INFINITE) scroll_bottom->length = world.width();
-
         scroll_left->set_pos(world.upper_left_corner());
-        if (scroll_left->length != INFINITE) scroll_left->length = world.height();
-
         scroll_right->set_world_pos(world.upper_right_corner());
-        if (scroll_right->length != INFINITE) scroll_right->length = world.height();
     }
 
@@ -487 +482 @@
 
     void create_folding_lines(ED4_foldable& owner, const AW::Rectangle& rect, int area_width, int area_height) {
-        scroll_top  = owner.insert_folding_line(rect.upper_left_corner(), INFINITE, 0, ED4_P_HORIZONTAL);
-        scroll_left = owner.insert_folding_line(rect.upper_left_corner(), INFINITE, 0, ED4_P_VERTICAL);
+        scroll_top  = owner.insert_folding_line(rect.upper_left_corner(), 0, ED4_P_HORIZONTAL);
+        scroll_left = owner.insert_folding_line(rect.upper_left_corner(), 0, ED4_P_VERTICAL);
 
         AW_pos dim = 0;
         if (rect.bottom() > area_height) dim = rect.bottom() - area_height;
-        scroll_bottom = owner.insert_folding_line(rect.lower_left_corner(), INFINITE, dim, ED4_P_HORIZONTAL);
+        scroll_bottom = owner.insert_folding_line(rect.lower_left_corner(), dim, ED4_P_HORIZONTAL);
 
         dim = 0;
         if (rect.right() > area_width) dim = rect.right() - area_width;
-        scroll_right = owner.insert_folding_line(rect.upper_right_corner(), INFINITE, dim, ED4_P_VERTICAL);
+        scroll_right = owner.insert_folding_line(rect.upper_right_corner(), dim, ED4_P_VERTICAL);
     }