[magics] 02/04: Merge tag 'upstream/2.32.0' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Thu Apr 20 14:06:56 UTC 2017


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 41052818da03e455ec2f77b7d11ca1e69a515266
Merge: 8ebeccb 5ed8bd1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Mar 24 16:03:58 2017 +0000

    Merge tag 'upstream/2.32.0' into debian/master

 CMakeLists.txt                                     |  34 +-
 VERSION.cmake                                      |  12 +-
 apps/metgram/CMakeLists.txt                        |   4 +-
 cmake/VERSION.cmake                                |   4 +-
 cmake/ecbuild_check_functions.cmake                |   3 +
 cmake/ecbuild_config.h.in                          |   1 +
 cmake/ecbuild_declare_project.cmake                |  11 +-
 cmake/ecbuild_find_omp.cmake                       |   2 +-
 cmake/ecbuild_generate_rpc.cmake                   |  88 +++--
 magics.sublime-project                             |   2 +-
 python/Magics/toolbox.py                           | 375 +++++++++++++++++--
 share/CMakeLists.txt                               |   5 +-
 share/magics/table_128.xml                         |   2 +-
 src/basic/LegendVisitor.cc                         | 106 +++++-
 src/basic/LegendVisitor.h                          |  14 +-
 src/basic/TagHandler.cc                            |   8 +
 src/basic/TagHandler.h                             |   1 +
 src/common/Colour.cc                               |   2 +-
 src/common/Colour.h                                |   5 +-
 src/common/ColourTableDefinitionCompute.cc         | 398 +++++++++++++++++++--
 src/common/ColourTableDefinitionCompute.h          |  21 ++
 src/common/ColourTableDefinitionList.h             |   2 +
 src/common/GeoRectangularProjection.cc             |   5 -
 src/common/Matrix.cc                               |   4 +-
 src/common/MatrixHandler.h                         |  10 +-
 src/common/PolarStereographicProjection.cc         |  15 +-
 src/common/Proj4Projection.cc                      |  42 +++
 src/common/Proj4Projection.h                       |   8 +
 src/decoders/GeoPointsDecoder.cc                   |  51 ++-
 src/decoders/GeoPointsDecoder.h                    |   4 +
 src/decoders/GribDecoder.cc                        |  18 +
 src/decoders/NetcdfDecoder.h                       |   7 +
 src/decoders/NetcdfGeoMatrixInterpretor.cc         | 118 +++++-
 src/decoders/NetcdfGeoMatrixInterpretor.h          |  15 +-
 src/decoders/NetcdfGeopointsInterpretor.h          |   4 +-
 src/drivers/QtDriver.cc                            |   8 +-
 src/params/CMakeLists.txt                          |   2 +
 src/params/FortranViewNode.xml                     |   1 +
 src/params/GradientsColourTechnique.xml            |  42 +++
 src/params/IsoShading.xml                          |   5 +-
 src/params/LegendVisitor.xml                       |   4 +
 src/params/Proj4EPSG900913.xml                     |  12 +
 src/params/Proj4Projection.xml                     |   3 +
 src/visualisers/Bar.cc                             |   4 +-
 src/visualisers/CMakeLists.txt                     |   2 +
 src/visualisers/CalculateColourTechnique.cc        |   3 +-
 src/visualisers/CalculateColourTechnique.h         |   2 +-
 src/visualisers/CellShading.cc                     |   2 +-
 src/visualisers/CellShading.h                      |   2 +-
 src/visualisers/ColourTechnique.cc                 |   8 +-
 src/visualisers/ColourTechnique.h                  |   4 +-
 src/visualisers/Curve.cc                           |   2 +-
 src/visualisers/DotPolyShadingMethod.h             |   2 +-
 src/visualisers/EpsGraph.cc                        |  18 +-
 src/visualisers/GradientsColourTechnique.cc        | 177 +++++++++
 ...olourTechnique.h => GradientsColourTechnique.h} |  37 +-
 src/visualisers/GridPlotting.cc                    |   4 +-
 src/visualisers/HatchPolyShadingMethod.h           |   2 +-
 src/visualisers/IsoHighlight.h                     |   4 +-
 src/visualisers/IsoLabel.h                         |   6 +-
 src/visualisers/IsoPlot.cc                         |   9 +-
 src/visualisers/IsoShading.h                       |  12 +-
 src/visualisers/ListColourTechnique.cc             |   2 +-
 src/visualisers/ListColourTechnique.h              |   2 +-
 src/visualisers/MarkerShadingTechnique.cc          |   2 +-
 src/visualisers/MarkerShadingTechnique.h           |   2 +-
 src/visualisers/PolyShadingMethod.cc               |  86 ++---
 src/visualisers/PolyShadingMethod.h                |   2 +-
 src/visualisers/PolyShadingTechnique.h             |  25 +-
 src/visualisers/ShadingTechnique.h                 |   2 +-
 src/visualisers/SimplePolylineVisualiser.cc        |   2 +-
 src/visualisers/SymbolAdvancedTableMode.cc         |   2 +-
 src/visualisers/SymbolMode.cc                      |   2 +-
 src/visualisers/WindPlotting.cc                    |   2 +-
 src/web/WrepJSon.cc                                |  20 ++
 test/zoom.py                                       |  62 ++++
 76 files changed, 1660 insertions(+), 331 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git



More information about the debian-science-commits mailing list