sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fixes.

Browse source
This commit is contained in:
Hermann Kraus 2012-01-22 03:32:21 +01:00
parent 7d03b46079
commit 7fd9fb0c88
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/mapnik/text_placements.hpp
View file

@ -123,13 +123,11 @@ class text_placement_info : boost::noncopyable
public: public:
text_placement_info(text_placements const* parent); text_placement_info(text_placements const* parent);
/** Get next placement. /** Get next placement.
* This function is also called before the first placement is tried. */ * This function is also called before the first placement is tried.
virtual bool next()=0;
/** Get next placement position.
* This function is also called before the first position is used.
* Each class has to return at least one position! * Each class has to return at least one position!
* If this functions returns false the placement data should be considered invalid! * If this functions returns false the placement data should be considered invalid!
*/ */
virtual bool next()=0;
virtual bool next_position_only() { return false; } virtual bool next_position_only() { return false; }
virtual ~text_placement_info() {} virtual ~text_placement_info() {}
void init(double scale_factor_, void init(double scale_factor_,
@ -164,8 +162,7 @@ typedef boost::shared_ptr<text_placement_info> text_placement_info_ptr;
class text_placements class text_placements
{ {
public: public:
text_placements() : text_placements();
text_size_(10), halign_(H_MIDDLE), jalign_(J_MIDDLE), valign_(V_MIDDLE) {}
virtual text_placement_info_ptr get_placement_info() const =0; virtual text_placement_info_ptr get_placement_info() const =0;
virtual void set_default_text_size(float size) { text_size_ = size; } virtual void set_default_text_size(float size) { text_size_ = size; }

4
src/text_placements.cpp
View file

@ -312,11 +312,9 @@ void char_properties::to_xml(boost::property_tree::ptree &node, bool explicit_de
/************************************************************************/ /************************************************************************/
#if 0
text_placements::text_placements() : properties() text_placements::text_placements() : properties()
{ {
} }
#endif
std::set<expression_ptr> text_placements::get_all_expressions() std::set<expression_ptr> text_placements::get_all_expressions()
{ {
@ -444,7 +442,7 @@ text_placement_info_ptr text_placements_simple::get_placement_info() const
return text_placement_info_ptr(new text_placement_info_simple(this)); return text_placement_info_ptr(new text_placement_info_simple(this));
} }
/** Positiion string: [POS][SIZE] /** Position string: [POS][SIZE]
* [POS] is any combination of * [POS] is any combination of
* N, E, S, W, NE, SE, NW, SW, X (exact position) (separated by commas) * N, E, S, W, NE, SE, NW, SW, X (exact position) (separated by commas)
* [SIZE] is a list of font sizes, separated by commas. The first font size * [SIZE] is a list of font sizes, separated by commas. The first font size