artemp
18554ec0b1
remove static_visitor usage and rely on automatic result type deduction
...
(NOTE: expression_evaluator requires ```using result_type = T1;``` )
Conflicts:
src/image.cpp
2015-01-07 11:39:06 +01:00
artemp
38da080f82
make concrete image_data type names more expressive and explicit about color channels/depth:
...
image_data_32 -> image_data_rgba8
image_data_8 -> image_data_gray8
image_data_16 -> image_data_gray16
image_data_float32 -> image_data_gray32f
NOTE: currently image_data_gray16::pixel_type = std::int16_t (signed 16 bit int) to match GDAL
should we support unsigned types?
2014-12-04 11:02:42 +01:00
artemp
333965b588
update copyright year
2014-11-20 15:25:50 +01:00
artemp
f686d3de1b
update dejavu-fonts-ttf path (v 2.34)
2014-10-23 11:35:20 +01:00
Dane Springmeyer
4621fd6445
fix srs in c++ demo
2014-10-23 00:15:33 -07:00
Dane Springmeyer
520bab27be
remove pycairo from python demo - closes #2533
2014-10-23 00:15:19 -07:00
Dane Springmeyer
aae4a20ec9
fix various -Wunused-parameter warnings
2014-10-21 20:23:17 -07:00
Dane Springmeyer
c26c60e48e
remove set_old_style_expression
2014-10-09 20:51:43 -07:00
artemp
7c5cdc8e2c
fix viewer compilation
2014-10-01 14:07:27 +01:00
Dane Springmeyer
822d3a5bce
break apart symbolizer.hpp + fwd declars + svg output grammar impl
2014-09-30 12:50:08 -07:00
Dane Springmeyer
492e084714
add copy ctor to rule: avoids last copy of syms in load_map - closes #1293
2014-09-04 22:03:54 -07:00
artemp
1ac0ebdd83
rename coord_transform to transform_path_adapter and move implementation into separate header
2014-08-28 10:59:08 +01:00
artemp
ecfaec1027
rename ctrans.hpp to view_transform.hpp
2014-08-28 10:29:04 +01:00
artemp
de22d5900c
rename CoordTransform to view_transform to better reflect its purpose and be consistent
2014-08-28 10:17:15 +01:00
artemp
455168c6af
topojson - use bulk-loading packing algorithm for rtree creation
...
(http://www.boost.org/doc/libs/1_56_0/libs/geometry/doc/html/geometry/spatial_indexes/introduction.html )
use unique_ptr where appropriate
2014-08-21 11:14:33 +01:00
artemp
95cea92a4a
convert all boost::variant to util::variant
...
apart from topojson (TODO)
2014-08-12 13:40:45 +01:00
artemp
27ee642bbe
fix cairo_renderer usage in demo/viewer + revert aac69d0b34
2014-08-11 13:40:12 +01:00
Dane Springmeyer
868885a52d
update python rundemo.py - refs #2324
2014-07-30 16:51:12 -07:00
artemp
8502019310
more format_properties expessions
2014-07-23 18:09:18 +01:00
artemp
e67f046a0e
start re-factoring char_property (TODO: change name!)
2014-07-23 16:19:14 +01:00
artemp
4afd98a34a
text_properties : store 'orientation' parameter in symbolizer_base::value_type
2014-07-11 14:43:56 +01:00
artemp
81f7e69088
coord_arrat<T> : add support for range based for loop interface
...
update wkb parser to use it ^^
2014-07-08 16:22:24 +01:00
artemp
fe215a684e
c++11 style : replace (almost) all typedef with type alias's
2014-07-07 18:23:15 +01:00
Dane Springmeyer
d0b357cab7
scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging
2014-06-09 13:55:56 -07:00
artemp
b6bab7d0bb
move cairo renderer into its own subdir
2014-06-06 13:38:00 +01:00
Dane Springmeyer
8c1e69fdb8
static grammars
...
- construct on first use
- allows for faster map loading and unloading of xml loading tree
- modified expression and transform grammars to not take args/not crash
- simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -07:00
Dane Springmeyer
ef837eb92f
c++11 optimizations for faster map loading
2014-04-28 17:10:00 -07:00
artemp
7267874cdd
use mapnik::auto_cpu_timer
2013-12-02 10:14:11 +00:00
artemp
f454a45092
c++11 : use std::chrono
2013-12-02 09:52:08 +00:00
Dane Springmeyer
e9ca9c8790
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
Dane Springmeyer
08fa9fd8ec
Merge branch '2.3.x' of github.com:mapnik/mapnik
...
Conflicts:
bindings/python/mapnik_building_symbolizer.cpp
bindings/python/mapnik_debug_symbolizer.cpp
bindings/python/mapnik_line_pattern_symbolizer.cpp
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_markers_symbolizer.cpp
bindings/python/mapnik_point_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
bindings/python/mapnik_python.cpp
bindings/python/mapnik_raster_symbolizer.cpp
bindings/python/mapnik_shield_symbolizer.cpp
bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
Dane Springmeyer
d0619bc402
update copyright year for scons build files
2013-11-05 16:54:13 -08:00
Dane Springmeyer
0d58a8aee4
merge with 2.3.x
2013-10-28 14:45:52 -07:00
Dane Springmeyer
86dfa0778a
fix cairo reference counting and add more cairo context tests - closes #2031
2013-10-28 12:46:44 -07:00
Dane Springmeyer
986f47e959
remove demo/test files which were moved to tests/python_tests in c84ddc825e - refs #1460
2013-10-25 19:01:09 -07:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
artemp
3edfc69c81
== c++11
...
use std::tuple with std::get<>
2013-10-11 12:36:04 +01:00
artemp
09ce29489e
use const std::unique_ptr<> instead of boost::scoped_ptr<>
2013-09-20 14:22:58 +01:00
artemp
62af2e6765
+ replace <boost/shared_ptr.hpp> with <memory>
2013-09-20 14:13:23 +01:00
artemp
b315eb2167
+ use std::shared_ptr and std::make_shared
2013-09-20 14:01:27 +01:00
Dane Springmeyer
9bd3dd0e21
fix viewer compile
2013-09-19 18:39:44 -07:00
Dane Springmeyer
9f5b7f3fb0
improve the c++ and python demo apps to conditionally output image formats
2013-09-18 14:32:43 -07:00
Dane Springmeyer
580ad4fb07
viewer: leverage mapnik-config --cxx for QMAKE_CXX and QMAKE_LINK
2013-09-18 12:32:08 -07:00
Dane Springmeyer
844baa8c5b
scons: when linking statically on linux always link -ldl
2013-07-30 02:51:07 -04:00
Dane Springmeyer
4f01eb05b1
scons: correctly propagate DEFINES across builds
2013-07-23 20:03:00 -04:00
Dane Springmeyer
0f8ecc2ed3
scons: static linking on linux needs -dl for executables
2013-07-14 15:17:32 -04:00
Dane Springmeyer
39eee919e5
link mapnik first (needed static linking on linux)
2013-07-14 13:00:53 -04:00
Dane Springmeyer
0365d3e081
start centralizing filesystem operations in mapnik::util::fs - refs #1177
2013-06-02 19:28:24 -07:00
Dane Springmeyer
db7e5919d2
Fix example of building vs files with gyp on windows
2013-05-24 14:29:11 -06:00
Dane Springmeyer
d1d688bb8a
fix typo
2013-05-24 13:26:52 -07:00
Dane Springmeyer
47e62804be
rundemo.gyp now working on windows
2013-05-23 00:46:55 -07:00
Dane Springmeyer
9ede00abf8
rundemo standalone build fixes
2013-05-23 00:15:18 -07:00
Dane Springmeyer
5239bef595
add details for how to build rundemo.cpp standalone on windows with gyp
2013-05-22 23:23:11 -07:00
Dane Springmeyer
c84ddc825e
convert old tests into proper python tests - closes #1460
2013-05-16 12:23:19 -07:00
artemp
4775428dc0
+ move to QT 5.x (requirement!)
2013-05-16 16:28:08 +01:00
Dane Springmeyer
ca1171aa80
no need to cache config error specifically
2013-05-09 18:12:49 -07:00
Dane Springmeyer
e2c7283522
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
2013-03-13 19:49:59 -07:00
artemp
f7a726445e
+ log rendering times
2013-02-27 10:01:39 -05:00
artemp
c0710c7b14
+ update viewer.pro to use cxxflags
2013-02-27 10:01:39 -05:00
artemp
45fa7e30c7
+ update viewer
2013-02-21 10:39:02 +00:00
Dane Springmeyer
47ab9913ee
make consistent the proj4 string used for spherical mercator across tests and docs
2013-01-28 13:48:13 -05:00
artemp
9659349d8a
+ c++ demo: use the same map/layer srs settings as in Python demo
2013-01-11 14:50:49 +00:00
artemp
b45a5aa76a
+ use the same halo fill rgb(255,255,200) in both c++ and python demos
2013-01-10 20:51:36 +00:00
artemp
4a07a62bfd
+ use proper mapnik installation path aka prefix
...
```./rundemo /usr/local```
2013-01-10 20:48:56 +00:00
Dane Springmeyer
bb43f2cec1
refactor params interface to move lexical cast out of header
2013-01-09 19:12:20 -08:00
Dane Springmeyer
f135bd325e
fix compile of rundemo - now using new cairo internal interface that drops cairomm depedency
2013-01-09 12:48:05 -08:00
artemp
f25d4d9279
+ implement cairo_context wrapper and remove unnecessary dependencies
...
( cairomm, libsigc++)
2013-01-09 17:00:30 +00:00
Dane Springmeyer
3378166b64
iwyu
2013-01-03 18:58:44 -08:00
artemp
f7ad2f18fa
+ commenting out grid rendering - not sure how to display 'long long' values.
2013-01-02 15:39:36 +00:00
Dane Springmeyer
bb27156df0
use internal noncopyable class to speed up compile times slightly
2012-12-16 18:19:52 -08:00
Dane Springmeyer
ccda92fed1
Revert "finish moving symbolizers out of rule"
...
This reverts commit 20a317860d
2012-10-10 10:51:06 -07:00
Dane Springmeyer
20a317860d
finish moving symbolizers out of rule
2012-10-10 10:02:45 -07:00
Hermann Kraus
99265b22ac
Add simple render script.
2012-09-10 02:42:59 +02:00
artemp
967d6110bf
+ singleton: return ref from instance() method
2012-09-07 16:23:03 +01:00
Dane Springmeyer
28063e28aa
update the demo/tests - refs #1460
2012-09-03 15:33:14 -07:00
Colin Rundel
dc3763885c
More parser clean up - color parser
...
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Dane Springmeyer
ac418a7d4e
remote the last references
2012-08-27 16:43:40 -07:00
Dane Springmeyer
d9fa1cb0c2
remove old $ cruft
2012-08-24 13:49:28 -07:00
Dane Springmeyer
6c254999ae
rundemo.cpp - no need to link to boost_program_options - closes #1406
2012-08-17 09:32:55 -07:00
artemp
1b92d81459
+ add missing header
2012-08-16 10:41:48 +01:00
Dane Springmeyer
e95886f327
catch exceptions upon startup
2012-07-31 10:45:38 -07:00
Dane Springmeyer
b4f3d6da11
include what you use
2012-07-24 18:35:41 -07:00
artemp
7b10400be9
+ update rendering code to work with new labeling methods
...
+ rename num_points() to size()
+ rename get_vertex() to vertex()
2012-07-19 16:36:44 +01:00
artemp
6cde3e6864
+ add scale_factor_ UI (QDoubleSpinBox)
2012-07-10 16:58:43 +01:00
Dane Springmeyer
b365923772
use clang++ and mapnik-config by default to build viewer
2012-07-06 12:58:42 -07:00
Dane Springmeyer
d8c719f05e
finish exposing scale_factor to cairo_renderer
2012-07-05 14:54:58 -07:00
Artem Pavlenko
6a4c207254
+ make it compile against latyest master (FIXME)
2012-06-07 11:46:50 +01:00
Carl Simonson
c696c85dd4
viewer: add mouse wheel zooming
...
This change makes the viewer zoom in and out when using the scroll wheel.
The zoom tracks the position of the mouse pointer when zooming in so that
the map will be centered under the mouse after a zoom.
2012-05-31 19:27:19 -05:00
Carl Simonson
963cd83f98
viewer: show more exception messages
...
When trying to render the map widget in the viewer, we catch exceptions
and print out the message to stderr. The only exceptions that are printed
are mapnik::config_error messages. mapnik can throw more errors, so this
change makes it catch all std::exceptions.
2012-05-31 18:11:10 -05:00
Artem Pavlenko
500f57cf60
+ make vertex() and rewind() methods const
...
+ remove unused coord_transforms
+ rename coord_transform2 to coord_transform
2012-05-31 12:13:09 +01:00
Artem Pavlenko
1077b79a63
Revert "initialise blur radius's to 1 for real this time"
...
This reverts commit f76c6ee25f
2012-05-24 11:37:24 +01:00
Artem Pavlenko
f76c6ee25f
initialise blur radius's to 1 for real this time
2012-05-23 20:38:42 +01:00
Artem Pavlenko
aad7c5e384
+ implement compositing for text
...
+ refactor image_32
2012-05-09 12:39:23 +01:00
Artem Pavlenko
b5721181cd
+ experimental grid vis (TODO: assigned pallete colours)
...
useful to testing grid output
2012-05-03 17:18:02 +01:00
Artem Pavlenko
0bec7f56d3
+ support multiple renderers
...
+ add QComboBox to switch between renderers
2012-05-03 15:21:17 +01:00
Artem Pavlenko
a72ee4ba66
Merge branch 'master' into compositing
...
Conflicts:
include/mapnik/image_compositing.hpp
include/mapnik/util/conversions.hpp
include/mapnik/value.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/png_reader.cpp
src/svg_parser.cpp
utils/svg2png/svg2png.cpp
2012-05-01 12:35:49 +01:00
Artem Pavlenko
ad16d5da33
work-around: QT moc compiler bug
2012-04-18 12:15:50 +01:00
Dane Springmeyer
3e3bdf6607
compile rundemo even during install
2012-04-04 15:18:28 -07:00
Dane Springmeyer
b5af9e3639
use default env compiler
2012-04-04 15:17:52 -07:00
Dane Springmeyer
d6c4e7f7fc
fix encoding of rundemo.cpp (windows1 -> utf8) and correctly declare the encoding of the boundaries shapefile (fixing white background to be green)
2012-04-04 15:17:37 -07:00
