Changeset 669 for trunk

Timestamp:

03/17/08 17:04:22 (8 months ago)

Author:

artem

Message:

fixed line_pattern_symbolizer transformations

Files:

• trunk/src/cairo_renderer.cpp (modified) (4 diffs)

trunk/src/cairo_renderer.cpp

@@ -82 +82 @@
             delete [] data_;
          }
+         
+         void set_matrix(Cairo::Matrix const& matrix)
+         {
+            pattern_->set_matrix(matrix);
+         }
 
          void set_origin(double x, double y)
          {
             Cairo::Matrix matrix;
-
+            
             pattern_->get_matrix(matrix);
-
+     
             matrix.x0 = -x;
             matrix.y0 = -y;
-
+            
             pattern_->set_matrix(matrix);
          }
-
-         void set_angle(double angle)
-         {
-            Cairo::Matrix matrix;
-
-            pattern_->get_matrix(matrix);
-
-            cairo_matrix_invert(&matrix);
-
-            matrix.xx = cos(angle);
-            matrix.xy = sin(angle);
-            matrix.yx = -sin(angle);
-            matrix.yy = cos(angle);
-
-            cairo_matrix_invert(&matrix);
-
-            pattern_->set_matrix(matrix);
-         }
-
+         
          void set_extend(Cairo::Extend extend)
          {
@@ -814 +801 @@
                                     proj_transform const& prj_trans)
    {
-#ifdef CAIRO_LINE_PATTERN
+//#ifdef CAIRO_LINE_PATTERN
       typedef coord_transform2<CoordTransform,geometry2d> path_type;
 
@@ -847 +834 @@
                else if (cm == SEG_LINETO)
                {
-                  double angle = atan2(y0 - y, x - x0);
+                  double dx = x - x0;
+                  double dy = y - y0;
+                  double angle = atan2(dy, dx);
                   double offset = fmod(length, width);
-                  double xoff = height / 2.0 * sin(angle) - offset * cos(angle);
-                  double yoff = height / 2.0 * cos(angle) + offset * sin(angle);
-
-                  pattern.set_origin(x0 + xoff, y0 - yoff);
-                  pattern.set_angle(angle);
+                  
+                  Cairo::Matrix matrix;
+                  cairo_matrix_init_identity(&matrix);
+                  cairo_matrix_translate(&matrix,x0,y0);
+                  cairo_matrix_rotate(&matrix,angle);
+                  cairo_matrix_translate(&matrix,-offset,0.5*height);
+                  cairo_matrix_invert(&matrix);
+
+                  pattern.set_matrix(matrix);
+     
                   context.set_pattern(pattern);
-
+                  
                   context.move_to(x0, y0);
                   context.line_to(x, y);
@@ -868 +862 @@
          }
       }
-#endif
+//#endif
    }