[magics] 22/23: Merge
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jun 24 09:33:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository magics.
commit fc29df3271d9ecfde5ce2e9812dd640b8577fbce
Merge: a1b35b3 d8e7d3c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 22 18:41:05 2015 +0100
Merge
.cproject | 61 +
.gitignore | 21 +
.project | 27 +
AUTHORS | 6 +-
CMakeLists.txt | 434 +
COPYING | 202 +-
LICENSE_for_source_files | 14 +
Makefile.am | 82 -
Makefile.in | 948 -
NOTICE | 52 +
VERSION.cmake | 9 +
aclocal.m4 | 1374 --
apps/CMakeLists.txt | 4 +
apps/MagMLInterpretor/CMakeLists.txt | 32 +
apps/MagMLInterpretor/Makefile.am | 27 -
apps/MagMLInterpretor/Makefile.in | 633 -
apps/MagMLInterpretor/grib.template | 37 +
apps/MagMLInterpretor/gribview | 77 +
apps/MagMLInterpretor/json.cc | 70 +-
apps/MagMLInterpretor/magjson-script.in | 11 +
apps/MagMLInterpretor/magml-script.in | 11 +
apps/MagMLInterpretor/magml.cc | 2 +-
apps/MagMLInterpretor/test.magml | 17 +
apps/MagMLInterpretor/web.magml | 39 +
apps/Makefile.am | 5 -
apps/Makefile.in | 644 -
apps/metgram/10_days_epsgram.xml | 166 -
apps/metgram/10_days_metgram_a3.xml | 161 +
apps/metgram/10_days_wave_epsgram_a3.xml | 206 +
apps/metgram/15_days_epsgram.xml | 182 -
apps/metgram/CMakeLists.txt | 24 +
apps/metgram/Makefile.am | 43 -
apps/metgram/Makefile.in | 724 -
apps/metgram/anna.pl | 577 +
apps/metgram/efiserver.pl | 579 +
apps/metgram/eps.xml | 154 +
apps/metgram/epsserver.pl | 577 +
apps/metgram/epswind.xml | 9 +
apps/metgram/magplusserver.pl | 610 +
apps/metgram/metgram | 2 +-
apps/metgram/metgram-script.in | 10 +
apps/metgram/metgram.xml | 2 +
apps/metgram/metview_metgramserver.pl | 606 +
apps/metgram/multi_metgrams.xml | 1510 ++
apps/metgram/multi_metgrams_page1.xml | 1511 ++
apps/metgram/multi_metgrams_page2.xml | 1510 ++
apps/metgram/multi_metgrams_page3.xml | 1510 ++
apps/metgram/multi_metgrams_page4.xml | 1518 ++
apps/metgram/templates/10_days_epsgram.xml | 170 +
.../metgram/{ => templates}/10_days_epsgram_a3.xml | 0
apps/metgram/{ => templates}/10_days_metgram.xml | 0
.../{ => templates}/10_days_wave_epsgram.xml | 0
apps/metgram/templates/15_days_epsgram.xml | 184 +
.../metgram/{ => templates}/15_days_epsgram_a3.xml | 0
.../{ => templates}/15_days_with_clim_epsgram.xml | 0
apps/metgram/{ => templates}/classic_plumes.json | 0
apps/metgram/{ => templates}/efi_distribution.xml | 0
.../{ => templates}/new_efi_distribution.xml | 0
apps/metgram/tigge_epsgram.xml | 163 +
apps/metgram/wave10.xml | 9 +
apps/metgram/wave10_a3.xml | 9 +
cmake/2.8/CMakePushCheckState.cmake | 61 +
cmake/CMakeLists.txt | 5 +
cmake/CheckFortranCompilerFlag.cmake | 37 +
cmake/CheckFortranSourceCompiles.cmake | 94 +
cmake/FindADSM.cmake | 43 +
cmake/FindAEC.cmake | 34 +
cmake/FindAIO.cmake | 66 +
cmake/FindArmadillo.cmake | 33 +
cmake/FindCMath.cmake | 23 +
cmake/FindCairo.cmake | 58 +
cmake/FindDl.cmake | 20 +
cmake/FindEMOS.cmake | 37 +
cmake/FindEcLib.cmake | 49 +
cmake/FindEcregrid.cmake | 48 +
cmake/FindFDB.cmake | 35 +
cmake/FindGeoTIFF.cmake | 37 +
cmake/FindHPSS.cmake | 39 +
cmake/FindLEX.cmake | 129 +
cmake/FindLegacyFDB.cmake | 35 +
cmake/FindLibGFortran.cmake | 52 +
cmake/FindNDBM.cmake | 34 +
cmake/FindNetCDF.cmake | 167 +
cmake/FindNetCDF3.cmake | 129 +
cmake/FindODB.cmake | 53 +
cmake/FindOpenJPEG.cmake | 43 +
cmake/FindPGIFortran.cmake | 46 +
cmake/FindPango.cmake | 33 +
cmake/FindPangoCairo.cmake | 91 +
cmake/FindProj4.cmake | 67 +
cmake/FindREADLINE.cmake | 87 +
cmake/FindRPCGEN.cmake | 20 +
cmake/FindRealtime.cmake | 22 +
cmake/FindSZip.cmake | 32 +
cmake/FindScin.cmake | 48 +
cmake/FindTrilinos.cmake | 52 +
cmake/FindXLFortranLibs.cmake | 49 +
cmake/FindYACC.cmake | 157 +
cmake/Findgrib_api.cmake | 135 +
cmake/Findodb_api.cmake | 99 +
cmake/Findspot.cmake | 67 +
cmake/VERSION.cmake | 7 +
cmake/contrib/CheckFortranCompilerFlag.cmake | 25 +
cmake/contrib/CheckFortranSourceCompiles.cmake | 61 +
cmake/contrib/FindEigen3.cmake | 93 +
cmake/contrib/FindFFTW.cmake | 124 +
cmake/contrib/FindNetCDF4.cmake | 314 +
cmake/contrib/FindNumPy.cmake | 101 +
cmake/contrib/GetGitRevisionDescription.cmake | 123 +
cmake/contrib/GetGitRevisionDescription.cmake.in | 38 +
cmake/contrib/GreatCMakeCookOff/.gitattributes | 22 +
cmake/contrib/GreatCMakeCookOff/.gitignore | 6 +
.../contrib/GreatCMakeCookOff/AddCPP11Flags.cmake | 56 +
cmake/contrib/GreatCMakeCookOff/AddGTest.cmake | 72 +
.../GreatCMakeCookOff/CheckCXX11Features.cmake | 197 +
cmake/contrib/GreatCMakeCookOff/CheckIsNaN.cmake | 53 +
cmake/contrib/GreatCMakeCookOff/FindEigen.cmake | 131 +
cmake/contrib/GreatCMakeCookOff/LICENSE | 20 +
cmake/contrib/GreatCMakeCookOff/README.md | 176 +
cmake/contrib/GreatCMakeCookOff/TestCMake.cmake | 58 +
.../GreatCMakeCookOff/cpp11/__func__-N2340.cpp | 8 +
.../contrib/GreatCMakeCookOff/cpp11/auto-N2546.cpp | 12 +
.../GreatCMakeCookOff/cpp11/begin_function.cc | 12 +
.../GreatCMakeCookOff/cpp11/constexpr-N2235.cpp | 19 +
.../cpp11/constructor_delegate.cpp | 32 +
cmake/contrib/GreatCMakeCookOff/cpp11/cstdint.cpp | 10 +
.../GreatCMakeCookOff/cpp11/decltype-N2343.cpp | 11 +
.../cpp11/deleted_constructor.cpp | 10 +
.../cpp11/deleted_constructor_fail_compile.cpp | 11 +
.../contrib/GreatCMakeCookOff/cpp11/enable_if.cpp | 8 +
.../GreatCMakeCookOff/cpp11/explicit_cast.cpp | 13 +
.../GreatCMakeCookOff/cpp11/initialization.cpp | 7 +
.../GreatCMakeCookOff/cpp11/lambda-N2927.cpp | 5 +
.../GreatCMakeCookOff/cpp11/long_double.cpp | 4 +
.../GreatCMakeCookOff/cpp11/long_long-N1811.cpp | 7 +
cmake/contrib/GreatCMakeCookOff/cpp11/noexcept.cpp | 9 +
.../GreatCMakeCookOff/cpp11/nullptr-N2431.cpp | 5 +
.../cpp11/nullptr-N2431_fail_compile.cpp | 5 +
cmake/contrib/GreatCMakeCookOff/cpp11/override.cpp | 22 +
.../cpp11/override_fail_compile.cpp | 22 +
.../GreatCMakeCookOff/cpp11/random_device.cpp | 13 +
.../cpp11/rvalue_references-N2118.cpp | 15 +
.../contrib/GreatCMakeCookOff/cpp11/shared_ptr.cpp | 6 +
.../cpp11/sizeof_member-N2253.cpp | 14 +
.../cpp11/static_assert-N1720.cpp | 5 +
.../cpp11/static_assert-N1720_fail_compile.cpp | 5 +
.../GreatCMakeCookOff/cpp11/template_alias.cpp | 8 +
.../cpp11/trivial_type_traits.cpp | 7 +
.../GreatCMakeCookOff/cpp11/type_traits.cpp | 7 +
.../contrib/GreatCMakeCookOff/cpp11/unique_ptr.cpp | 6 +
.../cpp11/variadic_templates-N2555.cpp | 23 +
.../contrib/GreatCMakeCookOff/tests/CMakeLists.txt | 12 +
.../contrib/GreatCMakeCookOff/tests/addgtest.cmake | 20 +
.../GreatCMakeCookOff/tests/checkcpp11flags.cmake | 1 +
.../GreatCMakeCookOff/tests/checkisnan.cmake | 19 +
.../GreatCMakeCookOff/tests/cpp11/CMakeLists.txt | 3 +
.../tests/cpp11/allfeatures.cmake | 7 +
.../tests/cpp11/check_features.cmake | 9 +
.../tests/cpp11/parse_input_features.cmake | 68 +
cmake/ecbuild_add_cxx11_flags.cmake | 25 +
cmake/ecbuild_add_executable.cmake | 197 +
cmake/ecbuild_add_extra_search_paths.cmake | 34 +
cmake/ecbuild_add_library.cmake | 328 +
cmake/ecbuild_add_option.cmake | 194 +
cmake/ecbuild_add_persistent.cmake | 61 +
cmake/ecbuild_add_resources.cmake | 158 +
cmake/ecbuild_add_test.cmake | 315 +
cmake/ecbuild_append_to_rpath.cmake | 82 +
cmake/ecbuild_bundle.cmake | 284 +
cmake/ecbuild_cache.cmake | 65 +
cmake/ecbuild_check_c_source.cmake | 161 +
cmake/ecbuild_check_compiler.cmake | 125 +
cmake/ecbuild_check_cxx11.cmake | 67 +
cmake/ecbuild_check_cxx_source.cmake | 160 +
cmake/ecbuild_check_fortran_source.cmake | 157 +
cmake/ecbuild_check_functions.cmake | 125 +
cmake/ecbuild_check_os.cmake | 342 +
cmake/ecbuild_config.h.in | 167 +
cmake/ecbuild_debug_var.cmake | 35 +
cmake/ecbuild_declare_project.cmake | 151 +
cmake/ecbuild_define_build_types.cmake | 110 +
cmake/ecbuild_define_options.cmake | 40 +
cmake/ecbuild_define_paths.cmake | 41 +
cmake/ecbuild_echo_targets.cmake | 198 +
cmake/ecbuild_enable_fortran.cmake | 56 +
cmake/ecbuild_find_fortranlibs.cmake | 131 +
cmake/ecbuild_find_lexyacc.cmake | 60 +
cmake/ecbuild_find_mpi.cmake | 230 +
cmake/ecbuild_find_omp.cmake | 204 +
cmake/ecbuild_find_package.cmake | 190 +
cmake/ecbuild_find_perl.cmake | 45 +
cmake/ecbuild_find_python.cmake | 131 +
cmake/ecbuild_generate_config_headers.cmake | 47 +
cmake/ecbuild_generate_rpc.cmake | 73 +
cmake/ecbuild_generate_yy.cmake | 113 +
cmake/ecbuild_get_date.cmake | 32 +
cmake/ecbuild_get_resources.cmake | 52 +
cmake/ecbuild_get_test_data.cmake | 271 +
cmake/ecbuild_install_package.cmake | 286 +
cmake/ecbuild_links_target.cmake | 74 +
cmake/ecbuild_list_extra_search_paths.cmake | 108 +
cmake/ecbuild_list_macros.cmake | 57 +
cmake/ecbuild_pkgconfig.cmake | 365 +
cmake/ecbuild_print_summary.cmake | 115 +
cmake/ecbuild_project_files.cmake | 73 +
cmake/ecbuild_requires_macro_version.cmake | 15 +
cmake/ecbuild_separate_sources.cmake | 63 +
cmake/ecbuild_setup_test_framework.cmake | 42 +
cmake/ecbuild_system.cmake | 281 +
cmake/ecbuild_use_package.cmake | 206 +
cmake/ecbuild_version.h.in | 20 +
cmake/ecbuild_warn_unused_files.cmake | 58 +
cmake/include/ecbuild/boost_test_framework.h | 17 +
cmake/md5.in | 1 +
cmake/pkg-config.pc.in | 35 +
cmake/project-config-version.cmake.in | 12 +
cmake/project-config.cmake.in | 80 +
cmake/sg.pl | 573 +
cmake/sha1.in | 1 +
config/README | 1 -
config/config.guess | 1511 --
config/config.sub | 1705 --
config/depcomp | 630 -
config/install-sh | 520 -
config/ltmain.sh | 8406 -------
config/missing | 376 -
config/py-compile | 146 -
configure | 24673 -------------------
configure.ac | 1152 -
debian/changelog | 43 +
debian/control | 6 +-
debian/libmagics++-dev.install | 7 +-
debian/libmagplus3.install | 4 +-
debian/magics++.install | 2 +-
debian/patches/cve-2010-3393.patch | 10 +-
debian/patches/dynamic_link.patch | 21 -
debian/patches/enable_static.patch | 18 -
debian/patches/fix-headers.patch | 39 +-
debian/patches/gcc-4.7.patch | 52 +-
debian/patches/geotiff.patch | 13 +
debian/patches/grib-cmake.patch | 22 +
debian/patches/magics-config.patch | 122 +-
debian/patches/metview_fixes.patch | 2 +-
debian/patches/qt5.patch | 74 +
debian/patches/series | 6 +-
debian/patches/soname-version.patch | 22 +
debian/patches/terralib.patch | 193 +-
docs/Magics.dox.in | 1531 --
m4/autotroll.m4 | 563 -
m4/autotroll.mk | 108 -
m4/ax_boost_base.m4 | 258 -
m4/libtool.m4 | 7356 ------
m4/ltoptions.m4 | 368 -
m4/ltsugar.m4 | 123 -
m4/ltversion.m4 | 23 -
m4/lt~obsolete.m4 | 92 -
m4/magics.m4 | 38 -
magics-config.in | 71 +-
magics.sublime-project | 18 +
metview_files/MTHERMOGRIDDef | 322 +
metview_files/MTHERMOGRIDRules | 62 +
project_summary.cmake | 53 +
python/CMakeLists.txt | 1 +
python/Magics/CMakeLists.txt | 49 +
python/Magics/Magics.i | 66 -
python/Magics/Magics.i.in | 69 +
python/Magics/Magics_interface.cc | 11 +
python/Magics/Makefile.am | 35 -
python/Magics/Makefile.in | 527 -
python/Magics/macro.py | 38 +-
rpms/Magics_OBS.spec | 195 +
rpms/Makefile.am | 26 -
rpms/Makefile.in | 467 -
share/CMakeLists.txt | 3 +
share/magics/10m/10m_populated_places_simple.dbf | Bin
share/magics/10m/10m_populated_places_simple.prj | 1 -
share/magics/10m/10m_populated_places_simple.shp | Bin
share/magics/10m/10m_populated_places_simple.shx | Bin
share/magics/bufr_80.xml | 141 +
share/magics/bufr_98.xml | 1 +
share/magics/contour_ids.json | 1 +
share/magics/contours.json | 1 +
share/magics/default.json | 1 +
share/magics/epsg.json | 88 +-
share/magics/layer_contours.json | 1 +
share/magics/layer_ids.json | 1 +
share/magics/layers.json | 1 +
share/magics/level.json | 1 +
share/magics/marsClass.json | 1 +
share/magics/marsStream.json | 1 +
share/magics/marsType.json | 1 +
share/magics/natural_earth.ksh | 16 +
share/magics/number.json | 1 +
share/magics/obs.xml | 37 +-
share/magics/paramId.json | 1 +
share/magics/shortName.json | 1 +
share/magics/stepRange.json | 1 +
share/magics/symbols.svg | 142 +-
share/magics/title_template.xml | 62 +-
share/magics/typeOfLevel.json | 1 +
share/magics/units.json | 1 +
share/magics/web/magics.js | 662 +
src/CMakeLists.txt | 259 +
src/MagicsDouble.cc | 9 +-
src/Makefile.am | 228 -
src/Makefile.in | 1284 -
src/MvObs/Makefile.am | 14 -
src/MvObs/Makefile.in | 666 -
src/MvObs/MvBufr.h | 444 -
src/MvObs/MvBufrObs.h | 599 -
src/MvObs/MvObs.cc | 3297 ---
src/MvObs/MvObsSet.cc | 1011 -
src/MvObs/MvObsSet.h | 337 -
src/basic/BasicGraphicsObject.cc | 4 +-
src/basic/BasicGraphicsObject.h | 23 +-
src/basic/BasicSceneObject.cc | 7 +
src/basic/BasicSceneObject.h | 2 +
src/basic/CMakeLists.txt | 71 +
src/basic/DataConverter.cc | 54 +
src/basic/DataConverter.h | 59 +
src/basic/DisplayManager.cc | 300 +
src/basic/FortranMagics.cc | 405 +-
src/basic/FortranMagics.h | 6 +-
src/basic/ImportObjectHandler.cc | 12 +-
src/basic/Layer.cc | 43 +-
src/basic/Layer.h | 70 +-
src/basic/LegendVisitor.cc | 368 +-
src/basic/LegendVisitor.h | 35 +-
src/basic/LegendVisitorAttributes.h | 129 -
src/basic/MagnifierVisitorAttributes.h | 91 -
src/basic/Makefile.am | 46 -
src/basic/Makefile.in | 724 -
src/basic/RootSceneNode.cc | 56 +-
src/basic/RootSceneNode.h | 11 +
src/basic/SceneNode.cc | 13 +-
src/basic/SceneVisitor.cc | 12 +-
src/basic/SceneVisitor.h | 14 +-
src/basic/TagHandler.cc | 37 +-
src/basic/TextVisitor.cc | 76 +-
src/basic/ThreadNode.h | 44 -
src/basic/ViewNode.cc | 66 +-
src/basic/Visdef.h | 5 +-
src/basic/VisualAction.cc | 99 +-
src/basic/VisualAction.h | 13 +-
src/basic/WebFormat.cc | 13 +-
src/basic/WrepRootNodeAttributes.h | 83 -
src/basic/XmlBasicNodeAttributes.h | 110 -
src/basic/XmlMagics.cc | 64 +-
src/basic/XmlMagics.h | 4 +-
src/basic/XmlRootNodeAttributes.h | 90 -
src/basic/XmlSceneNodeAttributes.h | 106 -
src/basic/XmlViewNodeAttributes.h | 83 -
src/common/ArrowProperties.cc | 1 +
src/common/ArrowProperties.h | 6 +
src/common/AutoLocker.cc | 10 +-
src/common/AutomaticPlotManager.cc | 161 +
src/common/AutomaticPlotManager.h | 81 +
src/common/BaseParameter.cc | 2 +-
src/common/BaseParameter.h | 22 +-
src/common/BasePointsHandler.h | 1 +
src/common/BinaryObject.h | 8 +-
src/common/CMakeLists.txt | 145 +
src/common/CartesianTransformation.cc | 16 +-
src/common/CartesianTransformation.h | 44 +-
src/common/Colour.cc | 28 +-
src/common/ColourTableDefinitionList.cc | 11 +-
src/common/ColourTableDefinitionList.h | 1 +
src/common/Coordinate.cc | 4 +-
src/common/Coordinate.h | 539 +-
src/common/CustomisedPoint.h | 4 +
src/common/Data.cc | 32 +
src/common/Data.h | 31 +-
src/common/Factory.cc | 3 +
src/common/FortranRootSceneNodeAttributes.h | 91 -
src/common/FortranSceneNodeAttributes.h | 94 -
src/common/FortranViewNodeAttributes.h | 109 -
src/common/Frame.cc | 94 +
src/common/FrameLoop.cc | 232 +
src/common/FrameLoop.h | 164 +
src/common/GeoRectangularProjection.cc | 60 +-
src/common/GeoRectangularProjection.h | 3 +-
src/common/GeoRectangularProjectionAttributes.h | 85 -
src/common/InteractiveSet.cc | 116 +
src/common/InteractiveSet.h | 144 +
src/common/Label.h | 10 +
src/common/Layout.cc | 6 +-
src/common/Layout.h | 2 +-
src/common/LogoPlottingAttributes.h | 80 -
src/common/MagException.h | 10 +-
src/common/MagExceptions.cc | 2 +-
src/common/MagFont.cc | 5 +-
src/common/MagLog.cc | 19 +-
src/common/MagLog.h | 16 +-
src/common/MagTranslator.h | 112 +-
src/common/MagicsCalls.cc | 89 +-
src/common/MagicsThreads.cc | 151 +
src/common/MagicsThreads.h | 93 +
src/common/Makefile.am | 119 -
src/common/Makefile.in | 934 -
src/common/Matrix.cc | 33 +-
src/common/Matrix.h | 38 +-
src/common/MatrixHandler.h | 112 +-
src/common/MetaData.cc | 20 +-
src/common/MetaData.h | 4 +
src/common/Node.cc | 247 +
src/common/OutputFactory.cc | 9 +
src/common/OutputFactory.h | 10 +
src/common/OutputHandler.cc | 27 +-
src/common/OutputHandler.h | 5 +
src/common/OutputHandlerAttributes.h | 82 -
src/common/PageIDAttributes.h | 93 -
src/common/PageIDBase.h | 102 +
src/common/PlotManager.cc | 121 +
src/common/PolarStereographicProjection.cc | 141 +-
src/common/PolarStereographicProjection.h | 28 +-
src/common/Polyline.h | 19 +-
src/common/ProgressObject.cc | 45 +
src/common/ProgressObject.h | 11 +
src/common/ProgressTask.cc | 43 +
src/common/Proj4Projection.cc | 141 +-
src/common/Proj4Projection.h | 56 +-
src/common/RasterData.cc | 59 +
src/common/RasterData.h | 1 +
src/common/SatelliteProjection.cc | 366 +
src/common/SciMethods.cc | 10 +-
src/common/SciMethods.h | 2 +-
src/common/Seconds.cc | 2 +-
src/common/Symbol.cc | 5 +-
src/common/TaylorProjection.cc | 38 +-
src/common/TaylorProjection.h | 1 +
src/common/Tephigram.cc | 668 +
src/common/Tephigram.h | 298 +
src/common/Thread.h | 5 +-
src/common/ThreadControler.cc | 11 +
src/common/ThreadControler.h | 4 +
src/common/Timer.cc | 25 +-
src/common/Timer.h | 7 +-
src/common/Tokenizer.cc | 1 +
src/common/Transformation.cc | 480 +-
src/common/Transformation.h | 72 +-
src/common/UserLogoPlottingAttributes.h | 89 -
src/common/XmlReader.cc | 5 +-
src/common/XmlReader.h | 2 +
src/common/linux.h | 4 +-
src/common/machine.h | 0
src/common/magics_api.h | 3 +
src/decoders/BinningObject.cc | 164 +-
src/decoders/BinningObject.h | 77 +-
src/decoders/BinningObjectAttributes.h | 94 -
src/decoders/CMakeLists.txt | 146 +
src/decoders/ClassicMtgDecoder.cc | 6 +-
src/decoders/Date.cc | 10 +-
src/decoders/DateGribLoopStepAttributes.h | 83 -
src/decoders/EfiDataDecoder.h | 82 -
src/decoders/EpsBufr.cc | 6 +-
src/decoders/EpsXmlInput.cc | 11 +-
src/decoders/EpsgramDecoder.cc | 148 +-
src/decoders/GeoPointsDecoder.cc | 15 +
src/decoders/GeoPointsDecoderAttributes.h | 81 -
src/decoders/Grib | 0
src/decoders/GribAddressMode.h | 23 +-
src/decoders/GribDecoder.cc | 1838 +-
src/decoders/GribDecoder.h | 51 +-
src/decoders/GribDecoderAttributes.h | 97 -
src/decoders/GribInterpretor.h | 9 +-
src/decoders/GribLoopAttributes.h | 96 -
src/decoders/GribLoopStep.h | 2 +-
src/decoders/GribRegularInterpretor.cc | 2238 +-
src/decoders/GribRegularInterpretor.h | 47 +-
src/decoders/GribSatelliteInterpretor.cc | 474 +-
src/decoders/GribSatelliteInterpretor.h | 8 +-
src/decoders/ImportActionAttributes.h | 85 -
src/decoders/InputData.cc | 67 +-
src/decoders/InputData.h | 2 +-
src/decoders/InputMatrix.cc | 6 +-
src/decoders/InputMatrix.h | 2 +-
src/decoders/InputMatrixInterpretor.cc | 2 +-
src/decoders/LandgramDecoder.cc | 4 +-
src/decoders/LocalTable.cc | 1 +
src/decoders/Makefile.am | 113 -
src/decoders/Makefile.in | 963 -
src/decoders/Netcdf.cc | 85 +-
src/decoders/Netcdf.h | 36 +-
src/decoders/NetcdfDecoder.cc | 2 +-
src/decoders/NetcdfDecoder.h | 3 +-
src/decoders/NetcdfDecoderAttributes.h | 82 -
src/decoders/NetcdfGeoMatrixInterpretor.cc | 78 +-
src/decoders/NetcdfGeoMatrixInterpretor.h | 6 +-
.../NetcdfGeoMatrixInterpretorAttributes.h | 85 -
.../NetcdfGeoPolarMatrixInterpretorAttributes.h | 84 -
.../NetcdfGeoVectorInterpretorAttributes.h | 84 -
src/decoders/NetcdfGeopointsInterpretor.cc | 139 +-
src/decoders/NetcdfGeopointsInterpretor.h | 14 +-
.../NetcdfGeopointsInterpretorAttributes.h | 82 -
src/decoders/NetcdfInterpretor.cc | 132 +-
src/decoders/NetcdfInterpretor.h | 55 +-
src/decoders/NetcdfInterpretorAttributes.h | 89 -
src/decoders/NetcdfMatrixInterpretor.cc | 239 +-
src/decoders/NetcdfMatrixInterpretor.h | 21 +-
src/decoders/NetcdfMatrixInterpretorAttributes.h | 85 -
src/decoders/NetcdfOrcaInterpretor.cc | 73 +-
src/decoders/NetcdfOrcaInterpretor.h | 4 +-
src/decoders/NetcdfVectorInterpretor.cc | 48 +-
src/decoders/NetcdfVectorInterpretor.h | 1 +
src/decoders/NetcdfVectorInterpretorAttributes.h | 84 -
src/decoders/ObsDecoder.cc | 16 +-
src/decoders/ObsDecoderAttributes.h | 85 -
src/decoders/ObsStatDecoderAttributes.h | 81 -
src/decoders/ShapeDecoder.cc | 57 +-
src/decoders/TableDecoder.cc | 18 +-
src/decoders/ThinningMethod.cc | 48 +-
src/decoders/ThinningMethod.h | 11 +-
src/decoders/Time.cc | 2 +
src/decoders/TitleTemplate.cc | 26 +-
src/decoders/TitleTemplate.h | 2 +-
src/decoders/WindMode.cc | 2 +-
src/decoders/WindMode.h | 4 +-
src/decoders/XYList.cc | 48 +-
src/drivers/BaseDriver.cc | 515 +-
src/drivers/BaseDriver.h | 5 +-
src/drivers/BaseDriverBinaryReader.cc | 513 -
src/drivers/BaseDriverImages.h | 2 +-
src/drivers/BaseDriverSymbols.h | 37 +-
src/drivers/BaseDriverWind.h | 12 +-
src/drivers/BinaryDriver.cc | 8 +-
src/drivers/CMakeLists.txt | 88 +
src/drivers/CairoDriver.cc | 270 +-
src/drivers/CairoDriver.h | 21 +-
src/drivers/KMLDriver.cc | 659 +-
src/drivers/KMLDriver.h | 9 +-
src/drivers/Makefile.am | 107 -
src/drivers/Makefile.in | 1187 -
src/drivers/MgQ/MgQDriverObject.h | 2 +-
src/drivers/MgQ/MgQLayoutItem.h | 2 +-
src/drivers/MgQ/MgQPlotScene.cc | 2 +-
src/drivers/MgQ/MgQPlotScene.h | 2 +-
src/drivers/MgQ/MgQRootItem.h | 3 +
src/drivers/MgQ/MgQScene.cc | 13 +-
src/drivers/MgQ/MgQSceneItem.h | 2 +-
src/drivers/MingDriver.cc | 568 +
src/drivers/MingDriver.h | 132 +
src/drivers/PostScriptDriver.cc | 39 +-
src/drivers/QtDriver.cc | 38 +-
src/drivers/QtDriver.h | 6 +
src/drivers/SVGDriver.cc | 108 +-
src/drivers/SVGDriver.h | 3 +-
src/drivers/SelectionMode.cc | 55 +
src/drivers/SelectionMode.h | 66 +
src/eckit_readers/CMakeLists.txt | 38 +
src/eckit_readers/MvBufr.h | 444 +
src/eckit_readers/MvBufrObs.h | 599 +
src/{MvObs => eckit_readers}/MvLocation.cc | 0
src/{MvObs => eckit_readers}/MvLocation.h | 0
src/eckit_readers/MvObs.cc | 3297 +++
src/{MvObs => eckit_readers}/MvObs.h | 0
src/eckit_readers/MvObsSet.cc | 1011 +
src/eckit_readers/MvObsSet.h | 337 +
src/{MvObs => eckit_readers}/MvPrepBufrPrep.cc | 0
src/{MvObs => eckit_readers}/MvPrepBufrPrep.h | 0
src/{libTable => eckit_readers}/TableReader.cc | 0
src/{libTable => eckit_readers}/TableReader.h | 0
src/{MvObs => eckit_readers}/fdyntime.cc | 0
src/{MvObs => eckit_readers}/fdyntime.h | 0
src/{MvObs => eckit_readers}/fmettim.cc | 0
src/{MvObs => eckit_readers}/fmettim.h | 0
src/{MvObs => eckit_readers}/fobject.cc | 0
src/{MvObs => eckit_readers}/fobject.h | 0
src/{MvObs => eckit_readers}/fsortabl.cc | 0
src/{MvObs => eckit_readers}/fsortabl.h | 0
src/{MvObs => eckit_readers}/fstatime.cc | 0
src/{MvObs => eckit_readers}/fstatime.h | 0
src/{MvObs => eckit_readers}/inc_iostream.h | 0
src/libMagWrapper/CMakeLists.txt | 14 +
src/libMagWrapper/MagPlus.cc | 492 +-
src/libMagWrapper/MagPlus.h | 29 +-
src/libMagWrapper/MagRequest.h | 1 +
src/libMagWrapper/Makefile.am | 132 -
src/libMagWrapper/Makefile.in | 1082 -
src/libTable/Makefile.am | 17 -
src/libTable/Makefile.in | 631 -
src/magics.h | 31 +-
src/magics.pc.in | 14 +-
src/magics_config.h | 218 -
src/magics_config.h.in | 165 +-
src/magics_ecmwf_log.h | 25 +-
src/oda/CMakeLists.txt | 15 +
src/oda/Makefile.am | 24 -
src/oda/Makefile.in | 675 -
src/oda/OdaDecoder.cc | 49 +-
src/params/Akima474Method.xml | 19 +
src/params/Akima760Method.xml | 23 +
src/params/Akima761Method.xml | 20 +
src/params/ArrowPlotting.xml | 83 +
src/params/AutomaticContourMethod.xml | 2 +
src/params/AutomaticPlotManager.xml | 29 +
src/params/Axis.xml | 248 +
src/params/AxisMethod.xml | 2 +
src/params/Bar.xml | 52 +
src/params/BaseDriver.xml | 78 +
src/params/BinaryDriver.xml | 7 +
src/params/BinaryObject.xml | 30 +
src/params/BinningObject.xml | 65 +
src/params/BothValuePlotMethod.xml | 25 +
src/params/Boundaries.xml | 70 +
src/params/BoxPlotBox.xml | 24 +
src/params/BoxPlotBoxBorder.xml | 15 +
src/params/BoxPlotDecoder.xml | 33 +
src/params/BoxPlotMedian.xml | 17 +
src/params/BoxPlotVisualiser.xml | 22 +
src/params/BoxPlotWhiskerBorder.xml | 15 +
src/params/BoxPlotWhiskerBox.xml | 16 +
src/params/BoxPlotWhiskerLine.xml | 14 +
src/params/CMakeLists.txt | 335 +
src/params/CairoDriver.xml | 23 +
src/params/CalculateColourTechnique.xml | 19 +
src/params/CalculateHeightTechnique.xml | 2 +
src/params/CalmIndicator.xml | 2 +
src/params/CartesianTransformation.xml | 22 +
src/params/CdfGraph.xml | 27 +
src/params/CellShading.xml | 13 +
src/params/CircleOriginMarker.xml | 2 +
src/params/Cities.xml | 41 +
src/params/ClassicMtgDecoder.xml | 75 +
src/params/CoastPlotting.xml | 17 +
src/params/Coastlines.xml | 35 +
src/params/ColourTechnique.xml | 2 +
src/params/ContinuousLegendMethod.xml | 8 +
src/params/Contour.xml | 107 +
src/params/ContourMethod.xml | 2 +
src/params/CountSelectionType.xml | 28 +
src/params/Curve.xml | 101 +
src/params/CurveArea.xml | 8 +
src/params/DateAxisMethod.xml | 116 +
src/params/DateGribLoopStep.xml | 23 +
src/params/DotGraphShadeStyle.xml | 10 +
src/params/DotOriginMarker.xml | 2 +
src/params/DotPolyShadingMethod.xml | 20 +
src/params/DumpShading.xml | 4 +
src/params/DumpShadingWrapper.xml | 13 +
src/params/EfiDataDecoder.xml | 12 +
src/params/EfiGraph.xml | 37 +
src/params/EfiJSon.xml | 36 +
src/params/EfigramDecoder.xml | 81 +
src/params/EpsBufr.xml | 57 +
src/params/EpsCloud.xml | 13 +
src/params/EpsDirection.xml | 19 +
src/params/EpsGraph.xml | 81 +
src/params/EpsPlume.xml | 75 +
src/params/EpsShade.xml | 18 +
src/params/EpsWave.xml | 9 +
src/params/EpsWind.xml | 20 +
src/params/EpsXmlInput.xml | 17 +
src/params/EpsgramDecoder.xml | 117 +
src/params/EquidistantTableMode.xml | 4 +
src/params/FixedTableMode.xml | 10 +
src/params/FlagPlotting.xml | 74 +
src/params/FortranRootSceneNode.xml | 51 +
src/params/FortranSceneNode.xml | 81 +
src/params/FortranViewNode.xml | 150 +
src/params/GDDriver.xml | 26 +
src/params/GenericSQLDecoder.xml | 35 +
src/params/GeoPointsDecoder.xml | 7 +
src/params/GeoRectangularProjection.xml | 29 +
src/params/Graph.xml | 3 +
src/params/GraphArrow.xml | 9 +
src/params/GraphFlag.xml | 9 +
src/params/GraphPlotting.xml | 25 +
src/params/GraphShade.xml | 10 +
src/params/GraphShadeStyle.xml | 6 +
src/params/GribAddressByteMode.xml | 2 +
src/params/GribAddressMode.xml | 2 +
src/params/GribAddressRecordMode.xml | 2 +
src/params/GribDecoder.xml | 91 +
src/params/GribLoop.xml | 65 +
src/params/GribLoopStep.xml | 2 +
src/params/GridPlotting.xml | 27 +
src/params/GridShading.xml | 8 +
src/params/HatchGraphShadeStyle.xml | 6 +
src/params/HatchPolyShadingMethod.xml | 18 +
src/params/HeightTechnique.xml | 2 +
src/params/HiLo.xml | 80 +
src/params/HiLoBase.xml | 2 +
src/params/HiLoBoth.xml | 2 +
src/params/HiLoMarker.xml | 22 +
src/params/HiLoMarkerBase.xml | 2 +
src/params/HiLoNumber.xml | 12 +
src/params/HiLoTechnique.xml | 24 +
src/params/HiLoText.xml | 19 +
src/params/HighHiLo.xml | 2 +
src/params/Histogram.xml | 62 +
src/params/HistogramLegendMethod.xml | 40 +
src/params/HyperAxisMethod.xml | 2 +
src/params/ImageCalculateColourTechnique.xml | 19 +
src/params/ImageListColourTechnique.xml | 7 +
src/params/ImagePlotting.xml | 39 +
src/params/ImportAction.xml | 23 +
src/params/ImportObjectHandler.xml | 26 +
src/params/ImportPlot.xml | 49 +
src/params/InputData.xml | 88 +
src/params/InputMatrix.xml | 49 +
src/params/InputMatrixIrregularInterpretor.xml | 19 +
src/params/InputMatrixRegularInterpretor.xml | 79 +
src/params/IntervalSelectionType.xml | 17 +
src/params/IsoHighlight.xml | 31 +
src/params/IsoLabel.xml | 72 +
src/params/IsoPlot.xml | 144 +
src/params/IsoShading.xml | 40 +
src/params/KMLDriver.xml | 56 +
src/params/LabelPlotting.xml | 61 +
src/params/LandgramBox.xml | 32 +
src/params/LandgramDecoder.xml | 17 +
src/params/LegendMethod.xml | 2 +
src/params/LegendVisitor.xml | 241 +
src/params/LevelListSelectionType.xml | 13 +
src/params/LevelSelection.xml | 24 +
src/params/ListColourTechnique.xml | 8 +
src/params/ListHeightTechnique.xml | 2 +
src/params/LogarithmicAxisMethod.xml | 2 +
src/params/LogoPlotting.xml | 2 +
src/params/LookupTableMode.xml | 19 +
src/params/LowHiLo.xml | 2 +
src/params/MagnifierVisitor.xml | 53 +
src/params/MapGenDecoder.xml | 11 +
src/params/MarkerShadingTechnique.xml | 17 +
src/params/MarkerValuePlotMethod.xml | 25 +
src/params/MercatorProjection.xml | 2 +
src/params/MetaData.xml | 27 +
src/params/MetgramCurve.xml | 24 +
src/params/MetgramFlags.xml | 15 +
src/params/MetgramGraph.xml | 12 +
src/params/MingDriver.xml | 7 +
src/params/MvRootSceneNode.xml | 52 +
src/params/NetcdfDecoder.xml | 26 +
src/params/NetcdfGeoMatrixInterpretor.xml | 38 +
src/params/NetcdfGeoPolarMatrixInterpretor.xml | 19 +
src/params/NetcdfGeoVectorInterpretor.xml | 20 +
src/params/NetcdfGeopointsInterpretor.xml | 11 +
src/params/NetcdfInterpretor.xml | 42 +
src/params/NetcdfMatrixInterpretor.xml | 32 +
src/params/NetcdfOrcaInterpretor.xml | 27 +
src/params/NetcdfVectorInterpretor.xml | 20 +
src/params/NetcdfXYpointsInterpretor.xml | 21 +
src/params/NoBinningObject.xml | 2 +
src/params/NoBoundaries.xml | 4 +
src/params/NoBoxPlotBoxBorder.xml | 4 +
src/params/NoBoxPlotMedian.xml | 4 +
src/params/NoCalmIndicator.xml | 2 +
src/params/NoCities.xml | 4 +
src/params/NoCoastPlotting.xml | 81 +
src/params/NoGraphShade.xml | 2 +
src/params/NoGridPlotting.xml | 30 +
src/params/NoHiLo.xml | 4 +
src/params/NoHiLoMarker.xml | 6 +
src/params/NoIsoHighlight.xml | 2 +
src/params/NoIsoLabel.xml | 2 +
src/params/NoIsoPlot.xml | 2 +
src/params/NoIsoShading.xml | 2 +
src/params/NoLabelPlotting.xml | 6 +
src/params/NoLegendNode.xml | 2 +
src/params/NoLegendVisitor.xml | 2 +
src/params/NoLogoPloting.xml | 3 +
src/params/NoLogoPlotting.xml | 3 +
src/params/NoMagnifierVisitor.xml | 2 +
src/params/NoOriginMarker.xml | 2 +
src/params/NoOutLayerTechnique.xml | 2 +
src/params/NoPageID.xml | 4 +
src/params/NoPreviewVisitor.xml | 2 +
src/params/NoTitle.xml | 2 +
src/params/NoValuePlot.xml | 4 +
src/params/ObsCloud.xml | 6 +
src/params/ObsDecoder.xml | 23 +
src/params/ObsDemoItem2.xml | 9 +
src/params/ObsDewPoint.xml | 4 +
src/params/ObsJSon.xml | 9 +
src/params/ObsPlotting.xml | 183 +
src/params/ObsStatDecoder.xml | 13 +
src/params/ObsTable.xml | 9 +
src/params/OdaGeoDecoder.xml | 40 +
src/params/OdaXYDecoder.xml | 39 +
src/params/OdbDecoder.xml | 54 +
src/params/OriginMarker.xml | 2 +
src/params/OutputHandler.xml | 14 +
src/params/PageID.xml | 60 +
src/params/ParamGribLoopStep.xml | 4 +
src/params/PolarStereographicProjection.xml | 76 +
src/params/PolyShadingMethod.xml | 2 +
src/params/PolyShadingTechnique.xml | 10 +
src/params/PositionListAxisMethod.xml | 2 +
src/params/PostScriptDriver.xml | 20 +
src/params/PpmDecoder.xml | 26 +
src/params/PreviewVisitor.xml | 2 +
src/params/Proj4Bonne.xml | 2 +
src/params/Proj4Collignon.xml | 2 +
src/params/Proj4EPSG32661.xml | 2 +
src/params/Proj4EPSG3857.xml | 2 +
src/params/Proj4EPSG4326.xml | 2 +
src/params/Proj4Efas.xml | 2 +
src/params/Proj4Geos.xml | 2 +
src/params/Proj4Geose.xml | 2 +
src/params/Proj4Geosw.xml | 2 +
src/params/Proj4Goode.xml | 2 +
src/params/Proj4Google.xml | 2 +
src/params/Proj4Lambert.xml | 2 +
src/params/Proj4LambertNorthAtlantic.xml | 2 +
src/params/Proj4Meteosat0.xml | 2 +
src/params/Proj4Meteosat145.xml | 2 +
src/params/Proj4Meteosat57.xml | 2 +
src/params/Proj4Mollweide.xml | 2 +
src/params/Proj4PolarNorth.xml | 2 +
src/params/Proj4Projection.xml | 43 +
src/params/Proj4Robinson.xml | 2 +
src/params/QtDriver.xml | 8 +
src/params/SDWindMode.xml | 2 +
src/params/SVGDriver.xml | 29 +
src/params/SampleContourMethod.xml | 12 +
src/params/SelectionMode.xml | 27 +
src/params/ShadingTechnique.xml | 2 +
src/params/ShapeDecoder.xml | 8 +
src/params/SimpleOutLayerTechnique.xml | 2 +
src/params/SimplePolyline.xml | 98 +
src/params/SimplePolylineInput.xml | 28 +
src/params/Streamlines.xml | 40 +
src/params/SymbolAdvancedTableMode.xml | 197 +
src/params/SymbolIndividualMode.xml | 77 +
src/params/SymbolInput.xml | 40 +
src/params/SymbolMode.xml | 3 +
src/params/SymbolPlotting.xml | 163 +
src/params/SymbolTableMode.xml | 30 +
src/params/TableDecoder.xml | 83 +
src/params/TaylorGrid.xml | 161 +
src/params/TaylorProjection.xml | 18 +
src/params/TephiGrid.xml | 422 +
src/params/TephiInfo.xml | 2 +
src/params/Tephigram.xml | 27 +
src/params/TextVisitor.xml | 376 +
src/params/Title.xml | 42 +
src/params/TitleBase.xml | 2 +
src/params/TitleTemplate.xml | 11 +
src/params/Transformation.xml | 2 +
src/params/UVWindMode.xml | 2 +
src/params/UserLogoPlotting.xml | 49 +
src/params/VDWindMode.xml | 2 +
src/params/ValuePlot.xml | 17 +
src/params/ValuePlotBase.xml | 2 +
src/params/ValuePlotMethod.xml | 45 +
src/params/Wind.xml | 26 +
src/params/WindMode.xml | 2 +
src/params/WindPlotting.xml | 131 +
src/params/WrepJSon.xml | 85 +
src/params/WrepRootNode.xml | 23 +
src/params/XCoordinate.xml | 2 +
src/params/XDateCoordinate.xml | 24 +
src/params/XHyperCoordinate.xml | 32 +
src/params/XLogarithmicCoordinate.xml | 26 +
src/params/XRegularCoordinate.xml | 27 +
src/params/XYList.xml | 126 +
src/params/XmlBasicNode.xml | 147 +
src/params/XmlBox.xml | 45 +
src/params/XmlLegendNode.xml | 2 +
src/params/XmlPage.xml | 25 +
src/params/XmlRootNode.xml | 47 +
src/params/XmlSceneNode.xml | 122 +
src/params/XmlSubPage.xml | 36 +
src/params/XmlViewNode.xml | 23 +
src/params/YCoordinate.xml | 2 +
src/params/YDateCoordinate.xml | 29 +
src/params/YHyperCoordinate.xml | 38 +
src/params/YLogarithmicCoordinate.xml | 29 +
src/params/YRegularCoordinate.xml | 27 +
src/params/todo.xml | 106 +
src/terralib/CMakeLists.txt | 132 +
src/terralib/Makefile.am | 138 -
src/terralib/Makefile.in | 1706 --
src/terralib/jpeg/ijl.h | 1513 ++
src/terralib/jpeg/jpeg.h | 95 +
src/terralib/kernel/TeAkimaInterpolator.cpp | 1067 +
src/terralib/kernel/TeBlockLoader.cpp | 171 +
src/terralib/kernel/TeBlockLoader.h | 95 +
src/terralib/kernel/TeCommunicator.h | 413 +
src/terralib/kernel/TeConsoleErrorMessage.cpp | 29 +
src/terralib/kernel/TeConsoleErrorMessage.h | 62 +
src/terralib/kernel/TeDecoderDatabase.cpp | 8 +-
src/terralib/kernel/TeDecoderJPEG.cpp | 233 +
src/terralib/kernel/TeDecoderJPEG.h | 81 +
src/terralib/kernel/TeDecoderTIFF.cpp | 1214 +
src/terralib/kernel/TeDecoderTIFF.h | 185 +
src/terralib/kernel/TeExternalTheme.cpp | 2 +-
src/terralib/kernel/TeGeometryAlgorithms.cpp | 4 +-
src/terralib/kernel/TeInitRasterDecoders.cpp | 3 +
.../kernel/TeProxMatrixConstructionStrategy.cpp | 6 +-
src/terralib/kernel/TeProxMatrixImplementation.h | 2 +-
src/terralib/kernel/TeRedBlackTree.h | 763 +
src/terralib/kernel/TeSTEvent.cpp | 2 +-
src/terralib/kernel/TeSparseMatrix.h | 274 +
src/terralib/kernel/TeSpatialOperations.cpp | 6 +-
src/terralib/kernel/TeStatistics.h | 6 +-
src/terralib/kernel/TeTheme.cpp | 2 +-
src/terralib/kernel/dynpq.h | 3 +-
src/terralib/kernel/graph.h | 14 +-
src/terralib/utils/TeColorUtils.cpp | 780 +
src/terralib/utils/TeColorUtils.h | 92 +
src/terralib/utils/TeDatabaseUtils.cpp | 582 +
src/terralib/utils/TeUpdateDBVersion.cpp | 1504 ++
src/terralib/utils/TeUpdateDBVersion.h | 60 +
src/terralib/utils/mtrand.cpp | 50 +
src/terralib/utils/mtrand.h | 153 +
src/visualisers/Akima474MethodAttributes.h | 82 -
src/visualisers/Akima760.cc | 77 +-
src/visualisers/Akima760Method.cc | 52 +
src/visualisers/Akima760MethodAttributes.h | 82 -
src/visualisers/Akima761.cc | 3408 +++
src/visualisers/Akima761Method.cc | 52 +
src/visualisers/ArrowPlotting.cc | 45 +-
src/visualisers/ArrowPlotting.h | 10 +-
src/visualisers/Axis.cc | 10 +-
src/visualisers/AxisAttributes.cc | 463 -
src/visualisers/AxisAttributes.h | 133 -
src/visualisers/AxisControl.cc | 77 +
src/visualisers/AxisControl.h | 115 +
src/visualisers/AxisGrid.cc | 125 +
src/visualisers/AxisGrid.h | 125 +
src/visualisers/AxisItem.cc | 41 +-
src/visualisers/AxisItem.h | 18 +-
src/visualisers/AxisLine.cc | 119 +
src/visualisers/AxisLine.h | 129 +
src/visualisers/AxisMethod.cc | 10 +-
src/visualisers/AxisMethod.h | 10 +-
src/visualisers/AxisMethodAttributes.cc | 91 -
src/visualisers/AxisMinorTick.cc | 101 +
src/visualisers/AxisMinorTick.h | 117 +
src/visualisers/AxisTick.cc | 116 +
src/visualisers/AxisTick.h | 118 +
src/visualisers/AxisTickLabelType.cc | 107 +
src/visualisers/AxisTickLabelType.h | 131 +
src/visualisers/AxisTip.cc | 98 +
src/visualisers/AxisTip.h | 116 +
src/visualisers/AxisType.cc | 54 +
src/visualisers/AxisType.h | 86 +
src/visualisers/BothValuePlotMethodAttributes.cc | 125 -
src/visualisers/BoundariesAttributes.h | 93 -
src/visualisers/BoxPlotBoxAttributes.cc | 146 -
src/visualisers/BoxPlotBoxBorderAttributes.cc | 117 -
src/visualisers/BoxPlotItem.cc | 45 +-
src/visualisers/BoxPlotMedianAttributes.cc | 117 -
src/visualisers/BoxPlotVisualiser.cc | 18 +-
src/visualisers/BoxPlotVisualiserAttributes.cc | 132 -
src/visualisers/BoxPlotWhiskerBorderAttributes.cc | 119 -
src/visualisers/BoxPlotWhiskerBoxAttributes.cc | 129 -
src/visualisers/BoxPlotWhiskerLineAttributes.cc | 118 -
src/visualisers/CMakeLists.txt | 204 +
src/visualisers/CalcStreamlines.cc | 861 +
src/visualisers/CalcStreamlines.h | 85 +
.../CalculateColourTechniqueAttributes.h | 85 -
src/visualisers/CdfGraphAttributes.cc | 137 -
src/visualisers/CellShading.cc | 55 +
src/visualisers/CellShading.h | 20 +
src/visualisers/CellShadingAttributes.h | 82 -
src/visualisers/CoastPlottingAttributes.h | 84 -
src/visualisers/CoastlinesAttributes.h | 86 -
src/visualisers/ColourSelection.cc | 53 +
src/visualisers/ColourSelectionCount.cc | 61 +
src/visualisers/ColourSelectionList.cc | 59 +
src/visualisers/ColourTechnique.cc | 29 +-
src/visualisers/ColourTechnique.h | 11 +-
src/visualisers/ContinuousLegendMethodAttributes.h | 81 -
src/visualisers/Contour.cc | 41 +-
src/visualisers/Contour.h | 1 +
src/visualisers/ContourAttributes.cc | 206 -
src/visualisers/ContourAttributes.h | 93 -
src/visualisers/ContourLibrary.cc | 168 +
src/visualisers/ContourLibrary.h | 131 +-
src/visualisers/CountSelectionType.cc | 4 +-
src/visualisers/CountSelectionType.h | 2 +-
src/visualisers/CountSelectionTypeAttributes.h | 83 -
src/visualisers/Curve.cc | 102 +-
src/visualisers/Curve.h | 5 +
src/visualisers/DateAxis.cc | 40 +-
src/visualisers/DefinitionTable.h | 2 +-
.../{DefinitionTable.cc => DefinitionTable.hcc} | 0
src/visualisers/DotPolyShadingMethodAttributes.h | 84 -
src/visualisers/EfiGraphAttributes.cc | 172 -
src/visualisers/EpsCloudAttributes.cc | 110 -
src/visualisers/EpsGraph.cc | 285 +-
src/visualisers/EpsGraph.h | 2 +-
src/visualisers/EpsGraphAttributes.cc | 312 -
src/visualisers/EpsPlumeAttributes.cc | 166 -
src/visualisers/EpsShadeAttributes.cc | 123 -
src/visualisers/EpsWindAttributes.cc | 117 -
src/visualisers/FixedTableModeAttributes.h | 82 -
src/visualisers/FlagPlotting.cc | 174 +-
src/visualisers/FlagPlotting.h | 16 +-
src/visualisers/FloatSelection.cc | 74 +
src/visualisers/GraphShadeStyle.cc | 8 +
src/visualisers/GridPlottingAttributes.h | 84 -
src/visualisers/GridShadingAttributes.h | 81 -
src/visualisers/HatchPolyShadingMethodAttributes.h | 83 -
src/visualisers/HeightSelection.cc | 53 +
src/visualisers/HiLoAttributes.cc | 187 -
src/visualisers/HiLoAttributes.h | 92 -
src/visualisers/HiLoMarkerAttributes.h | 84 -
src/visualisers/HiLoNumber.h | 4 +-
src/visualisers/HiLoNumberAttributes.h | 82 -
src/visualisers/HiLoTechnique.cc | 52 -
src/visualisers/HiLoTechniqueAttributes.h | 85 -
src/visualisers/HiLoTextAttributes.h | 83 -
src/visualisers/Histogram.cc | 13 +-
src/visualisers/HistogramAttributes.cc | 175 -
src/visualisers/HistogramLegendMethodAttributes.h | 92 -
src/visualisers/ImageListColourTechnique.h | 2 +-
src/visualisers/ImagePlotting.cc | 292 -
src/visualisers/ImagePlotting.h | 86 -
src/visualisers/ImagePlottingAttributes.h | 86 -
src/visualisers/ImportPlotAttributes.h | 91 -
src/visualisers/IntervalSelectionType.cc | 47 +-
src/visualisers/IntervalSelectionType.h | 2 +-
src/visualisers/IntervalSelectionTypeAttributes.h | 82 -
src/visualisers/IsoHelper.cc | 6 +-
src/visualisers/IsoHelper.h | 2 +-
src/visualisers/IsoHighlightAttributes.h | 86 -
src/visualisers/IsoLabel.cc | 6 +-
src/visualisers/IsoLabelAttributes.h | 89 -
src/visualisers/IsoPlot.cc | 2402 +-
src/visualisers/IsoPlot.h | 126 +-
src/visualisers/IsoPlotAttributes.cc | 222 -
src/visualisers/IsoPlotAttributes.h | 97 -
src/visualisers/IsoShading.cc | 34 +
src/visualisers/IsoShading.h | 4 +
src/visualisers/IsoShadingAttributes.cc | 149 -
src/visualisers/IsoShadingAttributes.h | 86 -
src/visualisers/LabelPlottingAttributes.h | 90 -
src/visualisers/LabelPlottingBase.h | 106 +
src/visualisers/LandgramBox.cc | 144 -
src/visualisers/LandgramBox.h | 87 -
src/visualisers/LegendBoxAttributes.h | 80 -
src/visualisers/LegendMethod.cc | 5 +-
src/visualisers/LevelListSelectionType.h | 2 +-
src/visualisers/LevelListSelectionTypeAttributes.h | 81 -
src/visualisers/LevelSelection.cc | 7 +-
src/visualisers/LevelSelection.h | 2 +-
src/visualisers/LevelSelectionAttributes.h | 84 -
src/visualisers/ListColourTechnique.cc | 2 +
src/visualisers/ListColourTechnique.h | 2 +-
src/visualisers/ListColourTechniqueAttributes.h | 82 -
src/visualisers/LookupTableModeAttributes.h | 83 -
src/visualisers/Makefile.am | 192 -
src/visualisers/Makefile.in | 1194 -
src/visualisers/MarkerShadingTechniqueAttributes.h | 83 -
src/visualisers/MetgramCurveAttributes.cc | 137 -
src/visualisers/MetgramFlagsAttributes.cc | 116 -
src/visualisers/MetgramGraphAttributes.cc | 111 -
src/visualisers/NoGridPlottingAttributes.h | 84 -
src/visualisers/ObsItem.h | 15 +-
src/visualisers/ObsItemFamily.cc | 357 +-
src/visualisers/ObsItemFamily.h | 139 +-
src/visualisers/ObsPlotting.cc | 27 +-
src/visualisers/ObsPlottingAttributes.h | 81 -
src/visualisers/ObsStatGraph.h | 90 -
src/visualisers/ObsTable.cc | 5 +-
src/visualisers/ObsTable.h | 11 +-
src/visualisers/PolyShadingMethod.cc | 11 +-
src/visualisers/PolyShadingTechnique.h | 4 +-
src/visualisers/PolyShadingTechniqueAttributes.cc | 117 -
src/visualisers/PolyShadingTechniqueAttributes.h | 82 -
src/visualisers/SampleContourMethodAttributes.h | 82 -
src/visualisers/SegmentJoiner.cc | 54 +-
src/visualisers/SegmentJoiner.h | 21 +-
src/visualisers/ShadingTechnique.h | 11 +-
src/visualisers/SimplePolylineVisualiser.h | 1 +
src/visualisers/Streamlines.cc | 111 +
src/visualisers/Streamlines.h | 83 +
src/visualisers/SymbolAdvancedTableMode.cc | 6 +-
src/visualisers/SymbolAdvancedTableMode.h | 1 +
src/visualisers/SymbolIndividualModeAttributes.h | 98 -
src/visualisers/SymbolMode.cc | 8 +-
src/visualisers/SymbolTableModeAttributes.h | 86 -
src/visualisers/TephiGrid.cc | 428 +
src/visualisers/TephiGrid.h | 83 +
src/visualisers/Title.h | 123 -
src/visualisers/TitleBase.h | 130 -
src/visualisers/UserDate.cc | 62 +
src/visualisers/UserDate.h | 93 +
src/visualisers/VisDefInfo.cc | 2 +-
src/visualisers/Wind.cc | 23 +-
src/visualisers/Wind.h | 1 +
src/visualisers/WindPlotting.cc | 137 +-
src/visualisers/WindPlotting.h | 19 +-
src/web/CMakeLists.txt | 12 +
src/web/MagConfig.cc | 20 +-
src/web/MagConfig.h | 3 +
src/web/MagJSon.cc | 4 +-
src/web/Makefile.am | 24 -
src/web/Makefile.in | 679 -
src/web/ObsJSon.cc | 59 +-
src/web/ObsJSon.h | 4 +-
src/web/ObsJSonAttributes.cc | 102 -
src/web/WrepJSon.cc | 327 +-
src/web/WrepJSon.h | 9 +-
src/web/WrepJSonAttributes.cc | 228 -
src/web/json_spirit.h | 12 +-
src/web/json_spirit.vcproj | 213 +
src/web/json_spirit_error_position.h | 54 +
src/web/json_spirit_reader.cpp | 758 +-
src/web/json_spirit_reader.h | 53 +-
src/web/json_spirit_reader_template.h | 650 +
src/web/json_spirit_stream_reader.h | 70 +
src/web/json_spirit_utils.h | 16 +-
src/web/json_spirit_value.h | 287 +-
src/web/json_spirit_writer.cpp | 355 +-
src/web/json_spirit_writer.h | 61 +-
src/web/json_spirit_writer_options.h | 33 +
src/web/json_spirit_writer_template.h | 387 +
src/xml/ActionRoutines.xml | 167 -
src/xml/Akima.xml | 69 -
src/xml/Axis.xml | 372 -
src/xml/BaseDriver.xml | 79 -
src/xml/BinaryDriver.xml | 35 -
src/xml/BinningObject.xml | 75 -
src/xml/BoxPlot.xml | 193 -
src/xml/CairoDriver.xml | 22 -
src/xml/CoastPlotting.xml | 233 -
src/xml/Coastlines.xml | 40 -
src/xml/Contour.xml | 94 -
src/xml/Drivers.xml | 26 -
src/xml/EpsJSon.xml | 141 -
src/xml/Epsgram.xml | 812 -
src/xml/Frame.xml | 45 -
src/xml/GDDriver.xml | 33 -
src/xml/GeoRectangularProjection.xml | 63 -
src/xml/Geopoints.xml | 186 -
src/xml/Grib.xml | 232 -
src/xml/GridPlotting.xml | 71 -
src/xml/HiLo.xml | 186 -
src/xml/HiLoMarker.xml | 41 -
src/xml/HiLoNumber.xml | 15 -
src/xml/HiLoTechnique.xml | 32 -
src/xml/HiLoText.xml | 23 -
src/xml/Histogram.xml | 79 -
src/xml/ImagePlotting.xml | 264 -
src/xml/Import.xml | 119 -
src/xml/InputData.xml | 94 -
src/xml/InputMatrix.xml | 151 -
src/xml/IsoHighlight.xml | 43 -
src/xml/IsoLabel.xml | 85 -
src/xml/IsoPlot.xml | 86 -
src/xml/IsoShading.xml | 177 -
src/xml/KMLDriver.xml | 58 -
src/xml/LabelPlotting.xml | 84 -
src/xml/Landgram.xml | 63 -
src/xml/Layout.xml | 54 -
src/xml/Legend.xml | 269 -
src/xml/LevelSelection.xml | 107 -
src/xml/Makefile.am | 134 -
src/xml/Makefile.in | 526 -
src/xml/MetaData.xml | 37 -
src/xml/NetcdfDecoder.xml | 47 -
src/xml/NetcdfInterpretor.xml | 249 -
src/xml/Obs.xml | 26 -
src/xml/ObsJSon.xml | 11 -
src/xml/ObsPlotting.xml | 233 -
src/xml/ObsStat.xml | 32 -
src/xml/OdaDecoder.xml | 100 -
src/xml/Page.xml | 103 -
src/xml/PageID.xml | 124 -
src/xml/PolarStereographicProjection.xml | 116 -
src/xml/PostScriptDriver.xml | 29 -
src/xml/Proj4Projection.xml | 73 -
src/xml/QtDriver.xml | 39 -
src/xml/SVGDriver.xml | 38 -
src/xml/SatelliteProjection.xml | 19 -
src/xml/SelectionMode.xml | 39 -
src/xml/SubPage.xml | 214 -
src/xml/SubPageProj4.xml | 212 -
src/xml/SuperPage.xml | 183 -
src/xml/SymbolInput.xml | 43 -
src/xml/SymbolPlotting.xml | 441 -
src/xml/TableDecoder.xml | 93 -
src/xml/Taylor.xml | 193 -
src/xml/TextVisitor.xml | 405 -
src/xml/Title.xml | 54 -
src/xml/TitleTemplate.xml | 16 -
src/xml/ValuePlot.xml | 130 -
src/xml/View.xml | 348 -
src/xml/Wind.xml | 343 -
src/xml/XYList.xml | 154 -
src/xml/XYTransformation.xml | 267 -
src/xml/XmlBox.xml | 57 -
src/xml/XmlPage.xml | 39 -
src/xml/XmlSubPage.xml | 46 -
src/xml/graph_params.xml | 233 -
src/xml/magml.xml | 114 -
src/xml/output.xml | 16 -
test/C/Makefile.am | 25 -
test/C/Makefile.in | 724 -
test/C/cairo.c | 52 -
test/C/contours.c | 68 -
test/C/drivers.c | 40 -
test/C/land_sea_shade.c | 72 -
test/C/large_area.c | 61 -
test/CMakeLists.txt | 101 +
test/MagML/Makefile.am | 7 -
test/MagML/Makefile.in | 541 -
test/MagML/drivers.magml | 123 -
test/Makefile.am | 18 -
test/Makefile.in | 656 -
test/bufr.f90 | 31 +
test/bufr.py | 53 +
test/cairo.f90 | 26 +
test/cairo.py | 61 +
test/coast.f90 | 22 +
test/coast.py | 40 +
test/data.bufr | Bin 0 -> 1070184 bytes
test/data/cloudcover.grib | Bin 1557480 -> 0 bytes
test/data/t2m_fc12.grib | Bin 82680 -> 0 bytes
test/data/t850_fc_12.grib | Bin 9840 -> 0 bytes
test/data/uv500.grb | Bin 116400 -> 0 bytes
test/data/wind30m_fc12.grib | Bin 166800 -> 0 bytes
test/data/z500.grb | Bin 58200 -> 0 bytes
test/data/z500_fc_12.grib | Bin 9840 -> 0 bytes
test/fortran/Makefile.am | 15 -
test/fortran/Makefile.in | 692 -
test/fortran/boxplot.f | 168 -
test/fortran/coast_only.f | 52 -
test/fortran/layout_test.f | 572 -
test/fortran/shaded_isolines.f | 131 -
test/fortran/wind.f | 69 -
test/grib.f90 | 38 +
test/grib.py | 71 +
test/odb.py | 32 +
test/python/Makefile.am | 7 -
test/python/Makefile.in | 541 -
test/python/magmacro_example.py | 35 -
test/python/simple.py | 33 -
test/synop.bufr | Bin 0 -> 1070184 bytes
test/test.odb | Bin 0 -> 235010 bytes
tools/CMakeLists.txt | 27 +
tools/Makefile.am | 9 -
tools/Makefile.in | 510 -
tools/RPM_build_specs/EmosLib.spec | 118 +
tools/RPM_build_specs/emoslib/EmosLib.spec | 155 +
tools/RPM_build_specs/emoslib/generateRPM.sh | 47 +
tools/RPM_build_specs/grib_api/rpms/grib_api.spec | 96 +
tools/axis2doc.py | 285 +
tools/beau.py | 10 +
tools/beautify-xml.py | 14 +
tools/generateDebugLibs.sh | 27 +
tools/magml2json.pl | 153 +
tools/make_wrappers | 79 +
tools/metview.py | 17 +
tools/newbase.pl | 111 +
tools/newclass.pl | 117 +
tools/newdriver.pl | 34 +-
tools/newfactory.pl | 147 +
tools/newprojection.pl | 435 +
tools/newtemplate.pl | 118 +
tools/shp_process.ksh | 293 +
tools/x | 1 +
tools/xml2cc.pl | 0
tools/xml2cc.pl.workshop | 742 +
tools/xml2cc_list.pl | 140 +
tools/xml2cc_new.pl | 1 +
tools/xml2doc.pl | 147 +
tools/xml2doc.py | 203 +
tools/xml2dtd.pl | 0
tools/xml2html.py | 197 +
tools/xml2icon.pl | 149 +
tools/xml2mv.pl | 4 +-
tools/xml2mv.py | 848 +
tools/xml2odt.py | 87 +
tools/xml2odt.sh | 40 +
tools/xml2split.py | 70 +
version.sh | 4 +-
1271 files changed, 82923 insertions(+), 111447 deletions(-)
diff --cc debian/changelog
index a8e72ca,a24cf77..eb4d587
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,11 -2,52 +2,54 @@@ magics++ (2.24.4-1) unstable; urgency=m
* New upstream release.
* Standards-Version: 3.9.6
+ * emoslib now builds on mips, so remove exception for its dependency
+ * Add Vcs-Git, pointing to debian-science repo.
- -- Alastair McKinstry <mckinstry at debian.org> Wed, 29 Apr 2015 08:09:32 +0100
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 22 Jun 2015 18:34:53 +0100
+ magics++ (2.22.7.dfsg.1-4) unstable; urgency=medium
+
+ * Build -fPIC for mipsel. Closes: #766832
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 30 Oct 2014 19:17:49 +0000
+
+ magics++ (2.22.7.dfsg.1-3) unstable; urgency=medium
+
+ * Ship all header files in /usr/include/magics.
+ * Fix arch-dependent stuff in magics-config, which breaks multiarch.
+ Pull from magics.pc instead. Closes: #732621.
+ * Include HAVE_* definitions in extra flags passed to Cmake so that
+ magics_config matches 2.8.15 version needed for metview.
+ Closes: #765524.
+ * Disable qt5 for the moment.
+ * Enable MAGICS_TIFF. Add libtiff-dev to dependencies.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 15 Oct 2014 12:19:12 +0100
+
+ magics++ (2.22.7.dfsg.1-2) unstable; urgency=medium
+
+ * Disable OS Check so we build Hurd, kFreeBSD.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 05 Oct 2014 12:44:43 +0100
+
+ magics++ (2.22.7.dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release. Build using cmake not configure.
+ Closes: #677210.
+ * DFSG version as .bin files removed (unnecessary).
+ * Now use xz compression.
+ * grib-api now works on mips, so drop conditional depenency on not using
+ emos/grib-api on mips. Closes: #756591.
+ * Drop unnecessary dependency on python3-all-dev until python3 is supported.
+ Closes: #750599.
+ * Build against Qt5
+ * Add ksh depends for magics++ (magjson script)
+ * Add versioned soname for libmagplus.so.3.0.0
+ * Add drop-gen-dates.patch to drop dates in autogenerated header files;
+ creates false positives in diff-detection scripts. Closes: #731621.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Tue, 16 Sep 2014 01:32:56 +0100
+
magics++ (2.18.15-6) unstable; urgency=medium
* Add dependency on libterralib-dev to libmagics++-dev. Change references
diff --cc debian/control
index 6e02ed4,d266c2d..19f9db7
--- a/debian/control
+++ b/debian/control
@@@ -15,8 -14,7 +15,8 @@@ Build-Depends: debhelper (>= 9) , dh-b
libqt4-dev
Standards-Version: 3.9.6
Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
++Vcs-Git: git://git.debian.org/git/debian-science/packages/magics.git
X-Python-Version: >= 2.6
- X-Python3-Version: >= 3.4
Package: libmagplus3
Section: libs
diff --cc debian/patches/series
index e77c9a6,eb8c424..2bb594a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -5,4 -4,7 +4,7 @@@ terralib.patc
gcc-4.7.patch
magics-config.patch
fix-headers.patch
+ geotiff.patch
+ soname-version.patch
-qt5.patch
++# qt5.patch
+ grib-cmake.patch
--
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