From 7f57119dbd7139225f328bd009e21f55886cfaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek=20=5BXificurk=5D?= Date: Wed, 19 Oct 2011 23:45:24 +0200 Subject: [PATCH] code cleanup --- include/mapnik/ctrans.hpp | 197 +++++++++++++++++++------------------- 1 file changed, 98 insertions(+), 99 deletions(-) diff --git a/include/mapnik/ctrans.hpp b/include/mapnik/ctrans.hpp index e18e80fd8..04b33f178 100644 --- a/include/mapnik/ctrans.hpp +++ b/include/mapnik/ctrans.hpp @@ -1,5 +1,5 @@ /***************************************************************************** - * + * * This file is part of Mapnik (c++ mapping toolkit) * * Copyright (C) 2006 Artem Pavlenko @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * *****************************************************************************/ - -//$Id: ctrans.hpp 39 2005-04-10 20:39:53Z pavlenko $ +//$Id$ #ifndef CTRANS_HPP #define CTRANS_HPP @@ -32,78 +31,72 @@ #include #include -namespace mapnik { +namespace mapnik +{ + typedef coord_array CoordinateArray; - -template + + +template struct MAPNIK_DECL coord_transform { coord_transform(Transform const& t, Geometry& geom) : t_(t), geom_(geom) {} - - unsigned vertex(double *x , double *y) const + + unsigned vertex(double *x, double *y) const { - unsigned command = geom_.vertex(x,y); - t_.forward(x,y); + unsigned command = geom_.vertex(x, y); + t_.forward(x, y); return command; } - - void rewind (unsigned pos) + + void rewind(unsigned pos) { geom_.rewind(pos); } - + private: Transform const& t_; Geometry& geom_; }; -template + +template struct MAPNIK_DECL coord_transform2 { typedef std::size_t size_type; typedef typename Geometry::value_type value_type; - coord_transform2(Transform const& t, - Geometry const& geom, + coord_transform2(Transform const& t, + Geometry const& geom, proj_transform const& prj_trans) - : t_(t), - geom_(geom), + : t_(t), + geom_(geom), prj_trans_(prj_trans) {} - - unsigned vertex(double * x , double * y) const + + unsigned vertex(double *x, double *y) const { - unsigned command(SEG_MOVETO); + unsigned command = SEG_MOVETO; bool ok = false; bool skipped_points = false; - while (!ok) + double z = 0; + while (!ok && command != SEG_END) { - command = geom_.vertex(x,y); - double z=0; - ok = prj_trans_.backward(*x,*y,z); + command = geom_.vertex(x, y); + ok = prj_trans_.backward(*x, *y, z); if (!ok) { skipped_points = true; } - ok = ok || (command == SEG_END); } if (skipped_points && (command == SEG_LINETO)) { command = SEG_MOVETO; } - t_.forward(x,y); + t_.forward(x, y); return command; } - /*unsigned vertex(double * x , double * y) const - { - unsigned command = geom_.vertex(x,y); - double z=0; - prj_trans_.backward(*x,*y,z); - t_.forward(x,y); - return command; - }*/ - - void rewind (unsigned pos) + void rewind(unsigned pos) { geom_.rewind(pos); } @@ -112,42 +105,42 @@ struct MAPNIK_DECL coord_transform2 { return geom_; } - + private: Transform const& t_; Geometry const& geom_; proj_transform const& prj_trans_; }; - -template + +template struct MAPNIK_DECL coord_transform3 { - coord_transform3(Transform const& t, - Geometry const& geom, + coord_transform3(Transform const& t, + Geometry const& geom, proj_transform const& prj_trans, int dx, int dy) - : t_(t), - geom_(geom), + : t_(t), + geom_(geom), prj_trans_(prj_trans), dx_(dx), dy_(dy) {} - - unsigned vertex(double * x , double * y) const + + unsigned vertex(double *x, double *y) const { - unsigned command = geom_.vertex(x,y); - double z=0; - prj_trans_.backward(*x,*y,z); - t_.forward(x,y); - *x+=dx_; - *y+=dy_; + unsigned command = geom_.vertex(x, y); + double z = 0; + prj_trans_.backward(*x, *y, z); + t_.forward(x, y); + *x += dx_; + *y += dy_; return command; } - - void rewind (unsigned pos) + + void rewind(unsigned pos) { geom_.rewind(pos); } - + private: Transform const& t_; Geometry const& geom_; @@ -155,7 +148,8 @@ private: int dx_; int dy_; }; - + + class CoordTransform { private: @@ -166,71 +160,74 @@ private: box2d extent_; double offset_x_; double offset_y_; + public: - CoordTransform(int width,int height,const box2d& extent, + CoordTransform(int width, int height, const box2d& extent, double offset_x = 0, double offset_y = 0) - :width_(width),height_(height),extent_(extent),offset_x_(offset_x),offset_y_(offset_y) + : width_(width), height_(height), extent_(extent), + offset_x_(offset_x), offset_y_(offset_y) { - sx_ = (double(width_))/extent_.width(); - sy_ = (double(height_))/extent_.height(); + sx_ = double(width_) / extent_.width(); + sy_ = double(height_) / extent_.height(); } - + inline int width() const { return width_; } - + inline int height() const { return height_; } - + inline double scale_x() const { return sx_; } - + inline double scale_y() const { return sy_; } - - inline void forward(double * x, double * y) const + + inline void forward(double *x, double *y) const { *x = (*x - extent_.minx()) * sx_ - offset_x_; *y = (extent_.maxy() - *y) * sy_ - offset_y_; } - - inline void backward(double * x, double * y) const + + inline void backward(double *x, double *y) const { - *x = extent_.minx() + (*x + offset_x_)/sx_; - *y = extent_.maxy() - (*y + offset_y_)/sy_; + *x = extent_.minx() + (*x + offset_x_) / sx_; + *y = extent_.maxy() - (*y + offset_y_) / sy_; } - + inline coord2d& forward(coord2d& c) const { - forward(&c.x,&c.y); - return c; - } - - inline coord2d& backward(coord2d& c) const - { - backward(&c.x,&c.y); + forward(&c.x, &c.y); return c; } - inline box2d forward(const box2d& e,proj_transform const& prj_trans) const + inline coord2d& backward(coord2d& c) const + { + backward(&c.x, &c.y); + return c; + } + + inline box2d forward(const box2d& e, + proj_transform const& prj_trans) const { double x0 = e.minx(); double y0 = e.miny(); double x1 = e.maxx(); double y1 = e.maxy(); double z = 0.0; - prj_trans.backward(x0,y0,z); - forward(&x0,&y0); - prj_trans.backward(x1,y1,z); - forward(&x1,&y1); - return box2d(x0,y0,x1,y1); + prj_trans.backward(x0, y0, z); + forward(&x0, &y0); + prj_trans.backward(x1, y1, z); + forward(&x1, &y1); + return box2d(x0, y0, x1, y1); } inline box2d forward(const box2d& e) const @@ -239,23 +236,24 @@ public: double y0 = e.miny(); double x1 = e.maxx(); double y1 = e.maxy(); - forward(&x0,&y0); - forward(&x1,&y1); - return box2d(x0,y0,x1,y1); + forward(&x0, &y0); + forward(&x1, &y1); + return box2d(x0, y0, x1, y1); } - inline box2d backward(const box2d& e,proj_transform const& prj_trans) const + inline box2d backward(const box2d& e, + proj_transform const& prj_trans) const { double x0 = e.minx(); double y0 = e.miny(); double x1 = e.maxx(); double y1 = e.maxy(); double z = 0.0; - backward(&x0,&y0); - prj_trans.forward(x0,y0,z); - backward(&x1,&y1); - prj_trans.forward(x1,y1,z); - return box2d(x0,y0,x1,y1); + backward(&x0, &y0); + prj_trans.forward(x0, y0, z); + backward(&x1, &y1); + prj_trans.forward(x1, y1, z); + return box2d(x0, y0, x1, y1); } inline box2d backward(const box2d& e) const @@ -264,28 +262,29 @@ public: double y0 = e.miny(); double x1 = e.maxx(); double y1 = e.maxy(); - backward(&x0,&y0); - backward(&x1,&y1); - return box2d(x0,y0,x1,y1); + backward(&x0, &y0); + backward(&x1, &y1); + return box2d(x0, y0, x1, y1); } inline CoordinateArray& forward(CoordinateArray& coords) const { - for (unsigned i=0;i const& extent() const { return extent_;