Changeset 8202 for branches

Timestamp:

05/11/11 15:57:36 (7 months ago)

Author:

westram

Message:

• world_to_win_coords / win_to_world_coords
  • aligned to each other
  • fix a "bug" in win_to_world_coords
    • comparison in loop-condition now against window_pos (not world_pos)
      • no difference on first folding-line in each direction
      • the only "non-first" folding line is the bottom-line
    • no idea if that "bug" had any effect, didnt find any

Location:

branches/e4fix/EDIT4

Files:

• ED4_root.cxx (modified) (5 diffs)
• ed4_class.hxx (modified) (1 diff)

branches/e4fix/EDIT4/ED4_root.cxx

@@ -104 +104 @@
 
 
-void ED4_window::win_to_world_coords(AW_pos *x, AW_pos *y) {
+void ED4_window::win_to_world_coords(AW_pos *xPtr, AW_pos *yPtr) {
     // calculates transformation from window to world coordinates in a given window
-    AW_pos temp_x = *x;
-    AW_pos temp_y = *y;
+    const AW_pos x = *xPtr;
+    const AW_pos y = *yPtr;
+
+    AW_pos temp_x = x;
+    AW_pos temp_y = y;
 
     ED4_folding_line *current_fl = vertical_fl;                            // calculate x-offset due to vertical folding lines
-    while ((current_fl != NULL) && (*x >= current_fl->world_pos[X_POS]))
-    {
+    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))))
+            ((y >= current_fl->window_pos[Y_POS]) && (y <= (current_fl->window_pos[Y_POS] + current_fl->length))))
         {
             temp_x += current_fl->dimension;
@@ -121 +123 @@
 
     current_fl = horizontal_fl;                         // calculate y-offset due to horizontal folding lines
-    while ((current_fl != NULL) && (*y >= current_fl->world_pos[Y_POS])) {
+    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))))
+            ((x >= current_fl->window_pos[X_POS]) && (x <= (current_fl->window_pos[X_POS] + current_fl->length))))
         {
             temp_y += current_fl->dimension;
@@ -130 +132 @@
     }
 
-    *x = temp_x;
-    *y = temp_y;
+    *xPtr = temp_x;
+    *yPtr = temp_y;
 }
 
 void ED4_window::world_to_win_coords(AW_pos *xPtr, AW_pos *yPtr) {
     // calculates transformation from world to window coordinates in a given window
-    AW_pos x = *xPtr;
-    AW_pos y = *yPtr;
+    const AW_pos x = *xPtr;
+    const AW_pos y = *yPtr;
 
     AW_pos temp_x = x;
@@ -145 +147 @@
     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)))
+            ((y >= current_fl->world_pos[Y_POS]) && (y <= current_fl->world_pos[Y_POS] + current_fl->length)))
         {
             temp_x -= current_fl->dimension;
@@ -156 +157 @@
     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))))
+            ((x >= current_fl->world_pos[X_POS]) && (x <= (current_fl->world_pos[X_POS] + current_fl->length))))
         {
             temp_y -= current_fl->dimension;

branches/e4fix/EDIT4/ed4_class.hxx

@@ -291 +291 @@
     AW_pos            window_pos[2];
     AW_pos            length;
-    AW_pos            dimension;
+    AW_pos            dimension; // amount of pixel folded away
     ED4_base         *link;
     ED4_folding_line *next;
 
     ED4_folding_line();
+
+    
 };