Changeset 490 for trunk/src/text_symbolizer.cpp

Timestamp:

07/02/07 09:39:08 (3 years ago)

Author:

vspader

Message:

Added minimum_distance property to text symbolizers. This prevents the same label from appearing within N pixels (across features).
Shield symbolizer is now a subclass of text symbolizer.
Some small improvements to text rendering.
Fixed up placement finder for horizontal placement.
Cleaned up placement finder.

Files:

• trunk/src/text_symbolizer.cpp (modified) (6 diffs)

trunk/src/text_symbolizer.cpp

@@ -23 +23 @@
 //$Id$
 
-
+//stl
 #include <iostream>
-
+// boost
+#include <boost/scoped_ptr.hpp>
+//mapnik
 #include <mapnik/text_symbolizer.hpp>
 
@@ -31 +33 @@
 {
     text_symbolizer::text_symbolizer(std::string const& name, std::string const& face_name, unsigned size,Color const& fill)
-        : name_(name),
+        : name_(name),
           face_name_(face_name),
-          size_(size),
+          size_(size),
           text_ratio_(0),
           wrap_width_(0),
@@ -40 +42 @@
           force_odd_labels_(false),
           max_char_angle_delta_(0),
-          fill_(fill),
-          halo_fill_(Color(255,255,255)),
-          halo_radius_(0),
-          label_p_(point_placement),
-          anchor_(0.0,0.5),
-          displacement_(0.0,0.0),
+          fill_(fill),
+          halo_fill_(Color(255,255,255)),
+          halo_radius_(0),
+          label_p_(point_placement),
+          anchor_(0.0,0.5),
+          displacement_(0.0,0.0),
           avoid_edges_(false),
+          minimum_distance_(0.0),
           overlap_(false) {}
-           
     text_symbolizer::text_symbolizer(text_symbolizer const& rhs)
         : name_(rhs.name_),
@@ -66 +68 @@
           displacement_(rhs.displacement_),
           avoid_edges_(rhs.avoid_edges_),
+          minimum_distance_(rhs.minimum_distance_),
           overlap_(rhs.overlap_) {}
    
@@ -88 +91 @@
         displacement_ = other.displacement_; 
         avoid_edges_ = other.avoid_edges_;
+        minimum_distance_ = other.minimum_distance_;
         overlap_ = other.overlap_;
+
         return *this;
     } 
@@ -231 +236 @@
     }
 
-   void text_symbolizer::set_allow_overlap(bool overlap)
-   {
-      overlap_ = overlap;
-   }
+    double text_symbolizer::get_minimum_distance() const
+    {
+        return minimum_distance_;
+    }
+    
+    void text_symbolizer::set_minimum_distance(double distance)
+    {
+        minimum_distance_ = distance;
+    }
+
+    void text_symbolizer::set_allow_overlap(bool overlap)
+    {
+       overlap_ = overlap;
+    }
    
-   bool text_symbolizer::get_allow_overlap() const
-   {
+    bool text_symbolizer::get_allow_overlap() const
+    {
       return overlap_;
-   }
+    }
 }