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

Python bindings: Rename properties=>defauls, default_format=>format.

Browse source
This commit is contained in:
Hermann Kraus 2012-02-16 00:27:03 +01:00
parent ceda45249f
commit 56004ab181
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
bindings/python/mapnik_text_placement.cpp
View file

@ -230,22 +230,22 @@ void insert_expression(expression_set *set, expression_ptr p)
char_properties & get_format(text_symbolizer const& sym)
{
return sym.get_placement_options()->properties.default_format;
return sym.get_placement_options()->defaults.format;
}
void set_format(text_symbolizer const& sym, char_properties & format)
{
sym.get_placement_options()->properties.default_format = format;
sym.get_placement_options()->defaults.format = format;
}
text_symbolizer_properties & get_properties(text_symbolizer const& sym)
{
return sym.get_placement_options()->properties;
return sym.get_placement_options()->defaults;
}
void set_properties(text_symbolizer const& sym, text_symbolizer_properties & properties)
void set_properties(text_symbolizer const& sym, text_symbolizer_properties & defaults)
{
sym.get_placement_options()->properties = properties;
sym.get_placement_options()->defaults = defaults;
}
}
@ -326,7 +326,7 @@ void export_text_placement()
.def_readwrite("allow_overlap", &text_symbolizer_properties::allow_overlap)
.def_readwrite("text_ratio", &text_symbolizer_properties::text_ratio)
.def_readwrite("wrap_width", &text_symbolizer_properties::wrap_width)
.def_readwrite("default_format", &text_symbolizer_properties::default_format)
.def_readwrite("format", &text_symbolizer_properties::format)
.add_property ("format_tree",
&text_symbolizer_properties::format_tree,
&text_symbolizer_properties::set_format_tree);
@ -359,7 +359,7 @@ void export_text_placement()
boost::shared_ptr<TextPlacementsWrap>,
boost::noncopyable>
("TextPlacements")
.def_readwrite("defaults", &text_placements::properties)
.def_readwrite("defaults", &text_placements::defaults)
.def("get_placement_info", pure_virtual(&text_placements::get_placement_info))
/* TODO: add_expressions() */
;