Changeset 743

Timestamp:

09/19/08 04:27:32 (4 months ago)

Author:

artem

Message:

+ point symbolizer opacity patch from Brian (openstreetmap@…)

Location:

trunk

Files:

• bindings/python/mapnik_point_symbolizer.cpp (modified) (1 diff)
• include/mapnik/point_symbolizer.hpp (modified) (1 diff)
• src/agg_renderer.cpp (modified) (1 diff)
• src/load_map.cpp (modified) (2 diffs)
• src/point_symbolizer.cpp (modified) (2 diffs)

trunk/bindings/python/mapnik_point_symbolizer.cpp

@@ -37 +37 @@
               &point_symbolizer::get_allow_overlap,
               &point_symbolizer::set_allow_overlap)
+        .add_property("opacity",
+              &point_symbolizer::get_opacity,
+              &point_symbolizer::set_opacity)
         ;
 }

trunk/include/mapnik/point_symbolizer.hpp

@@ -41 +41 @@
         void set_allow_overlap(bool overlap);
         bool get_allow_overlap() const;
+        void set_opacity(float opacity)
+        {
+            opacity_ = opacity;
+        }
+        float get_opacity() const
+        {
+            return opacity_;
+        }
         
     private:
+        float opacity_;
         bool overlap_;
     };

trunk/src/agg_renderer.cpp

@@ -443 +443 @@
                 detector_.has_placement(label_ext))
             {    
-               pixmap_.set_rectangle_alpha(px,py,*data);
+               pixmap_.set_rectangle_alpha2(*data,px,py,sym.get_opacity());
                detector_.insert(label_ext);
             }

trunk/src/load_map.cpp

@@ -525 +525 @@
             optional<boolean> allow_overlap = 
                 get_opt_attr<boolean>(sym, "allow_overlap");
+            optional<float> opacity = 
+                get_opt_attr<float>(sym, "opacity");
 
             optional<unsigned> width = get_opt_attr<unsigned>(sym, "width"); 
@@ -546 +548 @@
                       symbol.set_allow_overlap( * allow_overlap );
                    }
+                   if (opacity)
+                   {
+                      symbol.set_opacity( * opacity );
+                   }                    
                    rule.append(symbol);
                 }

trunk/src/point_symbolizer.cpp

@@ -36 +36 @@
     point_symbolizer::point_symbolizer()
         : symbolizer_with_image(boost::shared_ptr<ImageData32>(new ImageData32(4,4))),
-          overlap_(false)
+          overlap_(false),
+          opacity_(1.0)
     {
         //default point symbol is black 4x4px square
@@ -46 +47 @@
                                        unsigned width,unsigned height) 
         : symbolizer_with_image(file, type, width, height),
-          overlap_(false)
+          overlap_(false),
+          opacity_(1.0)
     { }
     
     point_symbolizer::point_symbolizer(point_symbolizer const& rhs)
         : symbolizer_with_image(rhs),
-          overlap_(rhs.overlap_)
+          overlap_(rhs.overlap_),
+          opacity_(rhs.opacity_)
     {}