[magics] 01/01: Upstream 2.29.4
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Oct 29 17:17:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag upstream/2.29.4
in repository magics.
commit 31aa23d5e2b6b13603e5dd6d538d93eb37395376
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Sep 5 12:14:40 2016 +0100
Upstream 2.29.4
---
CMakeLists.txt | 5 +-
VERSION.cmake | 4 +-
bin/ecbuild | 60 ++++++-----
bin/magjsonx | Bin 0 -> 39201 bytes
bin/magmlx | Bin 0 -> 38585 bytes
bin/metgramx | Bin 0 -> 66389 bytes
cmake/VERSION.cmake | 4 +-
cmake/ecbuild_add_c_flags.cmake | 12 ++-
cmake/ecbuild_add_cxx_flags.cmake | 12 ++-
cmake/ecbuild_add_fortran_flags.cmake | 12 ++-
cmake/ecbuild_add_option.cmake | 3 +-
cmake/ecbuild_check_functions.cmake | 2 +
cmake/ecbuild_check_os.cmake | 56 ++++++-----
cmake/ecbuild_config.h.in | 2 +
cmake/ecbuild_find_lexyacc.cmake | 5 +-
cmake/ecbuild_find_python.cmake | 2 +-
share/magics/epsg.json | 10 ++
share/magics/table_128.xml | 7 --
src/basic/FortranMagics.cc | 3 +-
src/basic/LegendVisitor.cc | 110 +++++++--------------
src/basic/LegendVisitor.h | 23 +----
src/common/Arrow.h | 26 +++--
src/common/ArrowProperties.cc | 26 +++--
src/common/ArrowProperties.h | 26 +++--
src/common/AutoLock.h | 26 +++--
src/common/AutoLocker.cc | 26 +++--
src/common/AutomaticPlotManager.cc | 26 +++--
src/common/AutomaticPlotManager.h | 26 +++--
src/common/BackgroundColour.h | 26 +++--
src/common/BaseParameter.cc | 26 +++--
src/common/BaseParameter.h | 26 +++--
src/common/BasePointsHandler.cc | 26 +++--
src/common/BasePointsHandler.h | 26 +++--
src/common/CartesianTransformation.cc | 26 +++--
src/common/CartesianTransformation.h | 28 ++++--
src/common/Clipper.h | 26 +++--
src/common/Colour.cc | 26 +++--
src/common/Colour.h | 28 ++++--
src/common/ColourTable.cc | 26 +++--
src/common/ColourTable.h | 26 +++--
src/common/ColourTableDefinition.h | 26 +++--
src/common/ColourTableDefinitionCompute.cc | 26 +++--
src/common/ColourTableDefinitionCompute.h | 26 +++--
src/common/ColourTableDefinitionComputeInterface.h | 26 +++--
src/common/ColourTableDefinitionList.cc | 26 +++--
src/common/ColourTableDefinitionList.h | 26 +++--
src/common/ColourTableDefinitionListInterface.h | 26 +++--
src/common/Coordinate.cc | 26 +++--
src/common/Coordinate.h | 26 +++--
src/common/CustomisedPoint.h | 26 +++--
src/common/Data.cc | 26 +++--
src/common/Data.h | 26 +++--
src/common/DataStats.cc | 26 +++--
src/common/DataStats.h | 27 +++--
src/common/Decoder.h | 26 +++--
src/common/Dimension.cc | 26 +++--
src/common/Dimension.h | 26 +++--
src/common/DriverStatic.cc | 26 +++--
src/common/DriverStatic.h | 26 +++--
src/common/Factory.cc | 26 +++--
src/common/Factory.h | 26 +++--
src/common/Flag.cc | 26 +++--
src/common/Flag.h | 26 +++--
src/common/Frame.cc | 26 +++--
src/common/Frame.h | 26 +++--
src/common/FrameBase.cc | 26 +++--
src/common/FrameBase.h | 26 +++--
src/common/FullPaperPoint.h | 26 +++--
src/common/GeoPoint.h | 26 +++--
src/common/GeoRectangularProjection.cc | 37 ++++---
src/common/GeoRectangularProjection.h | 30 ++++--
src/common/GribInterpretor.h | 28 ++++--
src/common/HeightTableDefinition.h | 26 +++--
src/common/Image.h | 26 +++--
src/common/ImageProperties.h | 26 +++--
src/common/ImportObject.cc | 26 +++--
src/common/ImportObject.h | 26 +++--
src/common/InteractiveSet.cc | 26 +++--
src/common/InteractiveSet.h | 26 +++--
src/common/IntervalMap.h | 26 +++--
src/common/Label.cc | 26 +++--
src/common/Label.h | 26 +++--
src/common/Layout.cc | 26 +++--
src/common/Layout.h | 26 +++--
src/common/LevelTableDefinition.h | 26 +++--
src/common/LogoPlotting.cc | 26 +++--
src/common/LogoPlotting.h | 26 +++--
src/common/LogoPlottingBase.h | 26 +++--
src/common/MagException.cc | 26 +++--
src/common/MagException.h | 26 +++--
src/common/MagExceptions.cc | 26 +++--
src/common/MagExceptions.h | 26 +++--
src/common/MagFont.cc | 26 +++--
src/common/MagFont.h | 26 +++--
src/common/MagLog.cc | 26 +++--
src/common/MagLog.h | 26 +++--
src/common/MagTranslator.h | 26 +++--
src/common/MagicsCalls.cc | 26 +++--
src/common/MagicsFormat.cc | 26 +++--
src/common/MagicsFormat.h | 33 ++++---
src/common/MagicsParameter.cc | 26 +++--
src/common/MagicsParameter.h | 26 +++--
src/common/MagicsSingleton.h | 27 +++--
src/common/MagicsThreads.cc | 26 +++--
src/common/MagicsThreads.h | 26 +++--
src/common/Matrix.cc | 28 ++++--
src/common/Matrix.h | 26 +++--
src/common/MatrixHandler.h | 26 +++--
src/common/MetaData.cc | 26 +++--
src/common/MetaData.h | 26 +++--
src/common/Mutex.cc | 26 +++--
src/common/Mutex.h | 26 +++--
src/common/MutexCond.cc | 26 +++--
src/common/MutexCond.h | 42 ++++++--
src/common/Node.cc | 26 +++--
src/common/Node.h | 26 +++--
src/common/OutputFactory.cc | 26 +++--
src/common/OutputFactory.h | 26 +++--
src/common/OutputHandler.cc | 26 +++--
src/common/OutputHandler.h | 26 +++--
src/common/PageID.cc | 26 +++--
src/common/PageID.h | 26 +++--
src/common/PageIDBase.h | 26 +++--
src/common/PaperDimension.h | 26 +++--
src/common/PaperPoint.h | 26 +++--
src/common/ParameterManager.cc | 26 +++--
src/common/ParameterManager.h | 26 +++--
src/common/Path.h | 26 +++--
src/common/PlotManager.cc | 26 +++--
src/common/PlotManager.h | 26 +++--
src/common/PointsHandler.cc | 26 +++--
src/common/PointsHandler.h | 26 +++--
src/common/PolarStereographicProjection.cc | 31 ++++--
src/common/PolarStereographicProjection.h | 30 ++++--
src/common/PolyCoast.h | 27 +++--
src/common/Polyline.cc | 45 ++++++---
src/common/Polyline.h | 26 +++--
src/common/ProgressObject.cc | 26 +++--
src/common/ProgressObject.h | 26 +++--
src/common/ProgressTask.cc | 26 +++--
src/common/ProgressTask.h | 26 +++--
src/common/Proj4Projection.cc | 74 +++++++++++---
src/common/Proj4Projection.h | 35 +++++--
src/common/RasterData.cc | 26 +++--
src/common/RasterData.h | 26 +++--
src/common/SciMethods.cc | 28 ++++--
src/common/SciMethods.h | 28 ++++--
src/common/Seconds.cc | 29 ++++--
src/common/Seconds.h | 26 +++--
src/common/Static.cc | 26 +++--
src/common/Static.h | 26 +++--
src/common/Symbol.cc | 26 +++--
src/common/Symbol.h | 26 +++--
src/common/TableDefinition.h | 26 +++--
src/common/TableDefinitionCompute.cc | 26 +++--
src/common/TableDefinitionCompute.h | 26 +++--
src/common/TableDefinitionComputeInterface.h | 26 +++--
src/common/TableDefinitionList.cc | 26 +++--
src/common/TableDefinitionList.h | 26 +++--
src/common/TableDefinitionListInterface.h | 26 +++--
src/common/Task.cc | 26 +++--
src/common/Task.h | 26 +++--
src/common/TaylorProjection.cc | 28 ++++--
src/common/TaylorProjection.h | 28 ++++--
src/common/Tephigram.cc | 28 ++++--
src/common/Tephigram.h | 28 ++++--
src/common/Text.cc | 26 +++--
src/common/Text.h | 26 +++--
src/common/Thread.cc | 26 +++--
src/common/Thread.h | 26 +++--
src/common/ThreadControler.cc | 26 +++--
src/common/ThreadControler.h | 26 +++--
src/common/ThreadSingleton.cc | 26 +++--
src/common/ThreadSingleton.h | 26 +++--
src/common/Timer.cc | 26 +++--
src/common/Timer.h | 26 +++--
src/common/Tokenizer.cc | 26 +++--
src/common/Tokenizer.h | 26 +++--
src/common/Transformation.cc | 19 ++++
src/common/Transformation.h | 30 +++---
src/common/UserPoint.h | 26 +++--
src/common/Visualiser.h | 26 +++--
src/common/XCoordinate.h | 26 +++--
src/common/XmlNode.cc | 26 +++--
src/common/XmlNode.h | 26 +++--
src/common/XmlReader.cc | 26 +++--
src/common/XmlReader.h | 26 +++--
src/common/XmlTree.cc | 26 +++--
src/common/XmlTree.h | 26 +++--
src/common/YCoordinate.h | 26 +++--
src/common/aix.h | 26 +++--
src/common/linux.h | 26 +++--
src/common/magics_api.h | 26 +++--
src/common/marsmachine.h | 26 +++--
src/decoders/InputMatrixInterpretor.cc | 7 +-
src/drivers/CairoDriver.cc | 26 ++++-
src/params/CMakeLists.txt | 1 +
src/params/FortranViewNode.xml | 2 +-
src/params/Proj4Mercator.xml | 12 +++
src/params/XmlViewNode.xml | 2 +-
src/visualisers/Akima474.cc | 26 +++--
src/visualisers/Akima474Method.h | 26 +++--
src/visualisers/Akima760.cc | 26 +++--
src/visualisers/Akima760Method.cc | 26 +++--
src/visualisers/Akima760Method.h | 26 +++--
src/visualisers/Akima761.cc | 26 +++--
src/visualisers/Akima761Method.cc | 26 +++--
src/visualisers/Akima761Method.h | 26 +++--
src/visualisers/ArrowPlotting.cc | 26 +++--
src/visualisers/ArrowPlotting.h | 26 +++--
src/visualisers/AutomaticContourMethod.h | 26 +++--
src/visualisers/Axis.cc | 30 +++---
src/visualisers/Axis.h | 26 +++--
src/visualisers/AxisControl.cc | 26 +++--
src/visualisers/AxisControl.h | 26 +++--
src/visualisers/AxisGrid.cc | 26 +++--
src/visualisers/AxisGrid.h | 26 +++--
src/visualisers/AxisItem.cc | 26 +++--
src/visualisers/AxisItem.h | 26 +++--
src/visualisers/AxisLine.cc | 26 +++--
src/visualisers/AxisLine.h | 26 +++--
src/visualisers/AxisMethod.cc | 26 +++--
src/visualisers/AxisMethod.h | 26 +++--
src/visualisers/AxisMinorTick.cc | 26 +++--
src/visualisers/AxisMinorTick.h | 26 +++--
src/visualisers/AxisTick.cc | 26 +++--
src/visualisers/AxisTick.h | 26 +++--
src/visualisers/AxisTickLabelType.cc | 26 +++--
src/visualisers/AxisTickLabelType.h | 26 +++--
src/visualisers/AxisType.cc | 26 +++--
src/visualisers/AxisType.h | 26 +++--
src/visualisers/Bar.cc | 26 +++--
src/visualisers/Bar.h | 26 +++--
src/visualisers/BothValuePlotMethod.h | 26 +++--
src/visualisers/Boundaries.cc | 28 ++++--
src/visualisers/Boundaries.h | 26 +++--
src/visualisers/BoxPlotBasicItem.h | 26 +++--
src/visualisers/BoxPlotItem.cc | 26 +++--
src/visualisers/BoxPlotItem.h | 26 +++--
src/visualisers/BoxPlotVisualiser.cc | 26 +++--
src/visualisers/BoxPlotVisualiser.h | 26 +++--
src/visualisers/CalculateColourTechnique.cc | 26 +++--
src/visualisers/CalculateColourTechnique.h | 26 +++--
src/visualisers/CalmIndicator.h | 26 +++--
src/visualisers/CellShading.cc | 75 ++++++--------
src/visualisers/CellShading.h | 27 +++--
src/visualisers/Cities.cc | 26 +++--
src/visualisers/Cities.h | 26 +++--
src/visualisers/CoastPlotting.cc | 26 +++--
src/visualisers/CoastPlotting.h | 26 +++--
src/visualisers/Coastlines.cc | 26 +++--
src/visualisers/Coastlines.h | 26 +++--
src/visualisers/ColourSelection.cc | 26 +++--
src/visualisers/ColourSelection.h | 26 +++--
src/visualisers/ColourSelectionCount.cc | 26 +++--
src/visualisers/ColourSelectionCount.h | 26 +++--
src/visualisers/ColourSelectionList.cc | 26 +++--
src/visualisers/ColourSelectionList.h | 26 +++--
src/visualisers/ColourTechnique.cc | 26 +++--
src/visualisers/ColourTechnique.h | 26 +++--
src/visualisers/Contour.cc | 26 +++--
src/visualisers/Contour.h | 26 +++--
src/visualisers/ContourMethod.h | 26 +++--
src/visualisers/CountSelectionType.cc | 26 +++--
src/visualisers/CountSelectionType.h | 26 +++--
src/visualisers/Curve.cc | 26 +++--
src/visualisers/Curve.h | 26 +++--
src/visualisers/DateAxis.cc | 26 +++--
src/visualisers/DateAxis.h | 26 +++--
src/visualisers/DefinitionTable.h | 26 +++--
src/visualisers/DefinitionTable.hcc | 26 +++--
src/visualisers/DotPolyShadingMethod.h | 26 +++--
src/visualisers/EpsForecastPlot.h | 26 +++--
src/visualisers/EpsGraph.cc | 27 +++--
src/visualisers/EpsGraph.h | 26 +++--
src/visualisers/EquidistantTableMode.cc | 26 +++--
src/visualisers/EquidistantTableMode.h | 26 +++--
src/visualisers/Filter.cc | 26 +++--
src/visualisers/Filter.h | 26 +++--
src/visualisers/FlagPlotting.cc | 26 +++--
src/visualisers/FlagPlotting.h | 26 +++--
src/visualisers/FloatSelection.cc | 26 +++--
src/visualisers/FloatSelection.h | 26 +++--
src/visualisers/Graph.h | 26 +++--
src/visualisers/GraphPlotting.cc | 26 +++--
src/visualisers/GraphPlotting.h | 26 +++--
src/visualisers/GraphShade.cc | 26 +++--
src/visualisers/GraphShade.h | 26 +++--
src/visualisers/GraphShadeStyle.cc | 26 +++--
src/visualisers/GraphShadeStyle.h | 26 +++--
src/visualisers/GribTables.h | 26 +++--
src/visualisers/GridPlotting.cc | 26 +++--
src/visualisers/GridPlotting.h | 26 +++--
src/visualisers/HatchPolyShadingMethod.h | 26 +++--
src/visualisers/HeightSelection.cc | 26 +++--
src/visualisers/HeightSelection.h | 26 +++--
src/visualisers/HeightSelectionCount.h | 26 +++--
src/visualisers/HeightSelectionList.h | 26 +++--
src/visualisers/HeightTechnique.cc | 26 +++--
src/visualisers/HeightTechnique.h | 26 +++--
src/visualisers/HiLo.cc | 26 +++--
src/visualisers/HiLo.h | 26 +++--
src/visualisers/HiLoBase.h | 26 +++--
src/visualisers/HiLoBoth.h | 26 +++--
src/visualisers/HiLoMarker.h | 26 +++--
src/visualisers/HiLoMarkerBase.h | 26 +++--
src/visualisers/HiLoNumber.h | 26 +++--
src/visualisers/HiLoTechnique.h | 26 +++--
src/visualisers/HiLoText.h | 26 +++--
src/visualisers/HistoIndividualMode.h | 26 +++--
src/visualisers/HistoMode.h | 26 +++--
src/visualisers/HistoTableMode.h | 26 +++--
src/visualisers/Histogram.cc | 26 +++--
src/visualisers/Histogram.h | 26 +++--
src/visualisers/ImageCalculateColourTechnique.h | 26 +++--
src/visualisers/ImageListColourTechnique.h | 26 +++--
src/visualisers/ImportPlot.h | 26 +++--
src/visualisers/IntervalSelectionType.cc | 26 +++--
src/visualisers/IntervalSelectionType.h | 26 +++--
src/visualisers/Intervals.h | 26 +++--
src/visualisers/IsoHighlight.h | 26 +++--
src/visualisers/IsoLabel.cc | 26 +++--
src/visualisers/IsoLabel.h | 26 +++--
src/visualisers/IsoPlot.cc | 59 +++++------
src/visualisers/IsoPlot.h | 26 +++--
src/visualisers/IsoShading.cc | 26 +++--
src/visualisers/IsoShading.h | 26 +++--
src/visualisers/LabelPlotting.cc | 26 +++--
src/visualisers/LabelPlotting.h | 26 +++--
src/visualisers/LabelPlottingBase.h | 26 +++--
src/visualisers/LegendMethod.cc | 48 +++++----
src/visualisers/LegendMethod.h | 26 +++--
src/visualisers/LevelListSelectionType.cc | 26 +++--
src/visualisers/LevelListSelectionType.h | 26 +++--
src/visualisers/LevelSelection.cc | 26 +++--
src/visualisers/LevelSelection.h | 26 +++--
src/visualisers/LinearTableMode.cc | 26 +++--
src/visualisers/LinearTableMode.h | 26 +++--
src/visualisers/ListColourTechnique.cc | 26 +++--
src/visualisers/ListColourTechnique.h | 26 +++--
src/visualisers/LookupTableMode.cc | 26 +++--
src/visualisers/LookupTableMode.h | 26 +++--
src/visualisers/MarkerSelection.h | 26 +++--
src/visualisers/MarkerSelectionCount.h | 26 +++--
src/visualisers/MarkerSelectionList.h | 26 +++--
src/visualisers/MarkerShadingTechnique.cc | 26 +++--
src/visualisers/MarkerShadingTechnique.h | 26 +++--
src/visualisers/MarkerValuePlotMethod.h | 26 +++--
src/visualisers/MetgramGraph.cc | 26 +++--
src/visualisers/MetgramGraph.h | 26 +++--
src/visualisers/MetgramStyle.cc | 26 +++--
src/visualisers/MetgramStyle.h | 26 +++--
src/visualisers/NormalTableMode.cc | 26 +++--
src/visualisers/NormalTableMode.h | 26 +++--
src/visualisers/ObsItem.h | 26 +++--
src/visualisers/ObsItemFamily.cc | 26 +++--
src/visualisers/ObsItemFamily.h | 26 +++--
src/visualisers/ObsPlotting.cc | 26 +++--
src/visualisers/ObsPlotting.h | 26 +++--
src/visualisers/ObsTable.cc | 26 +++--
src/visualisers/ObsTable.h | 26 +++--
src/visualisers/OriginMarker.h | 26 +++--
src/visualisers/OutLayerTechnique.cc | 26 +++--
src/visualisers/OutLayerTechnique.h | 26 +++--
src/visualisers/PolyShadingMethod.cc | 26 +++--
src/visualisers/PolyShadingMethod.h | 26 +++--
src/visualisers/PolyShadingTechnique.cc | 26 +++--
src/visualisers/PolyShadingTechnique.h | 26 +++--
src/visualisers/ShadingTechnique.h | 26 +++--
src/visualisers/SimplePolylineVisualiser.cc | 26 +++--
src/visualisers/SimplePolylineVisualiser.h | 26 +++--
src/visualisers/Streamlines.cc | 28 ++++--
src/visualisers/Streamlines.h | 26 +++--
src/visualisers/SymbolAdvancedTableMode.cc | 26 +++--
src/visualisers/SymbolAdvancedTableMode.h | 26 +++--
src/visualisers/SymbolMode.cc | 26 +++--
src/visualisers/SymbolMode.h | 30 +++---
src/visualisers/SymbolPlotting.cc | 26 +++--
src/visualisers/SymbolPlotting.h | 26 +++--
src/visualisers/TaylorGrid.cc | 26 +++--
src/visualisers/TaylorGrid.h | 26 +++--
src/visualisers/TephiGrid.cc | 26 +++--
src/visualisers/TephiGrid.h | 26 +++--
src/visualisers/TextOrientation.cc | 26 +++--
src/visualisers/TextOrientation.h | 26 +++--
src/visualisers/UserDate.cc | 26 +++--
src/visualisers/UserDate.h | 26 +++--
src/visualisers/ValuePlot.cc | 26 +++--
src/visualisers/ValuePlot.h | 26 +++--
src/visualisers/ValuePlotBase.h | 26 +++--
src/visualisers/ValuePlotMethod.h | 26 +++--
src/visualisers/VisDefInfo.h | 26 +++--
src/visualisers/Wind.cc | 28 ++++--
src/visualisers/Wind.h | 26 +++--
src/visualisers/WindPlotting.cc | 26 +++--
src/visualisers/WindPlotting.h | 26 +++--
396 files changed, 6644 insertions(+), 3598 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 007014f..1706874 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,9 +64,8 @@ ecbuild_add_option( FEATURE BUFR
ecbuild_add_option( FEATURE ODB
DEFAULT ON
DESCRIPTION "ODB support"
- REQUIRED_PACKAGES
- "PROJECT odb_api VERSION 0.10.2"
- "PROJECT eckit VERSION 0.9.0" )
+ REQUIRED_PACKAGES "PROJECT odb_api VERSION 0.10.2")
+ # "PROJECT eckit VERSION 0.9.0" )
ecbuild_add_option( FEATURE CAIRO
DEFAULT ON
diff --git a/VERSION.cmake b/VERSION.cmake
index 072254a..cf6bbc4 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -6,9 +6,9 @@
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
-set ( metabuilder_version 2.30.0 )
-set ( _version 2.30.0 )
+set ( metabuilder_version 2.29.4 )
+set ( _version 2.29.4 )
if ( MAGICS_BUILD )
set( ${PROJECT_NAME}_VERSION_STR "${_version}-${MAGICS_BUILD}" )
else ()
diff --git a/bin/ecbuild b/bin/ecbuild
index d1ffff4..0ee4b13 100755
--- a/bin/ecbuild
+++ b/bin/ecbuild
@@ -2,8 +2,8 @@
set -eua
-CMAKE_MIN_REQUIRED=2.8.10
-CMAKE_BUILD_VERSION=3.4.1
+CMAKE_MIN_REQUIRED=2.8.11
+CMAKE_BUILD_VERSION=3.5.2
usage()
{
@@ -93,10 +93,10 @@ Available values for "option":
that this is only accelerating fresh builds, as cmake internally
caches also. Therefore this option is *not* recommended.
- --build-cmake
- Automatically download and build CMake version $CMAKE_BUILD_VERSION if the CMake
- version found does not meet the minimum requirements (version $CMAKE_MIN_REQUIRED
- is required). Requires an internet connection and may take a while.
+ --build-cmake[=<prefix>]
+ Automatically download and build CMake version $CMAKE_BUILD_VERSION.
+ Requires an internet connection and may take a while. If no prefix
+ is given, install into $PWD.
--dryrun
Don't actually execute the cmake call, just print what would have
@@ -275,7 +275,7 @@ while test $# -gt 0; do
case "$1" in
--*=*)
opt=`echo "$1" | sed 's/=.*//'`
- val=`echo "$1" | sed 's/--[_a-zA-Z0-9]*=//'`
+ val=`echo "$1" | sed 's/--[_a-zA-Z0-9-]*=//'`
;;
--*)
opt=$1
@@ -336,6 +336,9 @@ while test $# -gt 0; do
;;
--build-cmake)
build_cmake="yes"
+ if [[ -n $val ]]; then
+ cmake_prefix="$val"
+ fi
;;
--)
shift
@@ -358,6 +361,7 @@ src=${srcARG:=""}
cmake=${cmakebin:=cmake}
dryrun=${dryrun:=no}
build_cmake=${build_cmake:=""}
+cmake_prefix=${cmake_prefix:=$PWD}
cmake_found=""
cmake_version_sufficient=""
@@ -369,30 +373,13 @@ version_gte() {
[ "$2" = "$(echo -e "$1\n$2" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -k 4,4 -g | head -n1)" ]
}
-# Check if the cmake version is sufficient
-check_cmake() {
- # Check if cmake is available
- if $(command -v $cmake >/dev/null 2>&1); then
- cmake_found="yes"
- cmake_version=$($cmake --version | head -n1 | awk '{ print $3 }')
- echo "Found CMake version $cmake_version" >& 2
- if version_gte $cmake_version $CMAKE_MIN_REQUIRED; then
- cmake_version_sufficient="yes"
- fi
- fi
-}
-check_cmake
# Use already built CMake if any
-if [[ ! $cmake_version_sufficient && -x bin/cmake ]]; then
- echo "Using already built CMake in $PWD/bin/cmake" >&2
- cmake=bin/cmake
- check_cmake
-fi
-
+if [[ -x "${cmake_prefix}/bin/cmake" ]]; then
+ echo "Using already built CMake in ${cmake_prefix}/bin/cmake" >&2
+ cmake="${cmake_prefix}/bin/cmake"
# Build CMake if requested and no sufficient version found
-if [[ ! $cmake_version_sufficient && $build_cmake ]]; then
- echo "CMake version $CMAKE_MIN_REQUIRED is required but only $cmake_version was found." >&2
- echo "Building CMake version ${CMAKE_BUILD_VERSION} ..." >&2
+elif [[ $build_cmake ]]; then
+ echo "Building CMake version ${CMAKE_BUILD_VERSION} and installing into ${cmake_prefix} ..." >&2
tarball=cmake-${CMAKE_BUILD_VERSION}.tar.gz
if [[ ! -r $tarball ]]; then
url=http://www.cmake.org/files/v${CMAKE_BUILD_VERSION:0:3}/$tarball
@@ -411,10 +398,19 @@ if [[ ! $cmake_version_sufficient && $build_cmake ]]; then
(
mkdir -p build_cmake
cd build_cmake
- ../cmake-${CMAKE_BUILD_VERSION}/bootstrap --prefix=.. && make && make install
+ ../cmake-${CMAKE_BUILD_VERSION}/bootstrap --prefix="${cmake_prefix}" && make && make install
)
- cmake=bin/cmake
- check_cmake
+ cmake="${cmake_prefix}/bin/cmake"
+fi
+
+# Check if the cmake version is sufficient
+if $(command -v $cmake >/dev/null 2>&1); then
+ cmake_found="yes"
+ cmake_version=$($cmake --version | head -n1 | awk '{ print $3 }')
+ echo "Found CMake version $cmake_version" >& 2
+ if version_gte $cmake_version $CMAKE_MIN_REQUIRED; then
+ cmake_version_sufficient="yes"
+ fi
fi
# Fail if we don't have a sufficient CMake
diff --git a/bin/magjsonx b/bin/magjsonx
new file mode 100755
index 0000000..15c5502
Binary files /dev/null and b/bin/magjsonx differ
diff --git a/bin/magmlx b/bin/magmlx
new file mode 100755
index 0000000..0ce4c86
Binary files /dev/null and b/bin/magmlx differ
diff --git a/bin/metgramx b/bin/metgramx
new file mode 100755
index 0000000..e269f8a
Binary files /dev/null and b/bin/metgramx differ
diff --git a/cmake/VERSION.cmake b/cmake/VERSION.cmake
index a65cc6d..ff7b93b 100644
--- a/cmake/VERSION.cmake
+++ b/cmake/VERSION.cmake
@@ -1,7 +1,7 @@
set( ECBUILD_MAJOR_VERSION "2" )
-set( ECBUILD_MINOR_VERSION "2" )
+set( ECBUILD_MINOR_VERSION "3" )
set( ECBUILD_PATCH_VERSION "0" )
-set( ECBUILD_VERSION_STR "2.2.0" )
+set( ECBUILD_VERSION_STR "2.3.0" )
set( ECBUILD_MACRO_VERSION "${ECBUILD_MAJOR_VERSION}.${ECBUILD_MINOR_VERSION}" )
diff --git a/cmake/ecbuild_add_c_flags.cmake b/cmake/ecbuild_add_c_flags.cmake
index e6923a9..098c254 100644
--- a/cmake/ecbuild_add_c_flags.cmake
+++ b/cmake/ecbuild_add_c_flags.cmake
@@ -16,7 +16,8 @@
#
# ecbuild_add_c_flags( <flag1> [ <flag2> ... ]
# [ BUILD <build> ]
-# [ NAME <name> ] )
+# [ NAME <name> ]
+# [ NO_FAIL ] )
#
# Options
# -------
@@ -27,6 +28,9 @@
# NAME : optional
# name of the check (if omitted, checks are enumerated)
#
+# NO_FAIL : optional
+# do not fail if the flag cannot be added
+#
##############################################################################
macro( ecbuild_add_c_flags m_c_flags )
@@ -34,7 +38,7 @@ macro( ecbuild_add_c_flags m_c_flags )
set( _flags ${m_c_flags} )
if( _flags AND CMAKE_C_COMPILER_LOADED )
- set( options )
+ set( options NO_FAIL )
set( single_value_args BUILD NAME )
set( multi_value_args )
@@ -75,8 +79,10 @@ macro( ecbuild_add_c_flags m_c_flags )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_flags}" )
ecbuild_debug( "C FLAG [${_flags}] added" )
endif()
+ elseif( _PAR_NO_FAIL )
+ ecbuild_info( "Unrecognised C flag [${_flags}] -- skipping" )
else()
- ecbuild_warn( "Unrecognised C flag [${_flags}] -- skipping" )
+ ecbuild_error( "Unrecognised C flag [${_flags}]" )
endif()
endif()
unset( _flags )
diff --git a/cmake/ecbuild_add_cxx_flags.cmake b/cmake/ecbuild_add_cxx_flags.cmake
index 63c442e..5104880 100644
--- a/cmake/ecbuild_add_cxx_flags.cmake
+++ b/cmake/ecbuild_add_cxx_flags.cmake
@@ -16,7 +16,8 @@
#
# ecbuild_add_cxx_flags( <flag1> [ <flag2> ... ]
# [ BUILD <build> ]
-# [ NAME <name> ] )
+# [ NAME <name> ]
+# [ NO_FAIL ] )
#
# Options
# -------
@@ -27,13 +28,16 @@
# NAME : optional
# name of the check (if omitted, checks are enumerated)
#
+# NO_FAIL : optional
+# do not fail if the flag cannot be added
+#
##############################################################################
macro( ecbuild_add_cxx_flags m_cxx_flags )
set( _flags ${m_cxx_flags} )
if( _flags AND CMAKE_CXX_COMPILER_LOADED )
- set( options )
+ set( options NO_FAIL )
set( single_value_args BUILD NAME )
set( multi_value_args )
@@ -75,8 +79,10 @@ macro( ecbuild_add_cxx_flags m_cxx_flags )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flags}" )
ecbuild_debug( "C++ FLAG [${_flags}] added" )
endif()
- else()
+ elseif( _PAR_NO_FAIL )
ecbuild_info( "Unrecognised CXX flag [${_flags}] -- skipping" )
+ else()
+ ecbuild_error( "Unrecognised CXX flag [${_flags}]" )
endif()
endif()
unset( _flags )
diff --git a/cmake/ecbuild_add_fortran_flags.cmake b/cmake/ecbuild_add_fortran_flags.cmake
index 86cea83..17b9bf2 100644
--- a/cmake/ecbuild_add_fortran_flags.cmake
+++ b/cmake/ecbuild_add_fortran_flags.cmake
@@ -17,7 +17,8 @@
#
# ecbuild_add_fortran_flags( <flag1> [ <flag2> ... ]
# [ BUILD <build> ]
-# [ NAME <name> ] )
+# [ NAME <name> ]
+# [ NO_FAIL ] )
#
# Options
# -------
@@ -29,6 +30,9 @@
# NAME : optional
# name of the check (if omitted, checks are enumerated)
#
+# NO_FAIL : optional
+# do not fail if the flag cannot be added
+#
##############################################################################
include( CheckFortranCompilerFlag )
@@ -38,7 +42,7 @@ macro( ecbuild_add_fortran_flags m_fortran_flags )
if( _flags AND CMAKE_Fortran_COMPILER_LOADED )
- set( options )
+ set( options NO_FAIL )
set( single_value_args BUILD NAME )
set( multi_value_args )
@@ -80,8 +84,10 @@ macro( ecbuild_add_fortran_flags m_fortran_flags )
set( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${_flags}" )
ecbuild_debug( "Fortran FLAG [${_flags}] added" )
endif()
- else()
+ elseif( _PAR_NO_FAIL )
ecbuild_info( "Unrecognised Fortran flag [${_flags}] -- skipping" )
+ else()
+ ecbuild_error( "Unrecognised Fortran flag [${_flags}]" )
endif()
endif()
diff --git a/cmake/ecbuild_add_option.cmake b/cmake/ecbuild_add_option.cmake
index c270517..8261bd4 100644
--- a/cmake/ecbuild_add_option.cmake
+++ b/cmake/ecbuild_add_option.cmake
@@ -282,7 +282,8 @@ macro( ecbuild_add_option )
if( _${_p_FEATURE}_condition )
ecbuild_critical( "Feature ${_p_FEATURE} cannot be enabled -- following required packages weren't found: ${_failed_to_find_packages}" )
else()
- ecbuild_critical( "Feature ${_p_FEATURE} cannot be enabled -- following condition was not met: ${_p_CONDITION}" )
+ string(REPLACE ";" " " _condition_msg "${_p_CONDITION}")
+ ecbuild_critical( "Feature ${_p_FEATURE} cannot be enabled -- following condition was not met: ${_condition_msg}" )
endif()
else()
if( _${_p_FEATURE}_condition )
diff --git a/cmake/ecbuild_check_functions.cmake b/cmake/ecbuild_check_functions.cmake
index 7b850e9..88526b5 100644
--- a/cmake/ecbuild_check_functions.cmake
+++ b/cmake/ecbuild_check_functions.cmake
@@ -20,6 +20,8 @@ if( ENABLE_OS_FUNCTIONS_TEST )
ecbuild_cache_check_symbol_exists( ftruncate "sys/types.h;unistd.h" EC_HAVE_FTRUNCATE )
ecbuild_cache_check_symbol_exists( open "sys/types.h;sys/stat.h;fcntl.h" EC_HAVE_OPEN )
ecbuild_cache_check_symbol_exists( fopen "stdio.h" EC_HAVE_FOPEN )
+ ecbuild_cache_check_symbol_exists( fmemopen "stdio.h" EC_HAVE_FMEMOPEN )
+ ecbuild_cache_check_symbol_exists( funopen "stdio.h" EC_HAVE_FUNOPEN )
ecbuild_cache_check_symbol_exists( flock "sys/file.h" EC_HAVE_FLOCK )
ecbuild_cache_check_symbol_exists( mmap "sys/mman.h" EC_HAVE_MMAP )
diff --git a/cmake/ecbuild_check_os.cmake b/cmake/ecbuild_check_os.cmake
index 7bbb344..8d325dc 100644
--- a/cmake/ecbuild_check_os.cmake
+++ b/cmake/ecbuild_check_os.cmake
@@ -245,33 +245,41 @@ set( EC_OS_NAME "UNKNOWN" )
if( UNIX )
- ### APPLE ###
+ ### APPLE ###
- if( APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
- set( EC_OS_NAME "macosx" )
- endif()
-
- ### Linux ###
-
- if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
-
- set( EC_OS_NAME "linux" )
+ if( APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+ set( EC_OS_NAME "macosx" )
+ endif()
- # recent linkers default to --enable-new-dtags
- # which then adds both RPATH and RUNPATH to executables
- # thus invalidating RPATH setting, and making LD_LIBRARY_PATH take precedence
- # to be sure, use tool 'readelf -a <exe> | grep PATH' to see what paths are built-in
- # see:
- # * http://blog.qt.digia.com/blog/2011/10/28/rpath-and-runpath
- # * http://www.cmake.org/Wiki/CMake_RPATH_handling
- # * man ld
- # * http://blog.tremily.us/posts/rpath
- # * http://fwarmerdam.blogspot.co.uk/2010/12/rpath-runpath-and-ldlibrarypath.html
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--disable-new-dtags")
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--disable-new-dtags")
+ ### Linux ###
+
+ if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+
+ set( EC_OS_NAME "linux" )
+
+ # The following option allows enabling the new dtags linker option
+ # (when set to OFF). ONLY SET TO OFF IF YOU KNOW WHAT YOU ARE DOING AND
+ # NEVER WHEN BUILDING PRODUCTION SOFTWARE. YOU HAVE BEEN WARNED!
+ option( ECBUILD_DISABLE_NEW_DTAGS "Set the linker flag --disable-new-dtags" ON )
+ mark_as_advanced( ECBUILD_DISABLE_NEW_DTAGS )
+
+ if( ECBUILD_DISABLE_NEW_DTAGS )
+ # recent linkers default to --enable-new-dtags
+ # which then adds both RPATH and RUNPATH to executables
+ # thus invalidating RPATH setting, and making LD_LIBRARY_PATH take precedence
+ # to be sure, use tool 'readelf -a <exe> | grep PATH' to see what paths are built-in
+ # see:
+ # * http://blog.qt.digia.com/blog/2011/10/28/rpath-and-runpath
+ # * http://www.cmake.org/Wiki/CMake_RPATH_handling
+ # * man ld
+ # * http://blog.tremily.us/posts/rpath
+ # * http://fwarmerdam.blogspot.co.uk/2010/12/rpath-runpath-and-ldlibrarypath.html
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--disable-new-dtags")
+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--disable-new-dtags")
+ endif()
- endif()
+ endif()
### Solaris ###
diff --git a/cmake/ecbuild_config.h.in b/cmake/ecbuild_config.h.in
index eef9b85..dd8e9cd 100644
--- a/cmake/ecbuild_config.h.in
+++ b/cmake/ecbuild_config.h.in
@@ -40,6 +40,8 @@
#cmakedefine EC_HAVE_FTRUNCATE
#cmakedefine EC_HAVE_OPEN
#cmakedefine EC_HAVE_FOPEN
+#cmakedefine EC_HAVE_FMEMOPEN
+#cmakedefine EC_HAVE_FUNOPEN
#cmakedefine EC_HAVE_FLOCK
#cmakedefine EC_HAVE_MMAP
diff --git a/cmake/ecbuild_find_lexyacc.cmake b/cmake/ecbuild_find_lexyacc.cmake
index 628488f..5c13269 100644
--- a/cmake/ecbuild_find_lexyacc.cmake
+++ b/cmake/ecbuild_find_lexyacc.cmake
@@ -48,7 +48,10 @@ macro( ecbuild_find_lexyacc )
if( NOT SKIP_BISON )
- find_package( BISON 2.3 )
+ find_package( BISON )
+ if(BISON_FOUND AND BISON_VERSION VERSION_LESS 2.3 )
+ ecbuild_critical( "Bison found with version ${BISON_VERSION} is less than 2.3.\nPlease define BISON_EXECUTABLE to an appropriate version or define SKIP_BISON to try finding Yacc instead" )
+ endif()
find_package( FLEX )
endif()
diff --git a/cmake/ecbuild_find_python.cmake b/cmake/ecbuild_find_python.cmake
index 48ba28f..0273951 100644
--- a/cmake/ecbuild_find_python.cmake
+++ b/cmake/ecbuild_find_python.cmake
@@ -101,7 +101,7 @@ function( ecbuild_find_python )
# find where python site-packages are ...
if( PYTHON_EXECUTABLE )
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
ecbuild_debug( "ecbuild_find_python: PYTHON_SITE_PACKAGES=${PYTHON_SITE_PACKAGES}" )
diff --git a/share/magics/epsg.json b/share/magics/epsg.json
index 367b8c1..3c3848e 100644
--- a/share/magics/epsg.json
+++ b/share/magics/epsg.json
@@ -30,6 +30,16 @@
"min_longitude": -180
}
},
+ {
+ "mercator": {
+ "definition": "+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs",
+ "max_latitude": 84,
+ "max_longitude": 180,
+ "method": "simple",
+ "min_latitude": -80,
+ "min_longitude": -180
+ }
+ },
{
"lambert_north_atlantic": {
"definition": "+proj=lcc +lon_0=40w +x_0=2000000 +y_0=2000000 +ellps=WGS84 +datum=WGS84",
diff --git a/share/magics/table_128.xml b/share/magics/table_128.xml
index acfdbe7..938ad6d 100644
--- a/share/magics/table_128.xml
+++ b/share/magics/table_128.xml
@@ -1305,12 +1305,5 @@ does it submit to any jurisdiction.
original_unit='m s**-1' derived_unit=''
vector1='0' vector2='0'
contour_interval='0.0' specification=''/>
- <param code='260510' mars=''
- short_title=''
- long_title=''
- scaling='1.0' offset='-273.16'
- original_unit='K' derived_unit='deg c'
- />
</table>
-
</center>
diff --git a/src/basic/FortranMagics.cc b/src/basic/FortranMagics.cc
index fd8a7e9..adefe79 100644
--- a/src/basic/FortranMagics.cc
+++ b/src/basic/FortranMagics.cc
@@ -839,8 +839,7 @@ void FortranMagics::pline()
}
action_->visdef(new SimplePolylineVisualiser());
-
-
+ action_ = 0;
}
#include "GeoJSon.h"
diff --git a/src/basic/LegendVisitor.cc b/src/basic/LegendVisitor.cc
index 608c7b3..31ac3a3 100644
--- a/src/basic/LegendVisitor.cc
+++ b/src/basic/LegendVisitor.cc
@@ -1,20 +1,12 @@
-/******************************** LICENSE ********************************
-
- Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- ******************************** LICENSE ********************************/
+/*
+ * (C) Copyright 1996-2016 ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ * In applying this licence, ECMWF does not waive the privileges and immunities
+ * granted to it by virtue of its status as an intergovernmental organisation nor
+ * does it submit to any jurisdiction.
+ */
/*!
\brief Implementation of the Template class LegendNode.
@@ -78,10 +70,8 @@ void LegendVisitor::print(ostream& out) const
}
-
void LegendVisitor::visit(BasicGraphicsObjectContainer&)
{
-
}
@@ -94,6 +84,7 @@ void LegendVisitor::visit(BasicSceneObject& parent)
void LegendVisitor:: visit(AnimationStep& )
{
}
+
PaperPoint LegendEntry::centreSymbolBox(const PaperPoint& middle)
{
// The box is going from x-1 to x+1
@@ -114,6 +105,7 @@ PaperPoint LegendEntry::leftTextBox(const PaperPoint& middle)
MagLog::dev() << "LegendEntry::leftTextBox" << point << endl;
return point;
}
+
PaperPoint ArrowEntry::leftTextBox(const PaperPoint& middle)
{
PaperPoint point(middle);
@@ -121,6 +113,7 @@ PaperPoint ArrowEntry::leftTextBox(const PaperPoint& middle)
point.y_ += 0.2;
return point;
}
+
PaperPoint FlagEntry::leftTextBox(const PaperPoint& middle)
{
// The box is going from x-1 to x+1
@@ -131,6 +124,7 @@ PaperPoint FlagEntry::leftTextBox(const PaperPoint& middle)
point.y_ += 0.5;
return point;
}
+
double LegendEntry::computeWidth(double width)
{
return ((100-width_)/50)*width;
@@ -145,15 +139,7 @@ void LineEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& ou
line_->push_back(PaperPoint(x+0.5, y));
out.push_back(line_);
}
-void RainbowEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& out)
-{
- double x = point.x();
- double y = point.y();
- line_->push_back(PaperPoint(x-0.5, y+0.5));
- line_->push_back(PaperPoint(x+0.5, y+0.5));
- out.push_back(line_);
-}
void LineEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer& out)
{
double x = point.x();
@@ -163,10 +149,12 @@ void LineEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer&
line_->push_back(PaperPoint(x+1, y));
out.push_back(line_);
}
+
void DoubleLineEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& out)
{
set(point, out);
}
+
void DoubleLineEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer& out)
{
set(point, out);
@@ -174,10 +162,6 @@ void DoubleLineEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectCont
void LegendVisitor::build()
{
-
-
-
-
legend_ = new LegendLayout();
legend_->x(view_x_);
@@ -213,18 +197,14 @@ void LegendVisitor::build()
legend->push_back(titlePosition_);
legend_->push_back(legend);
}
-
- if ( !empty() ) {
- if ( use_min_ ) {
- front()->userText(use_min_text_);
- }
- if ( use_max_ ) {
- back()->userText(use_max_text_);
- }
- back()->units(units_text_);
+ if ( use_min_ ) {
+ front()->userText(use_min_text_);
}
-
+ if ( use_max_ ) {
+ back()->userText(use_max_text_);
+ }
+
for(vector<LegendEntry*>::const_iterator entry = begin(); entry != end(); ++entry)
{
(*entry)->width(text_width_);
@@ -247,7 +227,7 @@ void LegendVisitor::build()
user = utext;
else
user = ( label != lines_.end() ) ? *label: "";
- string automatic = (*entry)->label() + (*entry)->units();
+ string automatic = (*entry)->label();
if ( composition == compositions_.end() )
{
@@ -308,16 +288,10 @@ void LegendVisitor::horizontal()
}
// here we have a title, we need to adjust the coordinates used in the legend dependind on its position
-
-
-
-
-
}
+
void LegendVisitor::vertical()
{
- double xmin, xmax, ymin, ymax;
- double xtitle, ytitle;
int row = 1;
int column = 1;
int rows = entriesNumber_/columns_;
@@ -343,8 +317,8 @@ void LegendVisitor::vertical()
title_position_ = M_LEFT;
(this->*titleBuilders_[title_position_])();
}
-
}
+
void LegendVisitor::topTitle()
{
double minx = legend_->minX();
@@ -361,6 +335,7 @@ void LegendVisitor::topTitle()
legend_->maxY(newmaxy);
}
+
void LegendVisitor::bottomTitle()
{
double minx = legend_->minX();
@@ -377,6 +352,7 @@ void LegendVisitor::bottomTitle()
legend_->minY(newminy);
}
+
void LegendVisitor::rightTitle()
{
double minx = legend_->minX();
@@ -395,6 +371,7 @@ void LegendVisitor::rightTitle()
legend_->maxX(newmaxx);
}
+
void LegendVisitor::leftTitle()
{
double minx = legend_->minX();
@@ -405,7 +382,7 @@ void LegendVisitor::leftTitle()
bool column = ( legend_->absoluteWidth() < legend_->absoluteHeight() );
titleJustification_ = ( column ) ? MCENTRE : MRIGHT;
- float factor = ( column ) ? 0.25 : 0.15;
+ //float factor = ( column ) ? 0.25 : 0.15;
titleAngle_ = ( column ) ? magics::PI * 1.5 : 0;
double width = (100 /(100-title_ratio_))*(maxx - minx);
@@ -413,7 +390,6 @@ void LegendVisitor::leftTitle()
titlePosition_ = PaperPoint(minx + (newminx-minx)*0.1, (maxy-miny)/2);
legend_->minX(newminx);
-
}
@@ -462,12 +438,10 @@ void LegendVisitor::grid()
else {
(this->*builder->second)();
}
-
}
void SymbolEntry::set(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
{
-
double width = computeWidth(0.8)/2;
double height = 0.4;
PaperPoint p = centreSymbolBox(point);
@@ -596,8 +570,6 @@ void FlagEntry::set(const PaperPoint& point, BasicGraphicsObjectContainer& legen
legend.push_back(flag_);
flag_->setLength(legend.absoluteHeight());
flag_->back().set(40, 85);
-
-
}
void FlagEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
@@ -609,6 +581,7 @@ void FlagEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& l
text->setJustification(MLEFT);
legend.push_back(text);
}
+
void FlagEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
{
set(point, legend);
@@ -623,6 +596,7 @@ void FlagEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer
text->setJustification(MLEFT);
legend.push_back(text);
}
+
Colour BoxEntry::colour()
{
return box_->getFillColour();
@@ -655,7 +629,6 @@ void LegendEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer&
frame->push_back(PaperPoint(x+2, y-height));
frame->push_back(PaperPoint(x-width, y-height));
-
legend.push_back(frame);
}
@@ -672,7 +645,6 @@ void LegendEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContaine
}
Polyline* frame = new Polyline();
-
double x = point.x();
double y = point.y();
double width = 0.4;
@@ -690,8 +662,7 @@ void LegendEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContaine
frame->push_back(PaperPoint(x, y+height));
frame->push_back(PaperPoint(x, y-height));
frame->push_back(PaperPoint(x-width, y-height));
-
-
+
legend.push_back(frame);
ostringstream top, bottom;
@@ -782,7 +753,6 @@ void BoxEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& leg
to->addText(userText_, font_);
}
-
box_->push_back(PaperPoint(x-width, y-height));
box_->push_back(PaperPoint(x-width, y+height+height));
box_->push_back(PaperPoint(x+width, y+height+height));
@@ -797,7 +767,6 @@ void BoxEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& leg
}
box_->setColour(colour);
-
legend.push_back(box_);
}
@@ -968,12 +937,11 @@ void BoxEntry::rowHisto(const PaperPoint& point, BasicGraphicsObjectContainer& l
double pos = ((2*width)/(to_-from_)) * (meanValue_ - from_) + (x - width);
symbol->push_back(PaperPoint(pos, y + 1.));
legend.push_last(symbol);
-
}
}
+
void BoxEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
{
-
MagLog::debug() << "BoxEntry--->set at " << point << endl;
double width = computeWidth(0.8)/2;
double height = 0.5;
@@ -1028,6 +996,7 @@ void BoxEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer&
box_->setColour(colour);
legend.push_back(box_);
}
+
void BoxEntry::columnHisto(const PaperPoint& point, BasicGraphicsObjectContainer& legend, const Colour& colour)
{
@@ -1099,7 +1068,6 @@ Colour DoubleLineEntry::colour()
void LineEntry::set(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
{
-
double width = computeWidth(0.8)/2;
PaperPoint p = centreSymbolBox(point);
double x = p.x();
@@ -1135,7 +1103,6 @@ void check(const string& line, vector<string>& lines)
void LegendVisitor::getReady()
{
-
if ( lines_.empty() == false )
return;
@@ -1183,8 +1150,6 @@ void XmlLegendVisitor::getReady()
double text_width = width.percent();
double text_height = height.percent();
-
-
if ( ( text_height + text_y ) > 100 )
text_height = 100 - text_y ;
@@ -1232,7 +1197,6 @@ void FortranPositionalLegendVisitor::getReady()
Dimension text(font_dimension_, box_height_, 10);
font_size_ = text.absolute();
layout_->Layout::frame(blanking_, border_, *border_colour_, border_line_style_, border_thickness_);
-
}
@@ -1259,8 +1223,6 @@ void FortranAutomaticLegendVisitor::getReady()
void LegendEntry::set(const LegendVisitor& attributes)
{
format_ = attributes.format();
-
-
}
void SimpleSymbolEntry::set(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
@@ -1272,6 +1234,7 @@ void SimpleSymbolEntry::set(const PaperPoint& point, BasicGraphicsObjectContaine
}
+
const string& LegendEntry::label() const
{
if ( !label_.empty() || !fromto_)
@@ -1289,9 +1252,9 @@ const string& LegendEntry::label() const
label_ = nice.str();
return label_;
}
+
void SimpleSymbolEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
{
-
Polyline* box = new Polyline();
FillShadingProperties* shading = new FillShadingProperties();
box->setFillColour(colour());
@@ -1346,9 +1309,9 @@ void SimpleSymbolEntry::rowBox(const PaperPoint& point, BasicGraphicsObjectConta
}
box->setColour(colour);
-
legend.push_back(box);
}
+
void SimpleSymbolEntry::columnBox(const PaperPoint& point, BasicGraphicsObjectContainer& legend)
{
Polyline* box = new Polyline();
@@ -1417,4 +1380,3 @@ BoxEntry::~BoxEntry() {} //{ delete box_; }
ArrowEntry::~ArrowEntry() {} //{ delete arrow_; }
DoubleLineEntry::~DoubleLineEntry() {} //{ { delete line1_; delete line2_; }
LineEntry::~LineEntry() {} //{ delete line_;}
-RainbowEntry::~RainbowEntry() {} //{ delete line_;}
\ No newline at end of file
diff --git a/src/basic/LegendVisitor.h b/src/basic/LegendVisitor.h
index fd62ca8..28ff838 100644
--- a/src/basic/LegendVisitor.h
+++ b/src/basic/LegendVisitor.h
@@ -62,7 +62,7 @@ public:
virtual void rowHisto(const PaperPoint& point, BasicGraphicsObjectContainer& out, const Colour&) {rowBox(point, out);}
virtual void columnHisto(const PaperPoint& point, BasicGraphicsObjectContainer& out, const Colour&) {columnBox(point, out);}
- virtual bool needContinuousText(Text&) { return false; }
+ virtual bool needContinuousText() { return false; }
virtual bool needText() { return true; }
virtual const string& label() const;
virtual void interpret(string&) const {}
@@ -72,8 +72,6 @@ public:
void userText(const string& text) { userText_ = text; }
const string& userText() { return userText_; }
- const string& units() { return units_; }
- void units(const string& units) { units_ = units; }
void font(const MagFont& font) { font_ = font; }
void angle(double angle) { angle_ = angle; }
@@ -110,7 +108,6 @@ protected:
HistogramLegendMethod* histogram_;
string userText_;
- string units_;
double from_;
double to_;
string format_;
@@ -205,22 +202,12 @@ public:
void set(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void rowBox(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void columnBox(const PaperPoint&, BasicGraphicsObjectContainer&);
- bool needContinuousText(Text& text) { text.setJustification(MLEFT); return true; }
+ bool needContinuousText() { return true; }
~LineEntry();
protected:
Polyline* line_;
Colour colour();
};
-class RainbowEntry : public LineEntry
-{
-public:
- RainbowEntry(double label, Polyline* line = 0 ) :
- LineEntry(label, line) { }
- bool needContinuousText(Text&) { return true; }
- void rowBox(const PaperPoint&, BasicGraphicsObjectContainer&);
-
- ~RainbowEntry();
-};
class DoubleLineEntry : public LegendEntry
@@ -237,7 +224,7 @@ public:
void set(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void rowBox(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void columnBox(const PaperPoint&, BasicGraphicsObjectContainer&);
- bool needContinuousText(Text& text) { text.setJustification(MLEFT); return true; }
+ bool needContinuousText() { return true; }
~DoubleLineEntry();
protected:
Polyline* line1_;
@@ -261,7 +248,7 @@ public:
void set(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void rowBox(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void columnBox(const PaperPoint&, BasicGraphicsObjectContainer&);
- bool needContinuousText(Text&) { return false; }
+ bool needContinuousText() { return false; }
PaperPoint leftTextBox(const PaperPoint&);
protected:
Arrow* arrow_;
@@ -283,7 +270,7 @@ public:
void set(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void rowBox(const PaperPoint&, BasicGraphicsObjectContainer&);
virtual void columnBox(const PaperPoint&, BasicGraphicsObjectContainer&);
- bool needContinuousText(Text&) { return false; }
+ bool needContinuousText() { return false; }
PaperPoint leftTextBox(const PaperPoint&);
protected:
Flag* flag_;
diff --git a/src/common/Arrow.h b/src/common/Arrow.h
index b4e447b..c1e585b 100644
--- a/src/common/Arrow.h
+++ b/src/common/Arrow.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Arrow.h
\brief Definition of the Template class Arrow.
diff --git a/src/common/ArrowProperties.cc b/src/common/ArrowProperties.cc
index 3245395..2fd6904 100644
--- a/src/common/ArrowProperties.cc
+++ b/src/common/ArrowProperties.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ArrowProperties.cc
\brief Implementation of the Template class Arrow.
diff --git a/src/common/ArrowProperties.h b/src/common/ArrowProperties.h
index 349264f..bd64ccc 100644
--- a/src/common/ArrowProperties.h
+++ b/src/common/ArrowProperties.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ArrowProperties.h
\brief Definition of the Template class Arrow.
diff --git a/src/common/AutoLock.h b/src/common/AutoLock.h
index 95c9941..b41d64a 100755
--- a/src/common/AutoLock.h
+++ b/src/common/AutoLock.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File AutoLock.h
// Baudouin Raoult - ECMWF May 96
diff --git a/src/common/AutoLocker.cc b/src/common/AutoLocker.cc
index b237f17..83f54f4 100644
--- a/src/common/AutoLocker.cc
+++ b/src/common/AutoLocker.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/* #define CHECK_DEAD_LOCKS */
diff --git a/src/common/AutomaticPlotManager.cc b/src/common/AutomaticPlotManager.cc
index b1cf2ae..d05dc5e 100644
--- a/src/common/AutomaticPlotManager.cc
+++ b/src/common/AutomaticPlotManager.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AutomaticPlotManager.cc
\brief Implementation of the Template class AutomaticPlotManager.
diff --git a/src/common/AutomaticPlotManager.h b/src/common/AutomaticPlotManager.h
index 466ffe0..5af828e 100644
--- a/src/common/AutomaticPlotManager.h
+++ b/src/common/AutomaticPlotManager.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AutomaticPlotManager.h
\brief Definition of the Template class AutomaticPlotManager.
diff --git a/src/common/BackgroundColour.h b/src/common/BackgroundColour.h
index 79deaf3..edc5de9 100644
--- a/src/common/BackgroundColour.h
+++ b/src/common/BackgroundColour.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BackgroundColour.h
\brief Definition of Colour class.
diff --git a/src/common/BaseParameter.cc b/src/common/BaseParameter.cc
index d4d7d70..1c3978d 100644
--- a/src/common/BaseParameter.cc
+++ b/src/common/BaseParameter.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BaseParameter.cc
\brief Definition of Parameter base class.
diff --git a/src/common/BaseParameter.h b/src/common/BaseParameter.h
index c92cb2b..1a9885c 100644
--- a/src/common/BaseParameter.h
+++ b/src/common/BaseParameter.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BaseParameter.h
\brief Definition of Parameter base class.
diff --git a/src/common/BasePointsHandler.cc b/src/common/BasePointsHandler.cc
index 2da908a..0bd575f 100644
--- a/src/common/BasePointsHandler.cc
+++ b/src/common/BasePointsHandler.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BasePointsHandler.h
\brief Definition of the Template base class AbstractPoints.
diff --git a/src/common/BasePointsHandler.h b/src/common/BasePointsHandler.h
index 54841c5..243f599 100644
--- a/src/common/BasePointsHandler.h
+++ b/src/common/BasePointsHandler.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BasePointsHandler.h
\brief Definition of the Template base class AbstractPoints.
diff --git a/src/common/CartesianTransformation.cc b/src/common/CartesianTransformation.cc
index 8d228a6..0c0391a 100644
--- a/src/common/CartesianTransformation.cc
+++ b/src/common/CartesianTransformation.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CartesianTransformation.cc
\brief Implementation of the Template class CartesianTransformation.
diff --git a/src/common/CartesianTransformation.h b/src/common/CartesianTransformation.h
index 8af328b..d707681 100644
--- a/src/common/CartesianTransformation.h
+++ b/src/common/CartesianTransformation.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CartesianTransformation.h
\brief Definition of the Template class CartesianTransformation.
@@ -49,7 +57,7 @@ public:
virtual double y(double y) const { return (*y_)(y); }
virtual double rx(double x) const { return (*x_).revert(x); }
virtual double ry(double y) const { return (*y_).revert(y); }
- virtual void fast_reproject(double& x, double& y) const { x = (*x_)(x); y = (*y_)(y); }
+ virtual bool fast_reproject(double& x, double& y) const { x = (*x_)(x); y = (*y_)(y); return true; }
void reprojectComponents(double& x, double& y, pair<double, double>&) const;
virtual PaperPoint operator()(const UserPoint& xy) const
diff --git a/src/common/Clipper.h b/src/common/Clipper.h
index d4068c4..8b4be54 100644
--- a/src/common/Clipper.h
+++ b/src/common/Clipper.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Clipper.h
\brief Definition of the clipping.
diff --git a/src/common/Colour.cc b/src/common/Colour.cc
index 647fa0a..70f1568 100644
--- a/src/common/Colour.cc
+++ b/src/common/Colour.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Colour.cc
\brief Implementation of Colour class.
diff --git a/src/common/Colour.h b/src/common/Colour.h
index face946..90a7b16 100644
--- a/src/common/Colour.h
+++ b/src/common/Colour.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Colour.h
\brief Definition of Colour class.
@@ -128,7 +136,7 @@ public:
// -- Contructors
Colour();
Colour(const string&);
- Colour(float, float, float, float = 1.);
+ Colour(float red, float green, float blue, float alpha = 1.);
Colour(Rgb&);
Colour(Hsl&);
diff --git a/src/common/ColourTable.cc b/src/common/ColourTable.cc
index ac3356d..afd5046 100644
--- a/src/common/ColourTable.cc
+++ b/src/common/ColourTable.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTable.cc
\brief Implementation of the Template class ColourTable.
diff --git a/src/common/ColourTable.h b/src/common/ColourTable.h
index 7766a49..8001681 100644
--- a/src/common/ColourTable.h
+++ b/src/common/ColourTable.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTable.h
\brief Definition of the Template class ColourTable.
diff --git a/src/common/ColourTableDefinition.h b/src/common/ColourTableDefinition.h
index 248d64b..65e3d39 100644
--- a/src/common/ColourTableDefinition.h
+++ b/src/common/ColourTableDefinition.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinition.h
\brief Definition of the Template class ColourTableDefinition.
diff --git a/src/common/ColourTableDefinitionCompute.cc b/src/common/ColourTableDefinitionCompute.cc
index 1eb8f72..1eb2291 100644
--- a/src/common/ColourTableDefinitionCompute.cc
+++ b/src/common/ColourTableDefinitionCompute.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinitionCompute.cc
\brief Implementation of the Template class ColourTableDefinitionCompute.
diff --git a/src/common/ColourTableDefinitionCompute.h b/src/common/ColourTableDefinitionCompute.h
index 0869ee4..f452a77 100644
--- a/src/common/ColourTableDefinitionCompute.h
+++ b/src/common/ColourTableDefinitionCompute.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinitionCompute.h
\brief Definition of the Template class ColourTableDefinitionCompute.
diff --git a/src/common/ColourTableDefinitionComputeInterface.h b/src/common/ColourTableDefinitionComputeInterface.h
index f58efc6..9ee3dba 100644
--- a/src/common/ColourTableDefinitionComputeInterface.h
+++ b/src/common/ColourTableDefinitionComputeInterface.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinitionComputeInterface.h
\brief Definition of the Template class ColourTableDefinitionComputeInterface.
diff --git a/src/common/ColourTableDefinitionList.cc b/src/common/ColourTableDefinitionList.cc
index 53a93e1..a4bfb9a 100644
--- a/src/common/ColourTableDefinitionList.cc
+++ b/src/common/ColourTableDefinitionList.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinitionList.cc
\brief Implementation of the Template class ColourTableDefinitionList.
diff --git a/src/common/ColourTableDefinitionList.h b/src/common/ColourTableDefinitionList.h
index ae7dd7f..30e94ee 100644
--- a/src/common/ColourTableDefinitionList.h
+++ b/src/common/ColourTableDefinitionList.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinitionList.h
\brief Definition of the Template class ColourTableDefinitionList.
diff --git a/src/common/ColourTableDefinitionListInterface.h b/src/common/ColourTableDefinitionListInterface.h
index 41b7b71..6373152 100644
--- a/src/common/ColourTableDefinitionListInterface.h
+++ b/src/common/ColourTableDefinitionListInterface.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTableDefinitionListInterface.h
\brief Definition of the Template class ColourTableDefinitionListInterface.
diff --git a/src/common/Coordinate.cc b/src/common/Coordinate.cc
index c9b1c6e..cd8220e 100644
--- a/src/common/Coordinate.cc
+++ b/src/common/Coordinate.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Coordinate.cc
\brief Implementation of the Template class Coordinate.
diff --git a/src/common/Coordinate.h b/src/common/Coordinate.h
index 5162440..ebd5226 100644
--- a/src/common/Coordinate.h
+++ b/src/common/Coordinate.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Coordinate.h
\brief Definition of the Template class Coordinate.
diff --git a/src/common/CustomisedPoint.h b/src/common/CustomisedPoint.h
index 4db9f93..ad25158 100644
--- a/src/common/CustomisedPoint.h
+++ b/src/common/CustomisedPoint.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CustomisedPoint.h
\brief Definition of the Template class CustomisedPoint.
diff --git a/src/common/Data.cc b/src/common/Data.cc
index 4bd3438..738961b 100644
--- a/src/common/Data.cc
+++ b/src/common/Data.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Data.h
\brief Definition of the Abstract template class Data.
diff --git a/src/common/Data.h b/src/common/Data.h
index c1147a2..9041c50 100644
--- a/src/common/Data.h
+++ b/src/common/Data.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Data.h
\brief Definition of the Abstract template class Data.
diff --git a/src/common/DataStats.cc b/src/common/DataStats.cc
index b0e9865..d14dcd2 100644
--- a/src/common/DataStats.cc
+++ b/src/common/DataStats.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DataStats.cc
\brief Implementation of the class DataStats.
diff --git a/src/common/DataStats.h b/src/common/DataStats.h
index f299deb..a361607 100644
--- a/src/common/DataStats.h
+++ b/src/common/DataStats.h
@@ -1,12 +1,21 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DataStats.h
\brief Definition of the class dataStats.
diff --git a/src/common/Decoder.h b/src/common/Decoder.h
index 62c44e7..d1b2f88 100644
--- a/src/common/Decoder.h
+++ b/src/common/Decoder.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Decoder.h
\brief Definition of the Abstract template class Decoder.
diff --git a/src/common/Dimension.cc b/src/common/Dimension.cc
index 2ccc810..e1b17d8 100644
--- a/src/common/Dimension.cc
+++ b/src/common/Dimension.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Dimension.h
\brief Implementation of the Template class Dimension.
diff --git a/src/common/Dimension.h b/src/common/Dimension.h
index 2d87665..e4a6ef6 100644
--- a/src/common/Dimension.h
+++ b/src/common/Dimension.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Dimension.h
\brief Definition of the Template class Dimension.
diff --git a/src/common/DriverStatic.cc b/src/common/DriverStatic.cc
index d701078..27a64d0 100644
--- a/src/common/DriverStatic.cc
+++ b/src/common/DriverStatic.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DriverStatic.cc
\brief Implementation of the Template class DriverStatic.
diff --git a/src/common/DriverStatic.h b/src/common/DriverStatic.h
index 450d86d..cb0abde 100644
--- a/src/common/DriverStatic.h
+++ b/src/common/DriverStatic.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DriverStatic.h
\brief Definition of the Template class DriverStatic.
diff --git a/src/common/Factory.cc b/src/common/Factory.cc
index 0285139..b6eeee4 100644
--- a/src/common/Factory.cc
+++ b/src/common/Factory.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Factory.cc
\brief Definition of Parameter base class.
diff --git a/src/common/Factory.h b/src/common/Factory.h
index 63a463b..6a67cc5 100644
--- a/src/common/Factory.h
+++ b/src/common/Factory.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Factory.h
\brief Definition of Factory class.
diff --git a/src/common/Flag.cc b/src/common/Flag.cc
index 22da5ef..fcc7eb0 100644
--- a/src/common/Flag.cc
+++ b/src/common/Flag.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Flag.cc
\brief Implementation of the Template class Flag.
diff --git a/src/common/Flag.h b/src/common/Flag.h
index a30dde6..154b087 100644
--- a/src/common/Flag.h
+++ b/src/common/Flag.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Flag.h
\brief Definition of the Template class Flag.
diff --git a/src/common/Frame.cc b/src/common/Frame.cc
index 714b1d0..ea31f0e 100644
--- a/src/common/Frame.cc
+++ b/src/common/Frame.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Frame.h
\brief Implementation of the Template class Frame.
diff --git a/src/common/Frame.h b/src/common/Frame.h
index de3cd60..acdb73d 100644
--- a/src/common/Frame.h
+++ b/src/common/Frame.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Frame.h
\brief Definition of the Template class Frame.
diff --git a/src/common/FrameBase.cc b/src/common/FrameBase.cc
index 063bed6..8838cdd 100644
--- a/src/common/FrameBase.cc
+++ b/src/common/FrameBase.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file FrameBase.cc
\brief Implementation of the Template class FrameBase.
diff --git a/src/common/FrameBase.h b/src/common/FrameBase.h
index 2e1652f..eefb5d2 100644
--- a/src/common/FrameBase.h
+++ b/src/common/FrameBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file FrameBase.h
\brief Definition of the Template class FrameBase.
diff --git a/src/common/FullPaperPoint.h b/src/common/FullPaperPoint.h
index 2dba01a..963fdbb 100644
--- a/src/common/FullPaperPoint.h
+++ b/src/common/FullPaperPoint.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PaperPoint.h
\brief Definition of Point (x, y, z, v).
diff --git a/src/common/GeoPoint.h b/src/common/GeoPoint.h
index 569cb8f..519d409 100644
--- a/src/common/GeoPoint.h
+++ b/src/common/GeoPoint.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File UserPoint
// Sylvie Lamy-Thepaut ECMWF 2002
diff --git a/src/common/GeoRectangularProjection.cc b/src/common/GeoRectangularProjection.cc
index b866181..746c920 100644
--- a/src/common/GeoRectangularProjection.cc
+++ b/src/common/GeoRectangularProjection.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*! \file GeoRectangularProjection.cc
\brief Implementation of GeoRectangularProjection.
@@ -71,10 +81,12 @@ PaperPoint GeoRectangularProjection::operator()(const UserPoint& point) const
return PaperPoint(point.x(), point.y(), point.value(), point.missing(), point.border(), 0, point.name());
}
-
+ if ( point.y() < -85.)
+ cout << point.y() << endl;
TeCoord2D geo = TeCoord2D(point.x()*TeCDR, point.y()*TeCDR);
TeCoord2D xy = projection_->LL2PC(geo);
-
+ if ( point.y() < -85.)
+ cout << xy.y() << endl;
return PaperPoint(xy.x(), xy.y(), point.value(), point.missing(), point.border(), 0, point.name());
}
@@ -508,13 +520,14 @@ void MercatorProjection::init()
askedymax_ = std::max(ypcmin_, ypcmax_);
}
-void MercatorProjection::fast_reproject(double& x, double& y) const
+bool MercatorProjection::fast_reproject(double& x, double& y) const
{
TeCoord2D geo = TeCoord2D(x*TeCDR, y*TeCDR);
TeCoord2D xy = projection_->LL2PC(geo);
x = xy.x();
y = xy.y();
+ return true;
}
diff --git a/src/common/GeoRectangularProjection.h b/src/common/GeoRectangularProjection.h
index c1c223b..79db350 100644
--- a/src/common/GeoRectangularProjection.h
+++ b/src/common/GeoRectangularProjection.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file GeoRectangularProjection.h
@@ -200,7 +210,7 @@ class MercatorProjection : public GeoRectangularProjection
public:
MercatorProjection();
~MercatorProjection();
- void fast_reproject(double& x, double& y) const;
+ bool fast_reproject(double& x, double& y) const;
double patchDistance(double) const;
protected :
diff --git a/src/common/GribInterpretor.h b/src/common/GribInterpretor.h
index 3a42871..10c0783 100644
--- a/src/common/GribInterpretor.h
+++ b/src/common/GribInterpretor.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+
+
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Matrix.h
\brief Implementation of the Template class Matrix.
diff --git a/src/common/HeightTableDefinition.h b/src/common/HeightTableDefinition.h
index e8602fa..6a506bd 100644
--- a/src/common/HeightTableDefinition.h
+++ b/src/common/HeightTableDefinition.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightTableDefinition.h
\brief Definition of Colour class.
diff --git a/src/common/Image.h b/src/common/Image.h
index 03ab021..74e4576 100644
--- a/src/common/Image.h
+++ b/src/common/Image.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Image.h
\brief Definition of the Template class Image.
diff --git a/src/common/ImageProperties.h b/src/common/ImageProperties.h
index 9123a28..1525a66 100644
--- a/src/common/ImageProperties.h
+++ b/src/common/ImageProperties.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ImageProperties.h
\brief Definition of the Template class ImageProperties.
diff --git a/src/common/ImportObject.cc b/src/common/ImportObject.cc
index 8fbcbf5..45a4d64 100644
--- a/src/common/ImportObject.cc
+++ b/src/common/ImportObject.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ImportObject.h
\brief Implementation of the Template class ImportObject.
diff --git a/src/common/ImportObject.h b/src/common/ImportObject.h
index 1770def..ce44641 100644
--- a/src/common/ImportObject.h
+++ b/src/common/ImportObject.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ImportObject.h
\brief Definition of the Template class ImportObject.
diff --git a/src/common/InteractiveSet.cc b/src/common/InteractiveSet.cc
index a1fb21d..4afa5ec 100644
--- a/src/common/InteractiveSet.cc
+++ b/src/common/InteractiveSet.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File InteractiveSet.cc
// Magics Team - ECMWF 2004
diff --git a/src/common/InteractiveSet.h b/src/common/InteractiveSet.h
index c5d22d8..3a9457e 100644
--- a/src/common/InteractiveSet.h
+++ b/src/common/InteractiveSet.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file InteractiveSet.h
\brief Implementation of InteractiveSet class.
diff --git a/src/common/IntervalMap.h b/src/common/IntervalMap.h
index 78fa321..141d845 100644
--- a/src/common/IntervalMap.h
+++ b/src/common/IntervalMap.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IntervalMap.h
\brief Definition of the Template class IntervalMap
diff --git a/src/common/Label.cc b/src/common/Label.cc
index 99820ca..58e6e3b 100644
--- a/src/common/Label.cc
+++ b/src/common/Label.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Label.h
\brief Implementation of the Template class Label.
diff --git a/src/common/Label.h b/src/common/Label.h
index 4857ad7..258c909 100644
--- a/src/common/Label.h
+++ b/src/common/Label.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Label.h
\brief Definition of the Template class Label.
diff --git a/src/common/Layout.cc b/src/common/Layout.cc
index b86c314..d69c8ec 100644
--- a/src/common/Layout.cc
+++ b/src/common/Layout.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Layout.cc
\brief Implementation of the Template class Layout.
diff --git a/src/common/Layout.h b/src/common/Layout.h
index 872c07e..f138062 100644
--- a/src/common/Layout.h
+++ b/src/common/Layout.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Layout.h
\brief Definition of the Template class Layout.
diff --git a/src/common/LevelTableDefinition.h b/src/common/LevelTableDefinition.h
index 0ac137c..2604a46 100644
--- a/src/common/LevelTableDefinition.h
+++ b/src/common/LevelTableDefinition.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LevelTableDefinition.h
\brief Definition of Colour class.
diff --git a/src/common/LogoPlotting.cc b/src/common/LogoPlotting.cc
index f1ea695..9da5368 100644
--- a/src/common/LogoPlotting.cc
+++ b/src/common/LogoPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LogoPlotting.cc
\brief Implementation of the Template class LogoPlotting.
diff --git a/src/common/LogoPlotting.h b/src/common/LogoPlotting.h
index 25ecf38..5698cb9 100644
--- a/src/common/LogoPlotting.h
+++ b/src/common/LogoPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LogoPlotting.h
\brief Definition of the Template class LogoPlotting.
diff --git a/src/common/LogoPlottingBase.h b/src/common/LogoPlottingBase.h
index a2fc3c4..13e3de5 100644
--- a/src/common/LogoPlottingBase.h
+++ b/src/common/LogoPlottingBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagLogoPlottingBase.h
\brief Definition of the Template class MagLogoPlottingBase.
diff --git a/src/common/MagException.cc b/src/common/MagException.cc
index cba1bc3..6693d5c 100644
--- a/src/common/MagException.cc
+++ b/src/common/MagException.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Exception
// Sylvie Lamy-Thepaut - ECMWF Mar 02
diff --git a/src/common/MagException.h b/src/common/MagException.h
index b7e159f..ca10b16 100644
--- a/src/common/MagException.h
+++ b/src/common/MagException.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef MagicsException_H
#define MagicsException_H
diff --git a/src/common/MagExceptions.cc b/src/common/MagExceptions.cc
index b5b96e0..f0a9c9f 100644
--- a/src/common/MagExceptions.cc
+++ b/src/common/MagExceptions.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#include <signal.h>
diff --git a/src/common/MagExceptions.h b/src/common/MagExceptions.h
index c9a08c5..a46a4dc 100644
--- a/src/common/MagExceptions.h
+++ b/src/common/MagExceptions.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef MagMagExceptions_H
#define MagMagExceptions_H
diff --git a/src/common/MagFont.cc b/src/common/MagFont.cc
index 6f2b6b3..f966334 100644
--- a/src/common/MagFont.cc
+++ b/src/common/MagFont.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagFont.cc
\brief Implementation of the Template class MagFont.
diff --git a/src/common/MagFont.h b/src/common/MagFont.h
index 307d528..1204620 100644
--- a/src/common/MagFont.h
+++ b/src/common/MagFont.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagFont.h
\brief Definition of the Template class MagFont.
diff --git a/src/common/MagLog.cc b/src/common/MagLog.cc
index a82b6aa..1d1c213 100644
--- a/src/common/MagLog.cc
+++ b/src/common/MagLog.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagLog.cc
\brief Implementation of the MagLog class.
diff --git a/src/common/MagLog.h b/src/common/MagLog.h
index afeca27..84e3ee1 100644
--- a/src/common/MagLog.h
+++ b/src/common/MagLog.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagLog.h
\brief Definition of log class.
diff --git a/src/common/MagTranslator.h b/src/common/MagTranslator.h
index eec3bdd..8570b7e 100644
--- a/src/common/MagTranslator.h
+++ b/src/common/MagTranslator.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagTranslator.h
\brief Definition of MagTranslator class.
diff --git a/src/common/MagicsCalls.cc b/src/common/MagicsCalls.cc
index 5f4b41a..962dffe 100644
--- a/src/common/MagicsCalls.cc
+++ b/src/common/MagicsCalls.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagicsCalls.cc
\brief Implementation of Fortran and C interface
diff --git a/src/common/MagicsFormat.cc b/src/common/MagicsFormat.cc
index b49cf85..9bf1345 100644
--- a/src/common/MagicsFormat.cc
+++ b/src/common/MagicsFormat.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#include "MagicsFormat.h"
#include <ios>
diff --git a/src/common/MagicsFormat.h b/src/common/MagicsFormat.h
index 332b823..d447a34 100644
--- a/src/common/MagicsFormat.h
+++ b/src/common/MagicsFormat.h
@@ -1,15 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
-
-#ifndef MagicsFormat_H
-#define MagicsFormat_H
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
+#ifndef MagicsFormat_H
+#define MagicsFormat_H
#include "magics.h"
@@ -30,7 +37,7 @@ public:
{
return manip.format(out);
}
- string format_;
+ string format_;
double value_;
};
diff --git a/src/common/MagicsParameter.cc b/src/common/MagicsParameter.cc
index 0838779..f7f7d41 100644
--- a/src/common/MagicsParameter.cc
+++ b/src/common/MagicsParameter.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File MagicsParameter.cc
// Magics Team - ECMWF 2004
diff --git a/src/common/MagicsParameter.h b/src/common/MagicsParameter.h
index ad7b11d..e535a99 100644
--- a/src/common/MagicsParameter.h
+++ b/src/common/MagicsParameter.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagicsParameter.h
\brief Definition of the MagicsParameter template class.
diff --git a/src/common/MagicsSingleton.h b/src/common/MagicsSingleton.h
index 3f432a0..99c7a9c 100644
--- a/src/common/MagicsSingleton.h
+++ b/src/common/MagicsSingleton.h
@@ -1,12 +1,21 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
+
/*! \file MagicsSingleton.h
diff --git a/src/common/MagicsThreads.cc b/src/common/MagicsThreads.cc
index c12c8e8..8ef722e 100644
--- a/src/common/MagicsThreads.cc
+++ b/src/common/MagicsThreads.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagicsThreads.cc
\brief Implementation of the Template class MagicsThreads.
diff --git a/src/common/MagicsThreads.h b/src/common/MagicsThreads.h
index a1fc9c2..b1cee81 100644
--- a/src/common/MagicsThreads.h
+++ b/src/common/MagicsThreads.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MagicsThreads.h
\brief Definition of the Template class MagicsThreads.
diff --git a/src/common/Matrix.cc b/src/common/Matrix.cc
index b13c8c9..b3c7940 100644
--- a/src/common/Matrix.cc
+++ b/src/common/Matrix.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+
+
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Matrix.h
\brief Implementation of the Template class Matrix.
diff --git a/src/common/Matrix.h b/src/common/Matrix.h
index 6c4c7af..e6b516e 100644
--- a/src/common/Matrix.h
+++ b/src/common/Matrix.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Matrix.h
\brief Definition of the Template class Matrix.
diff --git a/src/common/MatrixHandler.h b/src/common/MatrixHandler.h
index 4268b38..8454abe 100644
--- a/src/common/MatrixHandler.h
+++ b/src/common/MatrixHandler.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MatrixHandler.h
\brief Definition of the Template class MatrixHandler.
diff --git a/src/common/MetaData.cc b/src/common/MetaData.cc
index 9744e7f..870a888 100644
--- a/src/common/MetaData.cc
+++ b/src/common/MetaData.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MetaData.h
\brief Implementation of the Template class MetaData.
diff --git a/src/common/MetaData.h b/src/common/MetaData.h
index 9ff5230..14e1784 100644
--- a/src/common/MetaData.h
+++ b/src/common/MetaData.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MetaData.h
\brief Definition of the Template class MetaData.
diff --git a/src/common/Mutex.cc b/src/common/Mutex.cc
index 116fa72..5034c19 100644
--- a/src/common/Mutex.cc
+++ b/src/common/Mutex.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef marsmachine_H
#include "marsmachine.h"
diff --git a/src/common/Mutex.h b/src/common/Mutex.h
index 6bdcabb..9c7f41a 100644
--- a/src/common/Mutex.h
+++ b/src/common/Mutex.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Mutex.h
// Baudouin Raoult - ECMWF May 96
diff --git a/src/common/MutexCond.cc b/src/common/MutexCond.cc
index ed6dc43..d126652 100644
--- a/src/common/MutexCond.cc
+++ b/src/common/MutexCond.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#include <time.h>
diff --git a/src/common/MutexCond.h b/src/common/MutexCond.h
index ec73141..a3f8834 100644
--- a/src/common/MutexCond.h
+++ b/src/common/MutexCond.h
@@ -1,12 +1,36 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************//******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File MutexCond.h
// Baudouin Raoult - ECMWF Jun 96
diff --git a/src/common/Node.cc b/src/common/Node.cc
index e153c33..9e7402c 100644
--- a/src/common/Node.cc
+++ b/src/common/Node.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Node.cc
\brief Implementation of the Template class Node.
diff --git a/src/common/Node.h b/src/common/Node.h
index 4276099..7ee99bb 100644
--- a/src/common/Node.h
+++ b/src/common/Node.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Node.h
\brief Definition of the Template class Node.
diff --git a/src/common/OutputFactory.cc b/src/common/OutputFactory.cc
index 163fafb..a52ea7b 100644
--- a/src/common/OutputFactory.cc
+++ b/src/common/OutputFactory.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file OutputFactory.cc
\brief Implementation of the Template class OutputFactory.
diff --git a/src/common/OutputFactory.h b/src/common/OutputFactory.h
index bbdbfea..0656c27 100644
--- a/src/common/OutputFactory.h
+++ b/src/common/OutputFactory.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file OutputFactory.h
\brief Definition of the Template class OutputFactory.
diff --git a/src/common/OutputHandler.cc b/src/common/OutputHandler.cc
index 6b13f60..94968a7 100644
--- a/src/common/OutputHandler.cc
+++ b/src/common/OutputHandler.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file OutputHandler.cc
\brief Implementation of the Template class OutputHandler.
diff --git a/src/common/OutputHandler.h b/src/common/OutputHandler.h
index 6580efb..1cfec3b 100644
--- a/src/common/OutputHandler.h
+++ b/src/common/OutputHandler.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file OutputHandler.h
\brief Definition of the Template class OutputHandler.
diff --git a/src/common/PageID.cc b/src/common/PageID.cc
index 15a7564..8cd95a3 100644
--- a/src/common/PageID.cc
+++ b/src/common/PageID.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PageID.h
\brief Implementation of the Template class PageID.
diff --git a/src/common/PageID.h b/src/common/PageID.h
index 63fc60a..7abaadc 100644
--- a/src/common/PageID.h
+++ b/src/common/PageID.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PageID.h
\brief Definition of the Template class PageID.
diff --git a/src/common/PageIDBase.h b/src/common/PageIDBase.h
index d14749b..5111c58 100644
--- a/src/common/PageIDBase.h
+++ b/src/common/PageIDBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PageIDBase.h
\brief Definition of the Template class PageIDBase.
diff --git a/src/common/PaperDimension.h b/src/common/PaperDimension.h
index 0c4f251..972dd00 100644
--- a/src/common/PaperDimension.h
+++ b/src/common/PaperDimension.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PaperDimension.h
\brief Definition of the Template class PaperDimension.
diff --git a/src/common/PaperPoint.h b/src/common/PaperPoint.h
index 26342e2..63ccc71 100644
--- a/src/common/PaperPoint.h
+++ b/src/common/PaperPoint.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PaperPoint.h
\brief Definition of Point (x, y, z, v).
diff --git a/src/common/ParameterManager.cc b/src/common/ParameterManager.cc
index 41ade70..2da6368 100644
--- a/src/common/ParameterManager.cc
+++ b/src/common/ParameterManager.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ParameterManager.cc
Magics Team - ECMWF 2004
diff --git a/src/common/ParameterManager.h b/src/common/ParameterManager.h
index 6132795..537a97f 100644
--- a/src/common/ParameterManager.h
+++ b/src/common/ParameterManager.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ParameterManager.h
\brief Handles the Magics Parameters
diff --git a/src/common/Path.h b/src/common/Path.h
index 1bdd6fb..06e4b3a 100644
--- a/src/common/Path.h
+++ b/src/common/Path.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Path
// Sylvie Lamy-Thepaut - ECMWF Mar 02
diff --git a/src/common/PlotManager.cc b/src/common/PlotManager.cc
index e64eacf..d29e53e 100644
--- a/src/common/PlotManager.cc
+++ b/src/common/PlotManager.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PlotManager.cc
\brief Implementation of the Template class PlotManager.
diff --git a/src/common/PlotManager.h b/src/common/PlotManager.h
index 7a477b2..456fbd1 100644
--- a/src/common/PlotManager.h
+++ b/src/common/PlotManager.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PlotManager.h
\brief Definition of the Template class PlotManager.
diff --git a/src/common/PointsHandler.cc b/src/common/PointsHandler.cc
index db4b4f5..4780096 100644
--- a/src/common/PointsHandler.cc
+++ b/src/common/PointsHandler.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PointsHandler.h
\brief Definition of the Template class PointsHandler.
diff --git a/src/common/PointsHandler.h b/src/common/PointsHandler.h
index ebb8019..aca5ca0 100644
--- a/src/common/PointsHandler.h
+++ b/src/common/PointsHandler.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PointsHandler.h
\brief Definition of the Template class PointsHandler.
diff --git a/src/common/PolarStereographicProjection.cc b/src/common/PolarStereographicProjection.cc
index 27a761b..be82d54 100644
--- a/src/common/PolarStereographicProjection.cc
+++ b/src/common/PolarStereographicProjection.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreedto in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*! \file PolarStereographicProjection.cc
\brief Implementation of PolarStereographicProjection.
@@ -925,12 +935,13 @@ double PolarStereographicProjection::patchDistance(double res) const
return 100000*res;
}
-void PolarStereographicProjection::fast_reproject(double& x, double& y) const
+bool PolarStereographicProjection::fast_reproject(double& x, double& y) const
{
TeCoord2D geo = TeCoord2D(x*TeCDR, y*TeCDR);
TeCoord2D xy = projection_->LL2PC(geo);
x = xy.x();
y = xy.y();
+ return true;
}
void PolarStereographicProjection::getNewDefinition(const UserPoint& ll, const UserPoint& ur, string& out) const
diff --git a/src/common/PolarStereographicProjection.h b/src/common/PolarStereographicProjection.h
index b68ba81..61698c3 100644
--- a/src/common/PolarStereographicProjection.h
+++ b/src/common/PolarStereographicProjection.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file PolarStereographicProjection.h
@@ -67,7 +77,7 @@ public:
void setNewPCBox(double, double, double, double);
double patchDistance(double) const;
- void fast_reproject(double& x, double& y) const;
+ bool fast_reproject(double& x, double& y) const;
/*!
\\brief Initialise the projection
*/
diff --git a/src/common/PolyCoast.h b/src/common/PolyCoast.h
index 49d8960..4b58ccb 100644
--- a/src/common/PolyCoast.h
+++ b/src/common/PolyCoast.h
@@ -1,12 +1,21 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
+
/*! \file PolyCoast.h
\brief Definition of the Template class CoastPlotting.
diff --git a/src/common/Polyline.cc b/src/common/Polyline.cc
index 5e2f32e..af51193 100644
--- a/src/common/Polyline.cc
+++ b/src/common/Polyline.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Polyline.cc
\brief Implementation of polyline graphics class (template).
@@ -150,11 +158,24 @@ void Polyline::newHole(const Polyline& poly)
}
}
-void Polyline::reproject(const Transformation& transformation)
+
+struct ReprojectHelper
{
- for (MagLine::iterator point = polygon_.outer().begin(); point != polygon_.outer().end(); ++point) {
- transformation.fast_reproject(point->x_, point->y_);
+ ReprojectHelper(const Transformation& transformation) : transformation_(transformation) {}
+ const Transformation& transformation_;
+ bool operator()(PaperPoint& point) {
+ return !transformation_.fast_reproject(point.x_, point.y_);
}
+};
+
+void Polyline::reproject(const Transformation& transformation)
+{
+
+ MagLine::iterator from = std::remove_if (polygon_.outer().begin(), polygon_.outer().end(), ReprojectHelper(transformation));
+ polygon_.outer().erase(from, polygon_.outer().end());
+
+
+
// Now the holes!
for (Holes::iterator hole = polygon_.inners().begin(); hole != polygon_.inners().end(); ++hole) {
for (MagLine::iterator h = hole->begin(); h != hole->end(); ++h) {
diff --git a/src/common/Polyline.h b/src/common/Polyline.h
index d529ad1..a0c4ffc 100644
--- a/src/common/Polyline.h
+++ b/src/common/Polyline.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Polyline.h
\brief Definition of polyline graphics class.
diff --git a/src/common/ProgressObject.cc b/src/common/ProgressObject.cc
index a5170fb..dd08613 100644
--- a/src/common/ProgressObject.cc
+++ b/src/common/ProgressObject.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File ProgressObject.cc
// Magics Team - ECMWF 2004
diff --git a/src/common/ProgressObject.h b/src/common/ProgressObject.h
index bc04a03..8d47b08 100644
--- a/src/common/ProgressObject.h
+++ b/src/common/ProgressObject.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File ProgressObject.h
// Magics Team - ECMWF 2004
diff --git a/src/common/ProgressTask.cc b/src/common/ProgressTask.cc
index d259577..74b4a5a 100644
--- a/src/common/ProgressTask.cc
+++ b/src/common/ProgressTask.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File ProgressTask.cc
// Magics Team - ECMWF 2004
diff --git a/src/common/ProgressTask.h b/src/common/ProgressTask.h
index 23cb992..1ace422 100644
--- a/src/common/ProgressTask.h
+++ b/src/common/ProgressTask.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File ProgressTask.h
// Magics Team - ECMWF 2004
diff --git a/src/common/Proj4Projection.cc b/src/common/Proj4Projection.cc
index d64ea51..b337c0c 100644
--- a/src/common/Proj4Projection.cc
+++ b/src/common/Proj4Projection.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*! \file Proj4Projection.cc
\brief Implementation of Proj4Projection.
@@ -308,6 +318,11 @@ PaperPoint Proj4Projection::operator()(const UserPoint& point) const
}
double x = point.x();
double y = point.y();
+
+
+
+
+
x *= DEG_TO_RAD;
y *= DEG_TO_RAD;
@@ -317,6 +332,7 @@ PaperPoint Proj4Projection::operator()(const UserPoint& point) const
MagLog::debug() << pj_strerrno(error) << " for " << point << endl;
return PaperPoint(-1000000, -10000000);
}
+
return PaperPoint(x, y, point.value_, point.missing(), point.border(), 0, point.name());
}
@@ -360,6 +376,7 @@ void Proj4Projection::revert(const PaperPoint& xy, UserPoint& point) const
x *= RAD_TO_DEG;
y *= RAD_TO_DEG;
+
point = UserPoint(x, y);
}
@@ -622,6 +639,8 @@ void Proj4Projection::gridLatitudes(const GridPlotting& grid) const
void Proj4Projection::labels(const LabelPlotting& label, DrawingVisitor& visitor) const
{
+ if ( projection_->method_ == "simple" )
+ return;
vector<double> pro4_longitudes;
pro4_longitudes.push_back(0);
pro4_longitudes.push_back(90);
@@ -655,11 +674,15 @@ void Proj4Projection::labels(const LabelPlotting& label, DrawingVisitor& visitor
void Proj4Projection::labels(const LabelPlotting& label, LeftAxisVisitor& visitor) const
{
- if ( false ) {
+ if ( projection_->method_ == "simple" ) {
const vector<double>& latitudes = label.latitudes();
for (unsigned int lat = 0; lat < latitudes.size(); lat++ )
{
+ if ( latitudes[lat] < gridMinLat_)
+ continue;
+ if ( latitudes[lat] > gridMaxLat_)
+ continue;
double lon = max_longitude_ - ((max_longitude_-min_longitude_)*.1);
UserPoint point(lon,latitudes[lat]);
PaperPoint xy = (*this)(point);
@@ -682,10 +705,14 @@ void Proj4Projection::labels(const LabelPlotting& label, LeftAxisVisitor& visito
void Proj4Projection::labels(const LabelPlotting& label, RightAxisVisitor& visitor) const
{
- if ( false ) {
+ if ( projection_->method_ == "simple" ) {
const vector<double>& latitudes = label.latitudes();
for (unsigned int lat = 0; lat < latitudes.size(); lat++ )
{
+ if ( latitudes[lat] < gridMinLat_)
+ continue;
+ if ( latitudes[lat] > gridMaxLat_)
+ continue;
double lon = min_longitude_ + ((max_longitude_-min_longitude_)*.1);
UserPoint point(lon,latitudes[lat]);
PaperPoint xy = (*this)(point);
@@ -708,17 +735,23 @@ void Proj4Projection::labels(const LabelPlotting& label, RightAxisVisitor& visit
void Proj4Projection::labels(const LabelPlotting& label, BottomAxisVisitor& visitor) const
{
- if ( false ) {
+ if ( projection_->method_ == "simple" ) {
const vector<double>& longitudes = label.longitudes();
const double lat = min_latitude_ + (max_latitude_-min_latitude_)*.8;
for (unsigned int lon = 0; lon < longitudes.size(); lon++ )
{
+
+ if ( longitudes[lon] < gridMinLon_)
+ continue;
+ if ( longitudes[lon] > gridMaxLon_)
+ continue;
UserPoint point(longitudes[lon],lat);
PaperPoint xy = (*this)(point);
if ( !in(xy) ) continue;
Text *text = new Text();
label.add(text);
text->setText(writeLongitude(point));
+
text->push_back(xy);
text->setJustification(MCENTRE);
text->setVerticalAlign(MTOP);
@@ -825,6 +858,10 @@ void Proj4Projection::labels(const LabelPlotting& label, TopAxisVisitor& visitor
const double lat = min_latitude_ + (max_latitude_-min_latitude_)*.2;
for (unsigned int lon = 0; lon < longitudes.size(); lon++ )
{
+ if ( longitudes[lon] < gridMinLon_)
+ continue;
+ if ( longitudes[lon] > gridMaxLon_)
+ continue;
UserPoint point(longitudes[lon],lat);
PaperPoint xy = (*this)(point);
if ( !in(xy) ) continue;
@@ -958,11 +995,20 @@ MatrixHandler* Proj4Projection::prepareData(const AbstractMatrix& matrix) const
return new GeoBoxMatrixHandler(matrix, *this);
}
-void Proj4Projection::fast_reproject(double& x, double& y) const
+bool Proj4Projection::fast_reproject(double& x, double& y) const
{
+
+
x *= DEG_TO_RAD;
y *= DEG_TO_RAD;
- pj_transform(from_, to_, 1, 1, &x, &y, NULL );
+ int error = pj_transform(from_, to_, 1, 1, &x, &y, NULL );
+
+ if ( error ) {
+
+ MagLog::warning() << pj_strerrno(error) << " for " << x << " " << y << endl;
+ return false;
+ }
+ return true;
}
double Proj4Projection::patchDistance(double res) const {
diff --git a/src/common/Proj4Projection.h b/src/common/Proj4Projection.h
index 617acad..822485c 100644
--- a/src/common/Proj4Projection.h
+++ b/src/common/Proj4Projection.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file Proj4Projection.h
@@ -84,7 +94,7 @@ public:
/*!
\\brief
*/
- virtual void fast_reproject(double& x, double& y) const;
+ virtual bool fast_reproject(double& x, double& y) const;
virtual PaperPoint operator()(const PaperPoint&) const;
/*!
@@ -294,6 +304,11 @@ class Proj4Goode : public Proj4Projection
public:
Proj4Goode() : Proj4Projection("goode") {}
};
+class Proj4Mercator : public Proj4Projection
+{
+public:
+ Proj4Mercator() : Proj4Projection("mercator") {}
+};
class Proj4Collignon : public Proj4Projection
{
public:
diff --git a/src/common/RasterData.cc b/src/common/RasterData.cc
index 9ecb04d..952419d 100644
--- a/src/common/RasterData.cc
+++ b/src/common/RasterData.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file RasterData.cc
\brief Implementation of the Template class RasterData.
diff --git a/src/common/RasterData.h b/src/common/RasterData.h
index b1fadde..3cd1a11 100644
--- a/src/common/RasterData.h
+++ b/src/common/RasterData.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file RasterData.h
\brief Definition of the Template class RasterData.
diff --git a/src/common/SciMethods.cc b/src/common/SciMethods.cc
index 8196268..b2fdd25 100644
--- a/src/common/SciMethods.cc
+++ b/src/common/SciMethods.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file SciMethods.cc
diff --git a/src/common/SciMethods.h b/src/common/SciMethods.h
index bb8c581..3d21131 100644
--- a/src/common/SciMethods.h
+++ b/src/common/SciMethods.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file SciMethods.h
diff --git a/src/common/Seconds.cc b/src/common/Seconds.cc
index c6d64cb..8c884ef 100644
--- a/src/common/Seconds.cc
+++ b/src/common/Seconds.cc
@@ -1,12 +1,23 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
+
+
+
#include "Seconds.h"
diff --git a/src/common/Seconds.h b/src/common/Seconds.h
index 17c2fd0..3183601 100644
--- a/src/common/Seconds.h
+++ b/src/common/Seconds.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Seconds.h
// Baudouin Raoult - ECMWF Jul 96
diff --git a/src/common/Static.cc b/src/common/Static.cc
index 342a09c..535d9d6 100644
--- a/src/common/Static.cc
+++ b/src/common/Static.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#include "Static.h"
#include "MagException.h"
diff --git a/src/common/Static.h b/src/common/Static.h
index f8f5695..41ada13 100644
--- a/src/common/Static.h
+++ b/src/common/Static.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef Static_H
#define Static_H
diff --git a/src/common/Symbol.cc b/src/common/Symbol.cc
index c9d7fac..ffc4f3f 100644
--- a/src/common/Symbol.cc
+++ b/src/common/Symbol.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Symbol.cc
\brief Implementation of Symbol graphics class (template).
diff --git a/src/common/Symbol.h b/src/common/Symbol.h
index fa289c5..e98d0cc 100644
--- a/src/common/Symbol.h
+++ b/src/common/Symbol.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Symbol.h
\brief Definition of Symbol graphics class.
diff --git a/src/common/TableDefinition.h b/src/common/TableDefinition.h
index fb3c89d..03044ef 100644
--- a/src/common/TableDefinition.h
+++ b/src/common/TableDefinition.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinition.h
\brief Definition of the Template class TableDefinition.
diff --git a/src/common/TableDefinitionCompute.cc b/src/common/TableDefinitionCompute.cc
index f355768..5ca18e5 100644
--- a/src/common/TableDefinitionCompute.cc
+++ b/src/common/TableDefinitionCompute.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinitionCompute.cc
\brief Implementation of the Template class TableDefinitionCompute.
diff --git a/src/common/TableDefinitionCompute.h b/src/common/TableDefinitionCompute.h
index 562f2e9..fbbf6a5 100644
--- a/src/common/TableDefinitionCompute.h
+++ b/src/common/TableDefinitionCompute.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinitionCompute.h
\brief Definition of the Template class TableDefinitionCompute.
diff --git a/src/common/TableDefinitionComputeInterface.h b/src/common/TableDefinitionComputeInterface.h
index b9cc6a9..a9967e0 100644
--- a/src/common/TableDefinitionComputeInterface.h
+++ b/src/common/TableDefinitionComputeInterface.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinitionComputeInterface.h
\brief Definition of the Template class TableDefinitionComputeInterface.
diff --git a/src/common/TableDefinitionList.cc b/src/common/TableDefinitionList.cc
index 021b645..e30a5d4 100644
--- a/src/common/TableDefinitionList.cc
+++ b/src/common/TableDefinitionList.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinitionList.cc
\brief Implementation of the Template class TableDefinitionList.
diff --git a/src/common/TableDefinitionList.h b/src/common/TableDefinitionList.h
index 5ed1e9e..7df1896 100644
--- a/src/common/TableDefinitionList.h
+++ b/src/common/TableDefinitionList.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinitionList.h
\brief Definition of the Template class TableDefinitionList.
diff --git a/src/common/TableDefinitionListInterface.h b/src/common/TableDefinitionListInterface.h
index 08be853..25492c9 100644
--- a/src/common/TableDefinitionListInterface.h
+++ b/src/common/TableDefinitionListInterface.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TableDefinitionListInterface.h
\brief Definition of the Template class TableDefinitionListInterface.
diff --git a/src/common/Task.cc b/src/common/Task.cc
index ddca87c..d047dae 100644
--- a/src/common/Task.cc
+++ b/src/common/Task.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef Task_H
#include "Task.h"
diff --git a/src/common/Task.h b/src/common/Task.h
index fc465ef..aaa446f 100644
--- a/src/common/Task.h
+++ b/src/common/Task.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Task.h
// Baudouin Raoult - ECMWF May 96
diff --git a/src/common/TaylorProjection.cc b/src/common/TaylorProjection.cc
index ef69816..1dbf4a9 100644
--- a/src/common/TaylorProjection.cc
+++ b/src/common/TaylorProjection.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*! \file TaylorProjection.cc
\brief Implementation of TaylorProjection.
diff --git a/src/common/TaylorProjection.h b/src/common/TaylorProjection.h
index 1b821d4..37bc935 100644
--- a/src/common/TaylorProjection.h
+++ b/src/common/TaylorProjection.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file TaylorProjection.h
diff --git a/src/common/Tephigram.cc b/src/common/Tephigram.cc
index 91aa55d..8445d9e 100644
--- a/src/common/Tephigram.cc
+++ b/src/common/Tephigram.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*! \file Tephigram.cc
\brief Implementation of Tephigram.
diff --git a/src/common/Tephigram.h b/src/common/Tephigram.h
index c678766..2a21524 100644
--- a/src/common/Tephigram.h
+++ b/src/common/Tephigram.h
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ ******************************** LICENSE ********************************/
/*!
\file Tephigram.h
diff --git a/src/common/Text.cc b/src/common/Text.cc
index 56d8a11..85da3da 100644
--- a/src/common/Text.cc
+++ b/src/common/Text.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Text.cc
\brief Implementation of Text graphics class (template).
diff --git a/src/common/Text.h b/src/common/Text.h
index 1a653eb..6ecb4e0 100644
--- a/src/common/Text.h
+++ b/src/common/Text.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Text.h
\brief Definition of Text graphics class.
diff --git a/src/common/Thread.cc b/src/common/Thread.cc
index e9bd3a0..1e4eb6a 100644
--- a/src/common/Thread.cc
+++ b/src/common/Thread.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef marsmachine_H
#include "marsmachine.h"
diff --git a/src/common/Thread.h b/src/common/Thread.h
index 169a2ae..93749cd 100644
--- a/src/common/Thread.h
+++ b/src/common/Thread.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Thread.h
// Baudouin Raoult - ECMWF Jun 96
diff --git a/src/common/ThreadControler.cc b/src/common/ThreadControler.cc
index 3d6e8fc..3f6fc31 100644
--- a/src/common/ThreadControler.cc
+++ b/src/common/ThreadControler.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef marsmachine_H
#include "marsmachine.h"
diff --git a/src/common/ThreadControler.h b/src/common/ThreadControler.h
index 852c3eb..61a6583 100644
--- a/src/common/ThreadControler.h
+++ b/src/common/ThreadControler.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File ThreadControler.h
// Baudouin Raoult - ECMWF May 96
diff --git a/src/common/ThreadSingleton.cc b/src/common/ThreadSingleton.cc
index bb0e470..2eec3cf 100755
--- a/src/common/ThreadSingleton.cc
+++ b/src/common/ThreadSingleton.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef marsmachine_H
#include "marsmachine.h"
diff --git a/src/common/ThreadSingleton.h b/src/common/ThreadSingleton.h
index ad54d54..58d0cae 100755
--- a/src/common/ThreadSingleton.h
+++ b/src/common/ThreadSingleton.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File ThreadSingleton.h
// Baudouin Raoult - ECMWF Jun 96
diff --git a/src/common/Timer.cc b/src/common/Timer.cc
index 891c353..102b934 100644
--- a/src/common/Timer.cc
+++ b/src/common/Timer.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef marsmachine_H
#include "magics.h"
diff --git a/src/common/Timer.h b/src/common/Timer.h
index b4f66a9..5dc8699 100644
--- a/src/common/Timer.h
+++ b/src/common/Timer.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Timer.h
// Baudouin Raoult - ECMWF May 96
diff --git a/src/common/Tokenizer.cc b/src/common/Tokenizer.cc
index 42d8db0..93a6327 100644
--- a/src/common/Tokenizer.cc
+++ b/src/common/Tokenizer.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef Tokenizer_H
#include "Tokenizer.h"
diff --git a/src/common/Tokenizer.h b/src/common/Tokenizer.h
index 90ea0d2..7bd255b 100644
--- a/src/common/Tokenizer.h
+++ b/src/common/Tokenizer.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
// File Tokenizer.h
// Manuel Fuentes - ECMWF Jan 97
diff --git a/src/common/Transformation.cc b/src/common/Transformation.cc
index 7f30040..2645566 100644
--- a/src/common/Transformation.cc
+++ b/src/common/Transformation.cc
@@ -8,6 +8,19 @@
* does it submit to any jurisdiction.
*/
+
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
+
// File Transformation.cc
// Magics Team - ECMWF 2004
@@ -450,6 +463,7 @@ void Transformation::operator()(const Polyline& from, vector<Polyline*>& out) co
{
if (from.empty())
return;
+
PaperPoint ll(getMinPCX(), getMinPCY());
PaperPoint ur(getMaxPCX(), getMaxPCY());
boost::geometry::model::box<PaperPoint> box(ll, ur);
@@ -466,10 +480,14 @@ void Transformation::operator()(const Polyline& from, vector<Polyline*>& out) co
vector<vector<PaperPoint> > lines;
//line.reserve( from.size());
lines.push_back(vector<PaperPoint>());
+
for (unsigned i = 0; i < from.size(); i++) {
lines.back().push_back(from.get(i));
+
}
+
+
for ( Polyline::Holes::const_iterator hole = from.beginHoles(); hole != from.endHoles(); ++hole) {
Polyline poly;
from.hole(hole, poly);
@@ -478,6 +496,7 @@ void Transformation::operator()(const Polyline& from, vector<Polyline*>& out) co
lines.back().push_back(poly.get(i));
}
}
+
for (vector<vector<PaperPoint> >::iterator line = lines.begin(); line != lines.end(); ++line) {
vector<vector<PaperPoint> > result;
diff --git a/src/common/Transformation.h b/src/common/Transformation.h
index e7b33f7..7284aaa 100644
--- a/src/common/Transformation.h
+++ b/src/common/Transformation.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \defgroup projections Geographical projections
@@ -190,8 +198,8 @@ public:
{ return PaperPoint(xy.x(), xy.y()); }
- virtual void fast_reproject(double& x, double& y) const
- { }
+ virtual bool fast_reproject(double& x, double& y) const
+ { return true; }
virtual double patchDistance(double) const { NOTIMP; }
diff --git a/src/common/UserPoint.h b/src/common/UserPoint.h
index e9d56cf..a49fc1b 100644
--- a/src/common/UserPoint.h
+++ b/src/common/UserPoint.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file UserPoint.h
\brief Definition of Point (x, y, z, v).
diff --git a/src/common/Visualiser.h b/src/common/Visualiser.h
index 164bab9..f2f62ec 100644
--- a/src/common/Visualiser.h
+++ b/src/common/Visualiser.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Visualiser.h
\brief Definition of the Template class Visualiser.
diff --git a/src/common/XCoordinate.h b/src/common/XCoordinate.h
index dd45f78..5958ccf 100644
--- a/src/common/XCoordinate.h
+++ b/src/common/XCoordinate.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XCoordinate.h
\brief Definition of the Template class XCoordinate.
diff --git a/src/common/XmlNode.cc b/src/common/XmlNode.cc
index 4115bb1..a69dea9 100644
--- a/src/common/XmlNode.cc
+++ b/src/common/XmlNode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XmlNode.cc
\brief Implementation of the Template class XmlNode.
diff --git a/src/common/XmlNode.h b/src/common/XmlNode.h
index 63242ee..e599d6e 100644
--- a/src/common/XmlNode.h
+++ b/src/common/XmlNode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XmlNode.h
\brief Definition of the Template class XmlNode.
diff --git a/src/common/XmlReader.cc b/src/common/XmlReader.cc
index 95c157a..8a87ab9 100644
--- a/src/common/XmlReader.cc
+++ b/src/common/XmlReader.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XmlReader.cc
\brief Implementation of the Reader for Xml.
diff --git a/src/common/XmlReader.h b/src/common/XmlReader.h
index 06a7114..ae61151 100644
--- a/src/common/XmlReader.h
+++ b/src/common/XmlReader.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XmlReader.h
\brief Definition of the Template class XmlReader.
diff --git a/src/common/XmlTree.cc b/src/common/XmlTree.cc
index f588a86..2ec6ed0 100644
--- a/src/common/XmlTree.cc
+++ b/src/common/XmlTree.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XmlTree.h
\brief Implementation of the Template class XmlTree.
diff --git a/src/common/XmlTree.h b/src/common/XmlTree.h
index b796433..06ba1e0 100644
--- a/src/common/XmlTree.h
+++ b/src/common/XmlTree.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XmlTree.h
\brief Definition of the Template class XmlTree.
diff --git a/src/common/YCoordinate.h b/src/common/YCoordinate.h
index 3b5a8e4..363ca83 100644
--- a/src/common/YCoordinate.h
+++ b/src/common/YCoordinate.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file XCoordinate.h
\brief Definition of the Template class XCoordinate.
diff --git a/src/common/aix.h b/src/common/aix.h
index 42cead3..d15b3e8 100644
--- a/src/common/aix.h
+++ b/src/common/aix.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef MagicsAIX_H
#define MagicsAIX_H
diff --git a/src/common/linux.h b/src/common/linux.h
index cfbf46d..b0e75c2 100644
--- a/src/common/linux.h
+++ b/src/common/linux.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#include <stdio.h>
#include <pthread.h>
diff --git a/src/common/magics_api.h b/src/common/magics_api.h
index 17ba06f..7cc59bb 100644
--- a/src/common/magics_api.h
+++ b/src/common/magics_api.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file magics_api.h
\brief Implementation of C interface
diff --git a/src/common/marsmachine.h b/src/common/marsmachine.h
index 1c6da51..03a1628 100644
--- a/src/common/marsmachine.h
+++ b/src/common/marsmachine.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef marsmachine_H
#define marsmachine_H
diff --git a/src/decoders/InputMatrixInterpretor.cc b/src/decoders/InputMatrixInterpretor.cc
index d12b9b8..839d95e 100644
--- a/src/decoders/InputMatrixInterpretor.cc
+++ b/src/decoders/InputMatrixInterpretor.cc
@@ -105,10 +105,9 @@ Matrix* InputMatrixRegularInterpretor::geoInterpret(Matrix* in, const InputMatri
int nblat = in->rows();
double lat = latitude_;
- for (int i = 0; i < nblat; i++) {
- in->rowsAxis().push_back(lat);
- MagLog::dev()<< in->rowsAxis().back() << endl;
- lat = latitude_ + (i*latitude_step_);
+ for (int i = 0; i < nblat; i++) {
+ lat = latitude_ + (i*latitude_step_);
+ in->rowsAxis().push_back(lat);
}
in->setMapsAxis();
in->missing(std::numeric_limits<double>::max());
diff --git a/src/drivers/CairoDriver.cc b/src/drivers/CairoDriver.cc
index 6644b4d..35c951d 100644
--- a/src/drivers/CairoDriver.cc
+++ b/src/drivers/CairoDriver.cc
@@ -1482,14 +1482,36 @@ MAGICS_NO_EXPORT bool CairoDriver::renderCellArray(const Image& image) const
ColourTable < = image.getColourTable();
const int width = image.getNumberOfColumns();
const int height = image.getNumberOfRows();
- const double tr = image.getTransparency();
+// const MFloat tr = image.getTransparency();
const MFloat x0 = projectX(image.getOrigin().x());
const MFloat y0 = projectY(image.getOrigin().y());
+ const MFloat scX = (image.getWidth() *coordRatioX_) /width;
+ const MFloat scY = (image.getHeight()*coordRatioY_) /height;
cairo_save(cr_);
cairo_antialias_t t = cairo_get_antialias(cr_);
cairo_set_antialias(cr_, CAIRO_ANTIALIAS_NONE);
+ cairo_translate (cr_, x0, y0);
+
+ for(unsigned int h=0;h<height; h++)
+ {
+ for(unsigned int w=0;w<width; w++)
+ {
+ const short c = image[w + (width*h)];
+ const float cr = lt[c].red();
+ const float cg = lt[c].green();
+ const float cb = lt[c].blue();
+ if(cr*cg*cb >=0){
+ cairo_set_source_rgba(cr_,cr,cg,cb,lt[c].alpha());
+ cairo_set_line_width (cr_,0.01);
+ cairo_rectangle (cr_, w*scX, h*-scY, scX, -scY);
+ cairo_fill_preserve(cr_);
+ cairo_stroke(cr_);
+ }
+ }
+ }
+/*
const long dim=width*height;
unsigned char *chImage = new unsigned char[dim*4];
int jj = 0;
@@ -1536,7 +1558,7 @@ MAGICS_NO_EXPORT bool CairoDriver::renderCellArray(const Image& image) const
cairo_paint(cr_);
cairo_surface_destroy (surImage);
-
+*/
cairo_restore(cr_);
cairo_set_antialias(cr_, t);
return true;
diff --git a/src/params/CMakeLists.txt b/src/params/CMakeLists.txt
index 8289039..f272776 100644
--- a/src/params/CMakeLists.txt
+++ b/src/params/CMakeLists.txt
@@ -136,6 +136,7 @@ PostScriptDriver.xml
PreviewVisitor.xml
Proj4Bonne.xml
+Proj4Mercator.xml
Proj4Collignon.xml
Proj4EPSG32661.xml
Proj4EPSG4326.xml
diff --git a/src/params/FortranViewNode.xml b/src/params/FortranViewNode.xml
index 02a870b..06dd41f 100644
--- a/src/params/FortranViewNode.xml
+++ b/src/params/FortranViewNode.xml
@@ -57,7 +57,7 @@ does it submit to any jurisdiction.
<option fortran="EPSG4326" include="Proj4Projection.h" name="Proj4EPSG4326"> </option>
<option fortran="lambert_north_atlantic" include="Proj4Projection.h" name="Proj4LambertNorthAtlantic"> </option>
- <option xml="mercator" fortran="mercator" include="GeoRectangularProjection.h" name="MercatorProjection"> </option>
+ <option xml="mercator" fortran="mercator" include="Proj4Projection.h" name="Proj4Mercator"> </option>
<option xml="cartesian" fortran="cartesian" include="CartesianTransformation.h" name="CartesianTransformation"> </option>
<option xml="taylor" fortran="taylor" include="TaylorProjection.h" name="TaylorProjection"> </option>
<option xml="tephigram" fortran="tephigram" include="Tephigram.h" name="Tephigram"> </option>
diff --git a/src/params/Proj4Mercator.xml b/src/params/Proj4Mercator.xml
new file mode 100644
index 0000000..4564de7
--- /dev/null
+++ b/src/params/Proj4Mercator.xml
@@ -0,0 +1,12 @@
+<!--
+(C) Copyright 1996-2016 ECMWF.
+
+This software is licensed under the terms of the Apache Licence Version 2.0
+which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+In applying this licence, ECMWF does not waive the privileges and immunities
+granted to it by virtue of its status as an intergovernmental organisation nor
+does it submit to any jurisdiction.
+-->
+
+<magics>
+<class inherits="Proj4Projection" directory="common" prefix="subpage" include="Proj4Projection.h" name="Proj4Mercator"/></magics>
diff --git a/src/params/XmlViewNode.xml b/src/params/XmlViewNode.xml
index 506e0bc..64d3071 100644
--- a/src/params/XmlViewNode.xml
+++ b/src/params/XmlViewNode.xml
@@ -23,7 +23,7 @@ does it submit to any jurisdiction.
- <option xml="mercator" fortran="mercator" include="GeoRectangularProjection.h" name="MercatorProjection"> </option>
+ <!--option xml="mercator" fortran="mercator" include="GeoRectangularProjection.h" name="MercatorProjection"-->
<option xml="cartesian" fortran="none" include="CartesianTransformation.h" name="CartesianTransformation"> </option>
<option xml="taylor" fortran="taylor" include="TaylorProjection.h" name="TaylorProjection"> </option>
<option xml="tephigram" fortran="tephigram" include="Tephigram.h" name="Tephigram"> </option>
diff --git a/src/visualisers/Akima474.cc b/src/visualisers/Akima474.cc
index 33e4ea8..f90aa18 100644
--- a/src/visualisers/Akima474.cc
+++ b/src/visualisers/Akima474.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima474.cc
Implementation of Akima474 class.
diff --git a/src/visualisers/Akima474Method.h b/src/visualisers/Akima474Method.h
index 84f3ab8..4e454ce 100644
--- a/src/visualisers/Akima474Method.h
+++ b/src/visualisers/Akima474Method.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima474Method.h
\brief Definition of the Template class Akima474Method.
diff --git a/src/visualisers/Akima760.cc b/src/visualisers/Akima760.cc
index 85ce0f3..50bdee4 100644
--- a/src/visualisers/Akima760.cc
+++ b/src/visualisers/Akima760.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima760.cc
Implementation of Akima760 class.
diff --git a/src/visualisers/Akima760Method.cc b/src/visualisers/Akima760Method.cc
index 14dc4c0..5a3eec9 100644
--- a/src/visualisers/Akima760Method.cc
+++ b/src/visualisers/Akima760Method.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima760Method.cc
\brief Implementation of the Template class Akima760Method.
diff --git a/src/visualisers/Akima760Method.h b/src/visualisers/Akima760Method.h
index da01339..e807d23 100644
--- a/src/visualisers/Akima760Method.h
+++ b/src/visualisers/Akima760Method.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima760Method.h
\brief Definition of the Template class Akima760Method.
diff --git a/src/visualisers/Akima761.cc b/src/visualisers/Akima761.cc
index 81efa64..a500b4d 100644
--- a/src/visualisers/Akima761.cc
+++ b/src/visualisers/Akima761.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima761.cc
Implementation of Akima761 class.
diff --git a/src/visualisers/Akima761Method.cc b/src/visualisers/Akima761Method.cc
index 38c0154..5528efc 100644
--- a/src/visualisers/Akima761Method.cc
+++ b/src/visualisers/Akima761Method.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima761Method.cc
\brief Implementation of the Template class Akima761Method.
diff --git a/src/visualisers/Akima761Method.h b/src/visualisers/Akima761Method.h
index f24c420..6223b6d 100644
--- a/src/visualisers/Akima761Method.h
+++ b/src/visualisers/Akima761Method.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Akima761Method.h
\brief Definition of the Template class Akima761Method.
diff --git a/src/visualisers/ArrowPlotting.cc b/src/visualisers/ArrowPlotting.cc
index abb0205..f490a6e 100644
--- a/src/visualisers/ArrowPlotting.cc
+++ b/src/visualisers/ArrowPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file WindPlotting.cc
\brief Implementation of the Template class Wind.
diff --git a/src/visualisers/ArrowPlotting.h b/src/visualisers/ArrowPlotting.h
index 5dd5201..8472742 100644
--- a/src/visualisers/ArrowPlotting.h
+++ b/src/visualisers/ArrowPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ArrowPlotting.h
\brief Definition of the Template class ArrowPlotting.
diff --git a/src/visualisers/AutomaticContourMethod.h b/src/visualisers/AutomaticContourMethod.h
index 09a94e6..d84cf22 100644
--- a/src/visualisers/AutomaticContourMethod.h
+++ b/src/visualisers/AutomaticContourMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AutomaticContourMethod.h
\brief Definition of the Template class AutomaticContourMethod.
diff --git a/src/visualisers/Axis.cc b/src/visualisers/Axis.cc
index 9514be0..0b6fa86 100644
--- a/src/visualisers/Axis.cc
+++ b/src/visualisers/Axis.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Axis.cc
\brief Implementation of the Template class Axis.
@@ -362,7 +370,7 @@ void VerticalAxis::label(VerticalAxisVisitor& axis)
if ( count % label_frequency_ ) continue;
- double height = ((*y)->height() == DBL_MIN || (*y)->height() == 0 ) ? label_height_ : (*y)->height();
+ double height = ((*y)->height() == DBL_MIN || (*y)->height() == 0 ) ? label_height_ : (*y)->height();
double pos;
map<int, double>::iterator p = positions.find((*y)->level());
@@ -375,7 +383,7 @@ void VerticalAxis::label(VerticalAxisVisitor& axis)
double newpos = axis.offsetTickLabel(height, p->second);
positions[(*y)->level()] = newpos;
- title_position_ = axis.offsetTickLabel(height * label.size()/2, p->second);;
+ title_position_ = newpos;
}
PaperPoint point(pos, transformation.y((*y)->position()));
diff --git a/src/visualisers/Axis.h b/src/visualisers/Axis.h
index 25580bd..032f664 100644
--- a/src/visualisers/Axis.h
+++ b/src/visualisers/Axis.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Axis.h
\brief Definition of the Template class Axis.
diff --git a/src/visualisers/AxisControl.cc b/src/visualisers/AxisControl.cc
index a7fb1cb..cd9fd1a 100644
--- a/src/visualisers/AxisControl.cc
+++ b/src/visualisers/AxisControl.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisControl.cc
\brief Implementation of the Template class AxisControl.
diff --git a/src/visualisers/AxisControl.h b/src/visualisers/AxisControl.h
index 13852b5..bcb16e7 100644
--- a/src/visualisers/AxisControl.h
+++ b/src/visualisers/AxisControl.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisControl.h
\brief Definition of the Template class AxisControl.
diff --git a/src/visualisers/AxisGrid.cc b/src/visualisers/AxisGrid.cc
index eb21cd7..82b7e8a 100644
--- a/src/visualisers/AxisGrid.cc
+++ b/src/visualisers/AxisGrid.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisGrid.cc
\brief Implementation of the Template class AxisGrid.
diff --git a/src/visualisers/AxisGrid.h b/src/visualisers/AxisGrid.h
index db108b0..375df68 100644
--- a/src/visualisers/AxisGrid.h
+++ b/src/visualisers/AxisGrid.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisGrid.h
\brief Definition of the Template class AxisGrid.
diff --git a/src/visualisers/AxisItem.cc b/src/visualisers/AxisItem.cc
index be5b4d6..9014ec1 100644
--- a/src/visualisers/AxisItem.cc
+++ b/src/visualisers/AxisItem.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisItem.cc
\brief Implementation of the Template class AxisItem.
diff --git a/src/visualisers/AxisItem.h b/src/visualisers/AxisItem.h
index daccc9f..c7f8626 100644
--- a/src/visualisers/AxisItem.h
+++ b/src/visualisers/AxisItem.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisItem.h
\brief Definition of the Template class AxisItem.
diff --git a/src/visualisers/AxisLine.cc b/src/visualisers/AxisLine.cc
index 12e6f0b..e93ff43 100644
--- a/src/visualisers/AxisLine.cc
+++ b/src/visualisers/AxisLine.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisLine.cc
\brief Implementation of the Template class AxisLine.
diff --git a/src/visualisers/AxisLine.h b/src/visualisers/AxisLine.h
index e62678b..578c078 100644
--- a/src/visualisers/AxisLine.h
+++ b/src/visualisers/AxisLine.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisLine.h
\brief Definition of the Template class AxisLine.
diff --git a/src/visualisers/AxisMethod.cc b/src/visualisers/AxisMethod.cc
index 0a1480e..d4cf3f1 100644
--- a/src/visualisers/AxisMethod.cc
+++ b/src/visualisers/AxisMethod.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisMethod.cc
\brief Implementation of the Template class AxisMethod.
diff --git a/src/visualisers/AxisMethod.h b/src/visualisers/AxisMethod.h
index 40edda8..ce1d794 100644
--- a/src/visualisers/AxisMethod.h
+++ b/src/visualisers/AxisMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisMethod.h
\brief Definition of the Template class AxisMethod.
diff --git a/src/visualisers/AxisMinorTick.cc b/src/visualisers/AxisMinorTick.cc
index 43c652a..7618f2f 100644
--- a/src/visualisers/AxisMinorTick.cc
+++ b/src/visualisers/AxisMinorTick.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisMinorTick.cc
\brief Implementation of the Template class AxisMinorTick.
diff --git a/src/visualisers/AxisMinorTick.h b/src/visualisers/AxisMinorTick.h
index cbe157f..ea5825f 100644
--- a/src/visualisers/AxisMinorTick.h
+++ b/src/visualisers/AxisMinorTick.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisMinorTick.h
\brief Definition of the Template class AxisMinorTick.
diff --git a/src/visualisers/AxisTick.cc b/src/visualisers/AxisTick.cc
index 7ba08c6..9edba03 100644
--- a/src/visualisers/AxisTick.cc
+++ b/src/visualisers/AxisTick.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisTick.cc
\brief Implementation of the Template class AxisTick.
diff --git a/src/visualisers/AxisTick.h b/src/visualisers/AxisTick.h
index 1e1eab1..675b311 100644
--- a/src/visualisers/AxisTick.h
+++ b/src/visualisers/AxisTick.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisTick.h
\brief Definition of the Template class AxisTick.
diff --git a/src/visualisers/AxisTickLabelType.cc b/src/visualisers/AxisTickLabelType.cc
index bc480f8..c82ec11 100644
--- a/src/visualisers/AxisTickLabelType.cc
+++ b/src/visualisers/AxisTickLabelType.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisTickLabelType.cc
\brief Implementation of the Template class AxisTickLabelType.
diff --git a/src/visualisers/AxisTickLabelType.h b/src/visualisers/AxisTickLabelType.h
index c1d1b64..b98323d 100644
--- a/src/visualisers/AxisTickLabelType.h
+++ b/src/visualisers/AxisTickLabelType.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisTickLabelType.h
\brief Definition of the Template class AxisTickLabel.
diff --git a/src/visualisers/AxisType.cc b/src/visualisers/AxisType.cc
index fc69ebe..898aadc 100644
--- a/src/visualisers/AxisType.cc
+++ b/src/visualisers/AxisType.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisType.cc
\brief Implementation of the Template class AxisType.
diff --git a/src/visualisers/AxisType.h b/src/visualisers/AxisType.h
index c3ea92b..5f98e6a 100644
--- a/src/visualisers/AxisType.h
+++ b/src/visualisers/AxisType.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file AxisType.h
\brief Definition of the Template class AxisType.
diff --git a/src/visualisers/Bar.cc b/src/visualisers/Bar.cc
index faf6374..c69d623 100644
--- a/src/visualisers/Bar.cc
+++ b/src/visualisers/Bar.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Bar.cc
\brief Implementation of the Template class Bar.
diff --git a/src/visualisers/Bar.h b/src/visualisers/Bar.h
index bf28475..33818f8 100644
--- a/src/visualisers/Bar.h
+++ b/src/visualisers/Bar.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Bar.h
\brief Definition of the Template class Bar.
diff --git a/src/visualisers/BothValuePlotMethod.h b/src/visualisers/BothValuePlotMethod.h
index 4062bbd..2517be8 100644
--- a/src/visualisers/BothValuePlotMethod.h
+++ b/src/visualisers/BothValuePlotMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BothValuePlotMethod.h
\brief Definition of the Template class BothValuePlotMethod.
diff --git a/src/visualisers/Boundaries.cc b/src/visualisers/Boundaries.cc
index ebf4c09..fb12688 100644
--- a/src/visualisers/Boundaries.cc
+++ b/src/visualisers/Boundaries.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Boundaries.cc
\brief Implementation of the Template class BoundariesBase.
@@ -64,6 +72,7 @@ void Boundaries::operator()(const map<string, string>& setting, BasicGraphicsObj
vector<string> treaty;
treaty.push_back("International boundary");
treaty.push_back("Country_Boundary");
+ treaty.push_back("Indefinite (please verify)");
boundaries.decode(task.transformation(), "featurecla", treaty);
const Transformation& transformation = task.transformation();
@@ -118,6 +127,7 @@ void Boundaries::operator()(const map<string, string>& setting, BasicGraphicsObj
vector<string> dis;
dis.push_back("Disputed");
+ dis.push_back("Line of control (please verify)");
file = share_folder + political_boundaries;
disputed.setPath(file);
diff --git a/src/visualisers/Boundaries.h b/src/visualisers/Boundaries.h
index 88f8506..9f97f9f 100644
--- a/src/visualisers/Boundaries.h
+++ b/src/visualisers/Boundaries.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Boundaries.h
\brief Definition of the Template class NoBoundaries.
diff --git a/src/visualisers/BoxPlotBasicItem.h b/src/visualisers/BoxPlotBasicItem.h
index f0d25cf..55287b5 100644
--- a/src/visualisers/BoxPlotBasicItem.h
+++ b/src/visualisers/BoxPlotBasicItem.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BoxPlotBasicItem.h
\brief Definition of the Template class BoxPlotBasicItem.
diff --git a/src/visualisers/BoxPlotItem.cc b/src/visualisers/BoxPlotItem.cc
index eae3cd7..1532bca 100644
--- a/src/visualisers/BoxPlotItem.cc
+++ b/src/visualisers/BoxPlotItem.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BoxPlotItem.cc
\brief Implementation of the Template class BoxPlotBox.
diff --git a/src/visualisers/BoxPlotItem.h b/src/visualisers/BoxPlotItem.h
index 6b46f0d..c79330f 100644
--- a/src/visualisers/BoxPlotItem.h
+++ b/src/visualisers/BoxPlotItem.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BoxPlotItem.h
\brief Definition of the Template class BoxPlotItem.
diff --git a/src/visualisers/BoxPlotVisualiser.cc b/src/visualisers/BoxPlotVisualiser.cc
index 361c1d6..2eba1da 100644
--- a/src/visualisers/BoxPlotVisualiser.cc
+++ b/src/visualisers/BoxPlotVisualiser.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BoxPlotVisualiser.cc
\brief Implementation of the Template class BoxPlotVisualiser.
diff --git a/src/visualisers/BoxPlotVisualiser.h b/src/visualisers/BoxPlotVisualiser.h
index aa32b87..8b92e0d 100644
--- a/src/visualisers/BoxPlotVisualiser.h
+++ b/src/visualisers/BoxPlotVisualiser.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BoxPlotVisualiser.h
\brief Definition of the Template class BoxPlotVisualiser.
diff --git a/src/visualisers/CalculateColourTechnique.cc b/src/visualisers/CalculateColourTechnique.cc
index c1de945..2674cb7 100644
--- a/src/visualisers/CalculateColourTechnique.cc
+++ b/src/visualisers/CalculateColourTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CalculateColourTechnique.cc
\brief Implementation of the Template class CalculateColourTechnique.
diff --git a/src/visualisers/CalculateColourTechnique.h b/src/visualisers/CalculateColourTechnique.h
index 2ff53bc..361a92b 100644
--- a/src/visualisers/CalculateColourTechnique.h
+++ b/src/visualisers/CalculateColourTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CalculateColourTechnique.h
\brief Definition of the Template class CalculateColourTechnique.
diff --git a/src/visualisers/CalmIndicator.h b/src/visualisers/CalmIndicator.h
index 8abcca8..801dd89 100644
--- a/src/visualisers/CalmIndicator.h
+++ b/src/visualisers/CalmIndicator.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CalmIndicator.h
\brief Definition of the Template class CalmIndicator.
diff --git a/src/visualisers/CellShading.cc b/src/visualisers/CellShading.cc
index ad4c2d4..8e899a4 100644
--- a/src/visualisers/CellShading.cc
+++ b/src/visualisers/CellShading.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CellShading.cc
\brief Implementation of the Template class CellShading.
@@ -74,14 +82,9 @@ void CellShading::operator()(IsoPlot* iso, MatrixHandler& data, BasicGraphicsObj
double height = parent.absoluteHeight(); // in cm
shading_ = "grid";
-
-
PaperPoint middle((maxc-minc)/2, (maxr-minr)/2);
-
-
-
-
+ adaptive_ = false;
shading_ = "cell";
MagLog::debug() << "minx=" << minc << endl;
MagLog::debug() << "maxx=" << maxc << endl;
@@ -110,15 +113,15 @@ void CellShading::operator()(IsoPlot* iso, MatrixHandler& data, BasicGraphicsObj
double distance_plot = projection.distance(point, point1);
double distance_data = projection.distance(point, nextdata);
-
if ( magCompare(resolution_method_, "adaptive" ) ) {
if ( distance_plot < distance_data ) {
iso->isoline(data, parent);
- cout << "Grid Shading" << endl;
+ //cout << "Grid Shading" << endl;
MagLog::info() << "Magics will use grid shading" << endl;
+ adaptive_ = true;
+ return;
}
- return ;
}
Image* image = new Image();
@@ -139,16 +142,13 @@ void CellShading::operator()(IsoPlot* iso, MatrixHandler& data, BasicGraphicsObj
lat -= stepr;
}
-
ColourTable table;
vector<Colour>::const_iterator colour = colours_.begin();
for (int i = 0; i <= *max_element(image->begin(), image->end()); i++)
{
table.push_back(*colour);
-
if ( ++colour == colours_.end() ) colour = colours_.begin();
}
-
PaperPoint pp(minc, maxr);
image->setOrigin(pp);
@@ -157,14 +157,13 @@ void CellShading::operator()(IsoPlot* iso, MatrixHandler& data, BasicGraphicsObj
image->setHeight(maxr-minr);
image->setColourTable(table);
-
parent.push_back(image);
}
+
DumpShading::DumpShading()
{
}
-
DumpShading::~DumpShading()
{
}
@@ -183,8 +182,6 @@ void DumpShading::operator()( IsoPlot*,MatrixHandler& data, BasicGraphicsObjectC
Image* image = new Image();
image->set(data.rows(), data.columns());
-
-
for ( int row = 0; row < data.rows(); row++) {
for ( int column = 0; column < data.columns(); column++) {
@@ -195,7 +192,6 @@ void DumpShading::operator()( IsoPlot*,MatrixHandler& data, BasicGraphicsObjectC
}
-
ColourTable table;
vector<Colour>::const_iterator colour = colours_.begin();
for (int i = 0; i <= *max_element(image->begin(), image->end()); i++)
@@ -204,7 +200,6 @@ void DumpShading::operator()( IsoPlot*,MatrixHandler& data, BasicGraphicsObjectC
if ( ++colour == colours_.end() ) colour = colours_.begin();
}
-
PaperPoint pp(minc, maxr);
image->setOrigin(pp);
MagLog::debug() << "origin--->" << pp << endl;
@@ -219,7 +214,6 @@ void DumpShading::operator()( IsoPlot*,MatrixHandler& data, BasicGraphicsObjectC
bool CellShading::prepare(const LevelSelection& levels, const ColourTechnique& technique)
{
// First Interval ...
-
map_.clear();
colours_.clear();
map_[Interval(INT_MIN, levels.front())] = 0;
@@ -237,7 +231,6 @@ bool CellShading::prepare(const LevelSelection& levels, const ColourTechnique& t
void CellShading::visit(LegendVisitor& node, const ColourTechnique&)
{
-
for ( IntervalMap<int>::const_iterator interval = map_.begin(); interval != map_.end(); ++interval) {
Polyline* box = new Polyline();
@@ -247,24 +240,15 @@ void CellShading::visit(LegendVisitor& node, const ColourTechnique&)
// We ignore the first and the last entries: no interest in the legend!
if (interval->second == 0) continue;
if (interval->second == int(map_.size()-1)) continue;
-
-
+
box->setFilled(true);
box->setFillColour(colours_[interval->second]);
- FillShadingProperties* shading = new FillShadingProperties();
-
-
-
+ FillShadingProperties* shading = new FillShadingProperties();
box->setShading(shading);
-
-
-
node.add(new BoxEntry(min, max, box));
}
-
node.last();
-
}
@@ -278,17 +262,18 @@ void CellShading::print(ostream& out) const
}
-
-
void CellShading::colour(double val, Colour& colour)
{
colour = this->colours_[this->map_.find(val, 0)];
}
+
+
CellArray* CellShading::array(MatrixHandler& matrix, IntervalMap<int>& range,
const Transformation& transformation, int width, int height,
float resolution, const string& technique)
{
-
- return new GridArray(matrix, range, transformation, width, height, resolution, "middle");
-
+ if ( adaptive_ )
+ return new GridArray(matrix, range, transformation, width, height, resolution, "middle");
+ else
+ return 0;
}
diff --git a/src/visualisers/CellShading.h b/src/visualisers/CellShading.h
index d45e243..28d8901 100644
--- a/src/visualisers/CellShading.h
+++ b/src/visualisers/CellShading.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CellShading.h
\brief Definition of the Template class CellShading.
@@ -70,6 +78,7 @@ protected:
IntervalMap<int> map_;
vector<Colour> colours_;
string shading_;
+ bool adaptive_;
private:
//! Copy constructor - No copy allowed
diff --git a/src/visualisers/Cities.cc b/src/visualisers/Cities.cc
index 24d712a..f2851bb 100644
--- a/src/visualisers/Cities.cc
+++ b/src/visualisers/Cities.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Cities.cc
\brief Implementation of the Template class CitiesBase.
diff --git a/src/visualisers/Cities.h b/src/visualisers/Cities.h
index 54502a7..24e9c2b 100644
--- a/src/visualisers/Cities.h
+++ b/src/visualisers/Cities.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Cities.h
\brief Definition of the Template class NoCities.
diff --git a/src/visualisers/CoastPlotting.cc b/src/visualisers/CoastPlotting.cc
index 35d8f3b..5c97d6e 100644
--- a/src/visualisers/CoastPlotting.cc
+++ b/src/visualisers/CoastPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CoastPlotting.cc
\brief Implementation of the Template class CoastPlotting.
diff --git a/src/visualisers/CoastPlotting.h b/src/visualisers/CoastPlotting.h
index 17c4ea5..1c9de7f 100644
--- a/src/visualisers/CoastPlotting.h
+++ b/src/visualisers/CoastPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CoastPlotting.h
\brief Definition of the Template class CoastPlotting.
diff --git a/src/visualisers/Coastlines.cc b/src/visualisers/Coastlines.cc
index 9f8dee4..0557f7c 100644
--- a/src/visualisers/Coastlines.cc
+++ b/src/visualisers/Coastlines.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Coastlines.cc
\brief Implementation of the Template class Coastlines.
diff --git a/src/visualisers/Coastlines.h b/src/visualisers/Coastlines.h
index cfc982c..2b844cc 100644
--- a/src/visualisers/Coastlines.h
+++ b/src/visualisers/Coastlines.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Coastlines.h
\brief Definition of the Template class Coastlines.
diff --git a/src/visualisers/ColourSelection.cc b/src/visualisers/ColourSelection.cc
index 937efb8..398cbb6 100644
--- a/src/visualisers/ColourSelection.cc
+++ b/src/visualisers/ColourSelection.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourSelection.cc
\brief Implementation of the Template class ColourSelection.
diff --git a/src/visualisers/ColourSelection.h b/src/visualisers/ColourSelection.h
index fc1c808..c218644 100644
--- a/src/visualisers/ColourSelection.h
+++ b/src/visualisers/ColourSelection.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourSelection.h
\brief Definition of the Template class ColourSelection.
diff --git a/src/visualisers/ColourSelectionCount.cc b/src/visualisers/ColourSelectionCount.cc
index 5aeef3a..c2e79cd 100644
--- a/src/visualisers/ColourSelectionCount.cc
+++ b/src/visualisers/ColourSelectionCount.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourSelectionCount.cc
\brief Implementation of the Template class ColourSelectionCount.
diff --git a/src/visualisers/ColourSelectionCount.h b/src/visualisers/ColourSelectionCount.h
index 474dab4..5f3b244 100644
--- a/src/visualisers/ColourSelectionCount.h
+++ b/src/visualisers/ColourSelectionCount.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourSelectionCount.h
\brief Definition of the Template class ColourSelectionCount.
diff --git a/src/visualisers/ColourSelectionList.cc b/src/visualisers/ColourSelectionList.cc
index fb40a48..fee682d 100644
--- a/src/visualisers/ColourSelectionList.cc
+++ b/src/visualisers/ColourSelectionList.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourSelectionList.cc
\brief Implementation of the Template class ColourSelectionList.
diff --git a/src/visualisers/ColourSelectionList.h b/src/visualisers/ColourSelectionList.h
index 85b584d..8dcb65f 100644
--- a/src/visualisers/ColourSelectionList.h
+++ b/src/visualisers/ColourSelectionList.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourSelectionList.h
\brief Definition of the Template class ColourSelectionList.
diff --git a/src/visualisers/ColourTechnique.cc b/src/visualisers/ColourTechnique.cc
index ff57140..b340e5c 100644
--- a/src/visualisers/ColourTechnique.cc
+++ b/src/visualisers/ColourTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTechnique.cc
\brief Implementation of the Template class ColourTechnique.
diff --git a/src/visualisers/ColourTechnique.h b/src/visualisers/ColourTechnique.h
index 1cd3b82..ddaa93c 100644
--- a/src/visualisers/ColourTechnique.h
+++ b/src/visualisers/ColourTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ColourTechnique.h
\brief Definition of the Template class ColourTechnique.
diff --git a/src/visualisers/Contour.cc b/src/visualisers/Contour.cc
index 173c26e..43e3b60 100644
--- a/src/visualisers/Contour.cc
+++ b/src/visualisers/Contour.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Contour.cc
\brief Implementation of the Template class Contour.
diff --git a/src/visualisers/Contour.h b/src/visualisers/Contour.h
index 2327b75..8e71906 100644
--- a/src/visualisers/Contour.h
+++ b/src/visualisers/Contour.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Contour.h
\brief Definition of the Template class Contour.
diff --git a/src/visualisers/ContourMethod.h b/src/visualisers/ContourMethod.h
index 4e8353e..a22bdb9 100644
--- a/src/visualisers/ContourMethod.h
+++ b/src/visualisers/ContourMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ContourMethod.h
\brief Definition of the Template class ContourMethod.
diff --git a/src/visualisers/CountSelectionType.cc b/src/visualisers/CountSelectionType.cc
index f4734ac..0ebc193 100644
--- a/src/visualisers/CountSelectionType.cc
+++ b/src/visualisers/CountSelectionType.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file
.cc
diff --git a/src/visualisers/CountSelectionType.h b/src/visualisers/CountSelectionType.h
index ec23039..3b649ba 100644
--- a/src/visualisers/CountSelectionType.h
+++ b/src/visualisers/CountSelectionType.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file CountSelectionType.h
\brief Definition of the Template class CountSelectionType.
diff --git a/src/visualisers/Curve.cc b/src/visualisers/Curve.cc
index dcca3e1..c05206b 100644
--- a/src/visualisers/Curve.cc
+++ b/src/visualisers/Curve.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Curve.cc
\brief Implementation of the Template class Curve.
diff --git a/src/visualisers/Curve.h b/src/visualisers/Curve.h
index f65184c..2f45959 100644
--- a/src/visualisers/Curve.h
+++ b/src/visualisers/Curve.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Curve.h
\brief Definition of the Template class Curve.
diff --git a/src/visualisers/DateAxis.cc b/src/visualisers/DateAxis.cc
index 821caed..5b908ac 100644
--- a/src/visualisers/DateAxis.cc
+++ b/src/visualisers/DateAxis.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DateAxisMethod.cc
\brief Implementation of the Template class DateAxisMethod.
diff --git a/src/visualisers/DateAxis.h b/src/visualisers/DateAxis.h
index 35b3f1a..0cdd226 100644
--- a/src/visualisers/DateAxis.h
+++ b/src/visualisers/DateAxis.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DateAxisMethod.h
\brief Definition of the Template class DateAxisMethod.
diff --git a/src/visualisers/DefinitionTable.h b/src/visualisers/DefinitionTable.h
index 9183885..516161d 100644
--- a/src/visualisers/DefinitionTable.h
+++ b/src/visualisers/DefinitionTable.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef DefinitionTable_H
#define DefinitionTable_H
diff --git a/src/visualisers/DefinitionTable.hcc b/src/visualisers/DefinitionTable.hcc
index 844a276..3087c1f 100644
--- a/src/visualisers/DefinitionTable.hcc
+++ b/src/visualisers/DefinitionTable.hcc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LocalTable.cc
\brief Implementation of the Template class LocalTable.
diff --git a/src/visualisers/DotPolyShadingMethod.h b/src/visualisers/DotPolyShadingMethod.h
index 5ac45b9..5d96302 100644
--- a/src/visualisers/DotPolyShadingMethod.h
+++ b/src/visualisers/DotPolyShadingMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file DotPolyShadingMethod.h
\brief Definition of the Template class DotPolyShadingMethod.
diff --git a/src/visualisers/EpsForecastPlot.h b/src/visualisers/EpsForecastPlot.h
index 6e552fe..b73b5d7 100644
--- a/src/visualisers/EpsForecastPlot.h
+++ b/src/visualisers/EpsForecastPlot.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file EpsForecastPlot.h
\brief Definition of the Template class EpsForecastPlot.
diff --git a/src/visualisers/EpsGraph.cc b/src/visualisers/EpsGraph.cc
index 95edd85..7088769 100644
--- a/src/visualisers/EpsGraph.cc
+++ b/src/visualisers/EpsGraph.cc
@@ -1,12 +1,21 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHvisitor WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file EpsGraph.cc
\brief Implementation of the Template class EpsGraph.
diff --git a/src/visualisers/EpsGraph.h b/src/visualisers/EpsGraph.h
index 5860774..3c77f78 100644
--- a/src/visualisers/EpsGraph.h
+++ b/src/visualisers/EpsGraph.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file EpsGraph.h
\brief Definition of the Template class EpsGraph.
diff --git a/src/visualisers/EquidistantTableMode.cc b/src/visualisers/EquidistantTableMode.cc
index 133aa3d..57f6aff 100644
--- a/src/visualisers/EquidistantTableMode.cc
+++ b/src/visualisers/EquidistantTableMode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file EquidistantTableMode.cc
\brief Implementation of the Template class EquidistantTableMode.
diff --git a/src/visualisers/EquidistantTableMode.h b/src/visualisers/EquidistantTableMode.h
index 80b5cd4..062912b 100644
--- a/src/visualisers/EquidistantTableMode.h
+++ b/src/visualisers/EquidistantTableMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file EquidistantTableMode.h
\brief Definition of the Template class EquidistantTableMode.
diff --git a/src/visualisers/Filter.cc b/src/visualisers/Filter.cc
index 2163fa1..2ea8545 100644
--- a/src/visualisers/Filter.cc
+++ b/src/visualisers/Filter.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Filter.cc
Implementation of Filter class.
diff --git a/src/visualisers/Filter.h b/src/visualisers/Filter.h
index 706e1c1..588bf53 100644
--- a/src/visualisers/Filter.h
+++ b/src/visualisers/Filter.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Filter.h
\brief Definition of the Template class Filter.
diff --git a/src/visualisers/FlagPlotting.cc b/src/visualisers/FlagPlotting.cc
index 2eaef19..d16dd04 100644
--- a/src/visualisers/FlagPlotting.cc
+++ b/src/visualisers/FlagPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file WindPlotting.cc
\brief Implementation of the Template class Wind.
diff --git a/src/visualisers/FlagPlotting.h b/src/visualisers/FlagPlotting.h
index 59b63d5..d8c59a6 100644
--- a/src/visualisers/FlagPlotting.h
+++ b/src/visualisers/FlagPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file FlagPlotting.h
\brief Definition of the Template class FlagPlotting.
diff --git a/src/visualisers/FloatSelection.cc b/src/visualisers/FloatSelection.cc
index c58a020..cf96072 100644
--- a/src/visualisers/FloatSelection.cc
+++ b/src/visualisers/FloatSelection.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file FloatSelection.cc
\brief Implementation of the Template class FloatSelection.
diff --git a/src/visualisers/FloatSelection.h b/src/visualisers/FloatSelection.h
index 93f1844..38ca374 100644
--- a/src/visualisers/FloatSelection.h
+++ b/src/visualisers/FloatSelection.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file FloatSelection.h
\brief Definition of the Template class FloatSelection.
diff --git a/src/visualisers/Graph.h b/src/visualisers/Graph.h
index 8a264a6..bbe95f4 100644
--- a/src/visualisers/Graph.h
+++ b/src/visualisers/Graph.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Graph.h
\brief Definition of the Template class Graph.
diff --git a/src/visualisers/GraphPlotting.cc b/src/visualisers/GraphPlotting.cc
index ba7c0b8..b5c145e 100644
--- a/src/visualisers/GraphPlotting.cc
+++ b/src/visualisers/GraphPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GraphPlotting.cc
\brief Implementation of the Template class GraphPlotting.
diff --git a/src/visualisers/GraphPlotting.h b/src/visualisers/GraphPlotting.h
index 633fee7..a1362a7 100644
--- a/src/visualisers/GraphPlotting.h
+++ b/src/visualisers/GraphPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GraphPlotting.h
\brief Definition of the Template class GraphPlotting.
diff --git a/src/visualisers/GraphShade.cc b/src/visualisers/GraphShade.cc
index 36b4e8d..008211c 100644
--- a/src/visualisers/GraphShade.cc
+++ b/src/visualisers/GraphShade.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GraphShade.cc
\brief Implementation of the Template class GraphShade.
diff --git a/src/visualisers/GraphShade.h b/src/visualisers/GraphShade.h
index 8aac6d0..5f7c415 100644
--- a/src/visualisers/GraphShade.h
+++ b/src/visualisers/GraphShade.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GraphShade.h
\brief Definition of the Template class GraphShade.
diff --git a/src/visualisers/GraphShadeStyle.cc b/src/visualisers/GraphShadeStyle.cc
index cefe014..107a306 100644
--- a/src/visualisers/GraphShadeStyle.cc
+++ b/src/visualisers/GraphShadeStyle.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GraphShadeStyle.cc
\brief Implementation of the Template class GraphShadeStyle.
diff --git a/src/visualisers/GraphShadeStyle.h b/src/visualisers/GraphShadeStyle.h
index af40d99..64d5a39 100644
--- a/src/visualisers/GraphShadeStyle.h
+++ b/src/visualisers/GraphShadeStyle.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GraphShadeStyle.h
\brief Definition of the Template class GraphShadeStyle.
diff --git a/src/visualisers/GribTables.h b/src/visualisers/GribTables.h
index 7744976..5ef29c1 100644
--- a/src/visualisers/GribTables.h
+++ b/src/visualisers/GribTables.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GribTables.h
\brief Definition of the Template class GribTables.
diff --git a/src/visualisers/GridPlotting.cc b/src/visualisers/GridPlotting.cc
index 8c9d8c7..9673fee 100644
--- a/src/visualisers/GridPlotting.cc
+++ b/src/visualisers/GridPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GridPlotting.cc
\brief Implementation of the Template class GridPlotting.
diff --git a/src/visualisers/GridPlotting.h b/src/visualisers/GridPlotting.h
index f12c060..6edd6a8 100644
--- a/src/visualisers/GridPlotting.h
+++ b/src/visualisers/GridPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file GridPlotting.h
\brief Definition of the Template class GridPlotting.
diff --git a/src/visualisers/HatchPolyShadingMethod.h b/src/visualisers/HatchPolyShadingMethod.h
index 3f48fbc..925660b 100644
--- a/src/visualisers/HatchPolyShadingMethod.h
+++ b/src/visualisers/HatchPolyShadingMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HatchPolyShadingMethod.h
\brief Definition of the Template class HatchPolyShadingMethod.
diff --git a/src/visualisers/HeightSelection.cc b/src/visualisers/HeightSelection.cc
index acfcf97..9b50745 100644
--- a/src/visualisers/HeightSelection.cc
+++ b/src/visualisers/HeightSelection.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelection.cc
\brief Implementation of the Template class HeightSelection.
diff --git a/src/visualisers/HeightSelection.h b/src/visualisers/HeightSelection.h
index 2f1be49..58dbd8f 100644
--- a/src/visualisers/HeightSelection.h
+++ b/src/visualisers/HeightSelection.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelection.h
\brief Definition of the Template class HeightSelection.
diff --git a/src/visualisers/HeightSelectionCount.h b/src/visualisers/HeightSelectionCount.h
index 7961c2e..054d66d 100644
--- a/src/visualisers/HeightSelectionCount.h
+++ b/src/visualisers/HeightSelectionCount.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelectionCount.h
\brief Definition of the Template class HeightSelectionCount.
diff --git a/src/visualisers/HeightSelectionList.h b/src/visualisers/HeightSelectionList.h
index ee79272..ca7d9f6 100644
--- a/src/visualisers/HeightSelectionList.h
+++ b/src/visualisers/HeightSelectionList.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelectionList.h
\brief Definition of the Template class HeightSelectionList.
diff --git a/src/visualisers/HeightTechnique.cc b/src/visualisers/HeightTechnique.cc
index 5e2d035..2a2ef24 100644
--- a/src/visualisers/HeightTechnique.cc
+++ b/src/visualisers/HeightTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelection.cc
\brief Implementation of the Template class HeightSelection.
diff --git a/src/visualisers/HeightTechnique.h b/src/visualisers/HeightTechnique.h
index da71f1a..29db47f 100644
--- a/src/visualisers/HeightTechnique.h
+++ b/src/visualisers/HeightTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelection.h
\brief Definition of the Template class HeightSelection.
diff --git a/src/visualisers/HiLo.cc b/src/visualisers/HiLo.cc
index 353cc4d..2d779c3 100644
--- a/src/visualisers/HiLo.cc
+++ b/src/visualisers/HiLo.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLo.cc
\brief Implementation of the Template class HiLo.
diff --git a/src/visualisers/HiLo.h b/src/visualisers/HiLo.h
index f87b676..dd9b81e 100644
--- a/src/visualisers/HiLo.h
+++ b/src/visualisers/HiLo.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLo.h
\brief Definition of the Template class HiLo.
diff --git a/src/visualisers/HiLoBase.h b/src/visualisers/HiLoBase.h
index 0e9c98f..4715ecc 100644
--- a/src/visualisers/HiLoBase.h
+++ b/src/visualisers/HiLoBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoBase.h
\brief Definition of the Template class HiLoBase.
diff --git a/src/visualisers/HiLoBoth.h b/src/visualisers/HiLoBoth.h
index 93351c3..5fa898e 100644
--- a/src/visualisers/HiLoBoth.h
+++ b/src/visualisers/HiLoBoth.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoBoth.h
\brief Definition of the Template class HiLoBoth.
diff --git a/src/visualisers/HiLoMarker.h b/src/visualisers/HiLoMarker.h
index d478ec8..c20ab6f 100644
--- a/src/visualisers/HiLoMarker.h
+++ b/src/visualisers/HiLoMarker.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoMarker.h
\brief Definition of the Template class HiLoMarker.
diff --git a/src/visualisers/HiLoMarkerBase.h b/src/visualisers/HiLoMarkerBase.h
index d50197c..3b05133 100644
--- a/src/visualisers/HiLoMarkerBase.h
+++ b/src/visualisers/HiLoMarkerBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoMarkerBase.h
\brief Definition of the Template class HiLoMarkerBase.
diff --git a/src/visualisers/HiLoNumber.h b/src/visualisers/HiLoNumber.h
index 8ac79b9..58f3c28 100644
--- a/src/visualisers/HiLoNumber.h
+++ b/src/visualisers/HiLoNumber.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoNumber.h
\brief Definition of the Template class HiLoNumber.
diff --git a/src/visualisers/HiLoTechnique.h b/src/visualisers/HiLoTechnique.h
index b39275f..38dbab0 100644
--- a/src/visualisers/HiLoTechnique.h
+++ b/src/visualisers/HiLoTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoTechnique.h
\brief Definition of the Template class HiLoTechnique.
diff --git a/src/visualisers/HiLoText.h b/src/visualisers/HiLoText.h
index d73571c..67d93a2 100644
--- a/src/visualisers/HiLoText.h
+++ b/src/visualisers/HiLoText.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HiLoText.h
\brief Definition of the Template class HiLoText.
diff --git a/src/visualisers/HistoIndividualMode.h b/src/visualisers/HistoIndividualMode.h
index ad20a63..47b423e 100644
--- a/src/visualisers/HistoIndividualMode.h
+++ b/src/visualisers/HistoIndividualMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HistoIndividualMode.h
\brief Definition of the Template class HistoIndividualMode.
diff --git a/src/visualisers/HistoMode.h b/src/visualisers/HistoMode.h
index 02a1d54..3ce48e6 100644
--- a/src/visualisers/HistoMode.h
+++ b/src/visualisers/HistoMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HistoMode.h
\brief Definition of the Template class HistoMode.
diff --git a/src/visualisers/HistoTableMode.h b/src/visualisers/HistoTableMode.h
index 7ab068b..2da850d 100644
--- a/src/visualisers/HistoTableMode.h
+++ b/src/visualisers/HistoTableMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HistoTableMode.h
\brief Definition of the Template class HistoTableMode.
diff --git a/src/visualisers/Histogram.cc b/src/visualisers/Histogram.cc
index 07bcf81..238d747 100644
--- a/src/visualisers/Histogram.cc
+++ b/src/visualisers/Histogram.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Histogram.cc
\brief Implementation of the Template class Histogram.
diff --git a/src/visualisers/Histogram.h b/src/visualisers/Histogram.h
index bf31676..42771f5 100644
--- a/src/visualisers/Histogram.h
+++ b/src/visualisers/Histogram.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Histogram.h
\brief Definition of the Template class Histogram.
diff --git a/src/visualisers/ImageCalculateColourTechnique.h b/src/visualisers/ImageCalculateColourTechnique.h
index a81fafc..bbbac32 100644
--- a/src/visualisers/ImageCalculateColourTechnique.h
+++ b/src/visualisers/ImageCalculateColourTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ImageCalculateColourTechnique.h
\brief Definition of the Template class ImageCalculateColourTechnique.
diff --git a/src/visualisers/ImageListColourTechnique.h b/src/visualisers/ImageListColourTechnique.h
index 189bb1e..cfafbd4 100644
--- a/src/visualisers/ImageListColourTechnique.h
+++ b/src/visualisers/ImageListColourTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ImageListColourTechnique.h
\brief Definition of the Template class ImageListColourTechnique.
diff --git a/src/visualisers/ImportPlot.h b/src/visualisers/ImportPlot.h
index b06c463..93092e4 100644
--- a/src/visualisers/ImportPlot.h
+++ b/src/visualisers/ImportPlot.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ImportPlot.h
\brief Definition of the Template class ImportPlot.
diff --git a/src/visualisers/IntervalSelectionType.cc b/src/visualisers/IntervalSelectionType.cc
index 6c3cf66..c09877e 100644
--- a/src/visualisers/IntervalSelectionType.cc
+++ b/src/visualisers/IntervalSelectionType.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IntervalSelectionType.cc
\brief Implementation of the Template class IntervalSelectionType.
diff --git a/src/visualisers/IntervalSelectionType.h b/src/visualisers/IntervalSelectionType.h
index 2ccfb32..aaddfcb 100644
--- a/src/visualisers/IntervalSelectionType.h
+++ b/src/visualisers/IntervalSelectionType.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IntervalSelectionType.h
\brief Definition of the Template class IntervalSelectionType.
diff --git a/src/visualisers/Intervals.h b/src/visualisers/Intervals.h
index 43677fe..9965c7c 100644
--- a/src/visualisers/Intervals.h
+++ b/src/visualisers/Intervals.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Intervals.h
\brief Definition of the Template class Intervals.
diff --git a/src/visualisers/IsoHighlight.h b/src/visualisers/IsoHighlight.h
index 98845ce..cafba4f 100644
--- a/src/visualisers/IsoHighlight.h
+++ b/src/visualisers/IsoHighlight.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoHighlight.h
\brief Definition of the Template class IsoHighlight.
diff --git a/src/visualisers/IsoLabel.cc b/src/visualisers/IsoLabel.cc
index 9f03e09..2d426a3 100644
--- a/src/visualisers/IsoLabel.cc
+++ b/src/visualisers/IsoLabel.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoLabel.cc
\brief Implementation of the Template class IsoLabel.
diff --git a/src/visualisers/IsoLabel.h b/src/visualisers/IsoLabel.h
index 91126bf..6092b49 100644
--- a/src/visualisers/IsoLabel.h
+++ b/src/visualisers/IsoLabel.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoLabel.h
\brief Definition of the Template class IsoLabel.
diff --git a/src/visualisers/IsoPlot.cc b/src/visualisers/IsoPlot.cc
index dfc9fd9..250f5e2 100644
--- a/src/visualisers/IsoPlot.cc
+++ b/src/visualisers/IsoPlot.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoPlot.cc
\brief Implementation of the Template class IsoPlot.
@@ -255,21 +263,7 @@ public:
return;
Cell* cell;
vector<PaperPoint> points;
- /*
- if ( column1_ == column2_ && row1_ == row2_ ) {
- cell = (*parent_)(row1_, column1_);
- points.push_back(PaperPoint(cell->column(0), cell->row(0)));
- points.push_back(PaperPoint(cell->column(1), cell->row(0)));
- points.push_back(PaperPoint(cell->column(1), cell->row(2)));
- points.push_back(PaperPoint(cell->column(0), cell->row(2)));
-
-
-
-
- push_back(index, points);
- return;
- }
- */
+
// bottom
for (int column = column1_; column <= column2_; column++) {
@@ -1240,6 +1234,8 @@ void IsoPlot::isoline(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
range.insert(make_pair(Interval(levels_.back(), levels_.back()+epsilon), r-1));
CellArray* array = shading_->array(data, range, transformation, parent.widthResolution(), parent.heightResolution(),
resolution_, technique_);
+ if (!array)
+ return;
CellBox view(array);
threads_ = (needIsolines()) ? 4: 0;
@@ -1336,15 +1332,8 @@ void IsoPlot::isoline(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
void IsoPlot::operator()(MatrixHandler& data, BasicGraphicsObjectContainer& parent)
{
prepare(data);
- if ( legend_only_ ) {
- if ( rainbow_ ) {
- rainbowMethod_->set(*this);
- rainbowMethod_->prepare(*levelSelection_, true);
- setThicknessAndStyle();
- }
- return;
- }
-
+ if ( legend_only_ ) return;
+
{
Timer timer("contouring", "Time spent in contouring");
isoline(data, parent);
@@ -1470,8 +1459,8 @@ void IsoPlot::visit(Data& data, LegendVisitor& legend) {
line->setColour((*rainbowMethod_)(*level));
line->setLineStyle(line_style(*level));
- line->setThickness(thickness(*level)*5);
- legend.add(new RainbowEntry(*level, line));
+ line->setThickness(thickness(*level));
+ legend.add(new LineEntry(*level, line));
}
break;
}
diff --git a/src/visualisers/IsoPlot.h b/src/visualisers/IsoPlot.h
index 5b268b7..e41a10e 100644
--- a/src/visualisers/IsoPlot.h
+++ b/src/visualisers/IsoPlot.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoPlot.h
\brief Definition of the Template class IsoPlot.
diff --git a/src/visualisers/IsoShading.cc b/src/visualisers/IsoShading.cc
index c45b933..f4d6f51 100644
--- a/src/visualisers/IsoShading.cc
+++ b/src/visualisers/IsoShading.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoShading.cc
\brief Implementation of the Template class IsoShading.
diff --git a/src/visualisers/IsoShading.h b/src/visualisers/IsoShading.h
index 2fe0302..8acc959 100644
--- a/src/visualisers/IsoShading.h
+++ b/src/visualisers/IsoShading.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file IsoShading.h
\brief Definition of the Template class IsoShading.
diff --git a/src/visualisers/LabelPlotting.cc b/src/visualisers/LabelPlotting.cc
index f1bf790..116d4de 100644
--- a/src/visualisers/LabelPlotting.cc
+++ b/src/visualisers/LabelPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LabelPlotting.cc
\brief Implementation of the Template class LabelPlotting.
diff --git a/src/visualisers/LabelPlotting.h b/src/visualisers/LabelPlotting.h
index 885b196..4583d4f 100644
--- a/src/visualisers/LabelPlotting.h
+++ b/src/visualisers/LabelPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LabelPlotting.h
\brief Definition of the Template class LabelPlotting.
diff --git a/src/visualisers/LabelPlottingBase.h b/src/visualisers/LabelPlottingBase.h
index d19b2a9..7e3a271 100644
--- a/src/visualisers/LabelPlottingBase.h
+++ b/src/visualisers/LabelPlottingBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LabelPlottingBase.h
\brief Definition of the Template class LabelPlottingBase.
diff --git a/src/visualisers/LegendMethod.cc b/src/visualisers/LegendMethod.cc
index 07ad5f1..69b93d6 100644
--- a/src/visualisers/LegendMethod.cc
+++ b/src/visualisers/LegendMethod.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LegendMethod.cc
\brief Implementation of the Template class LegendMethod.
@@ -71,12 +79,12 @@ void ContinuousLegendMethod::row(LegendEntry& entry, double x, double y, Text& l
entry.notext();
PaperPoint middle(x, y);
entry.rowBox(middle, task);
- if ( labelCount_ % label_frequency_ == 0 )
- if ( entry.needContinuousText(legend) ) {
-
- middle.y_ -= 0.5;
- legend.push_back(middle); // We attach the text on the top middle of the symbol!
- }
+
+ if ( entry.needContinuousText() ) {
+ legend.setJustification(MLEFT);
+ middle.y_ -= 0.5;
+ legend.push_back(middle); // We attach the text on the top middle of the symbol!
+ }
labelCount_++;
}
@@ -86,12 +94,10 @@ void ContinuousLegendMethod::column(LegendEntry& entry, double x, double y, Text
if ( labelCount_ % label_frequency_ != 0 )
entry.notext();
entry.columnBox(PaperPoint(x, y), task);
- if ( labelCount_ % label_frequency_ == 0 )
-
- if ( entry.needContinuousText(legend) ) {
-
- legend.push_back(PaperPoint(x+0.25, y)); // WE attach the text on the right of the sumbol!
- }
+ if ( entry.needContinuousText() ) {
+ legend.setJustification(MLEFT);
+ legend.push_back(PaperPoint(x+0.25, y)); // WE attach the text on the right of the sumbol!
+ }
labelCount_++;
}
void HistogramLegendMethod::row(LegendEntry& entry, double x, double y, Text&, BasicGraphicsObjectContainer& out)
diff --git a/src/visualisers/LegendMethod.h b/src/visualisers/LegendMethod.h
index 35961c0..b8571c4 100644
--- a/src/visualisers/LegendMethod.h
+++ b/src/visualisers/LegendMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LegendMethod.h
\brief Definition of the Template class LegendMethod.
diff --git a/src/visualisers/LevelListSelectionType.cc b/src/visualisers/LevelListSelectionType.cc
index 8c5e29a..e32223c 100644
--- a/src/visualisers/LevelListSelectionType.cc
+++ b/src/visualisers/LevelListSelectionType.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LevelListSelectionType.cc
\brief Implementation of the Template class LevelListSelectionType.
diff --git a/src/visualisers/LevelListSelectionType.h b/src/visualisers/LevelListSelectionType.h
index 892caa3..a3dd44d 100644
--- a/src/visualisers/LevelListSelectionType.h
+++ b/src/visualisers/LevelListSelectionType.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LevelListSelectionType.h
\brief Definition of the Template class LevelListSelectionType.
diff --git a/src/visualisers/LevelSelection.cc b/src/visualisers/LevelSelection.cc
index 71b194b..02de7e0 100644
--- a/src/visualisers/LevelSelection.cc
+++ b/src/visualisers/LevelSelection.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LevelSelection.cc
\brief Implementation of the Template class LevelSelection.
diff --git a/src/visualisers/LevelSelection.h b/src/visualisers/LevelSelection.h
index 9411bb5..5eb8a71 100644
--- a/src/visualisers/LevelSelection.h
+++ b/src/visualisers/LevelSelection.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LevelSelection.h
\brief Definition of the Template class LevelSelection.
diff --git a/src/visualisers/LinearTableMode.cc b/src/visualisers/LinearTableMode.cc
index 84528c5..1ffec95 100644
--- a/src/visualisers/LinearTableMode.cc
+++ b/src/visualisers/LinearTableMode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LinearTableMode.cc
\brief Implementation of the Template class LinearTableMode.
diff --git a/src/visualisers/LinearTableMode.h b/src/visualisers/LinearTableMode.h
index 25ec063..1193593 100644
--- a/src/visualisers/LinearTableMode.h
+++ b/src/visualisers/LinearTableMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LinearTableMode.h
\brief Definition of the Template class LinearTableMode.
diff --git a/src/visualisers/ListColourTechnique.cc b/src/visualisers/ListColourTechnique.cc
index 680886c..ae47910 100644
--- a/src/visualisers/ListColourTechnique.cc
+++ b/src/visualisers/ListColourTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ListColourTechnique.cc
\brief Implementation of the Template class ListColourTechnique.
diff --git a/src/visualisers/ListColourTechnique.h b/src/visualisers/ListColourTechnique.h
index 2d33d2a..6fe2c67 100644
--- a/src/visualisers/ListColourTechnique.h
+++ b/src/visualisers/ListColourTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ListColourTechnique.h
\brief Definition of the Template class ListColourTechnique.
diff --git a/src/visualisers/LookupTableMode.cc b/src/visualisers/LookupTableMode.cc
index 2c612e3..07173c0 100644
--- a/src/visualisers/LookupTableMode.cc
+++ b/src/visualisers/LookupTableMode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LookupTableMode.cc
\brief Implementation of the Template class LookupTableMode.
diff --git a/src/visualisers/LookupTableMode.h b/src/visualisers/LookupTableMode.h
index 76ec427..61abcc3 100644
--- a/src/visualisers/LookupTableMode.h
+++ b/src/visualisers/LookupTableMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file LookupTableMode.h
\brief Definition of the Template class LookupTableMode.
diff --git a/src/visualisers/MarkerSelection.h b/src/visualisers/MarkerSelection.h
index 4435b20..d179178 100644
--- a/src/visualisers/MarkerSelection.h
+++ b/src/visualisers/MarkerSelection.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MarkerSelection.h
\brief Definition of the Template class MarkerSelection.
diff --git a/src/visualisers/MarkerSelectionCount.h b/src/visualisers/MarkerSelectionCount.h
index 3ac83f0..56fb0a1 100644
--- a/src/visualisers/MarkerSelectionCount.h
+++ b/src/visualisers/MarkerSelectionCount.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MarkerSelectionCount.h
\brief Definition of the Template class MarkerSelectionCount.
diff --git a/src/visualisers/MarkerSelectionList.h b/src/visualisers/MarkerSelectionList.h
index 73ef676..1dfc8ed 100644
--- a/src/visualisers/MarkerSelectionList.h
+++ b/src/visualisers/MarkerSelectionList.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MarkerSelectionList.h
\brief Definition of the Template class MarkerSelectionList.
diff --git a/src/visualisers/MarkerShadingTechnique.cc b/src/visualisers/MarkerShadingTechnique.cc
index 8d203d8..0bb021d 100644
--- a/src/visualisers/MarkerShadingTechnique.cc
+++ b/src/visualisers/MarkerShadingTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MarkerShadingTechnique.cc
\brief Implementation of the Template class MarkerShadingTechnique.
diff --git a/src/visualisers/MarkerShadingTechnique.h b/src/visualisers/MarkerShadingTechnique.h
index 5e111f3..c16fbd4 100644
--- a/src/visualisers/MarkerShadingTechnique.h
+++ b/src/visualisers/MarkerShadingTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MarkerShadingTechnique.h
\brief Definition of the Template class MarkerShadingTechnique.
diff --git a/src/visualisers/MarkerValuePlotMethod.h b/src/visualisers/MarkerValuePlotMethod.h
index f3fd4d0..f380da2 100644
--- a/src/visualisers/MarkerValuePlotMethod.h
+++ b/src/visualisers/MarkerValuePlotMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MarkerValuePlotMethod.h
\brief Definition of the Template class MarkerValuePlotMethod.
diff --git a/src/visualisers/MetgramGraph.cc b/src/visualisers/MetgramGraph.cc
index 9b34cef..f90d976 100644
--- a/src/visualisers/MetgramGraph.cc
+++ b/src/visualisers/MetgramGraph.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MetgramGraph.cc
\brief Implementation of the Template class MetgramGraph.
diff --git a/src/visualisers/MetgramGraph.h b/src/visualisers/MetgramGraph.h
index 4a29593..3d33c3e 100644
--- a/src/visualisers/MetgramGraph.h
+++ b/src/visualisers/MetgramGraph.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MetgramGraph.h
\brief Definition of the Template class MetgramGraph.
diff --git a/src/visualisers/MetgramStyle.cc b/src/visualisers/MetgramStyle.cc
index 8acaf29..c802057 100644
--- a/src/visualisers/MetgramStyle.cc
+++ b/src/visualisers/MetgramStyle.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MetgramStyle.cc
\brief Implementation of the Template class MetgramStyle.
diff --git a/src/visualisers/MetgramStyle.h b/src/visualisers/MetgramStyle.h
index f4e1a3c..7b4f70a 100644
--- a/src/visualisers/MetgramStyle.h
+++ b/src/visualisers/MetgramStyle.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file MetgramStyle.h
\brief Definition of the Template class MetgramStyle.
diff --git a/src/visualisers/NormalTableMode.cc b/src/visualisers/NormalTableMode.cc
index 7cdebc1..d903cfe 100644
--- a/src/visualisers/NormalTableMode.cc
+++ b/src/visualisers/NormalTableMode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file NormalTableMode.h
\brief Implementation of the Template class NormalTableMode.
diff --git a/src/visualisers/NormalTableMode.h b/src/visualisers/NormalTableMode.h
index 9374ce5..2d399f2 100644
--- a/src/visualisers/NormalTableMode.h
+++ b/src/visualisers/NormalTableMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file NormalTableMode.cc
\brief Definition of the Template class NormalTableMode.
diff --git a/src/visualisers/ObsItem.h b/src/visualisers/ObsItem.h
index 03781e0..37c0dcc 100644
--- a/src/visualisers/ObsItem.h
+++ b/src/visualisers/ObsItem.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ObsItem.h
\brief Definition of the Template class ObsItem.
diff --git a/src/visualisers/ObsItemFamily.cc b/src/visualisers/ObsItemFamily.cc
index 03e5633..99c5873 100644
--- a/src/visualisers/ObsItemFamily.cc
+++ b/src/visualisers/ObsItemFamily.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ObsItemFamily.cc
\brief Implementation of the Template class ObsItemfamily.
diff --git a/src/visualisers/ObsItemFamily.h b/src/visualisers/ObsItemFamily.h
index e21f239..fc599dd 100644
--- a/src/visualisers/ObsItemFamily.h
+++ b/src/visualisers/ObsItemFamily.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef ObsItemFamily_H
#define ObsItemFamily_H
diff --git a/src/visualisers/ObsPlotting.cc b/src/visualisers/ObsPlotting.cc
index 89004cd..05e4add 100644
--- a/src/visualisers/ObsPlotting.cc
+++ b/src/visualisers/ObsPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ObsPlotting.cc
\brief Implementation of the Template class ObsPlotting.
diff --git a/src/visualisers/ObsPlotting.h b/src/visualisers/ObsPlotting.h
index afd9a12..d264ce5 100644
--- a/src/visualisers/ObsPlotting.h
+++ b/src/visualisers/ObsPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ObsPlotting.h
\brief Definition of the Template class ObsPlotting.
diff --git a/src/visualisers/ObsTable.cc b/src/visualisers/ObsTable.cc
index afc072b..8d655f3 100644
--- a/src/visualisers/ObsTable.cc
+++ b/src/visualisers/ObsTable.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ObsTable.cc
\brief Implementation of the Template class LocalTable.
diff --git a/src/visualisers/ObsTable.h b/src/visualisers/ObsTable.h
index dca89ae..785f8d0 100644
--- a/src/visualisers/ObsTable.h
+++ b/src/visualisers/ObsTable.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
#ifndef ObsTable_H
#define ObsTable_H
diff --git a/src/visualisers/OriginMarker.h b/src/visualisers/OriginMarker.h
index f2f2dfc..2478c09 100644
--- a/src/visualisers/OriginMarker.h
+++ b/src/visualisers/OriginMarker.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file OriginMarker.h
\brief Definition of the Template class OriginMarker.
diff --git a/src/visualisers/OutLayerTechnique.cc b/src/visualisers/OutLayerTechnique.cc
index 0d3ba09..ee7a97b 100644
--- a/src/visualisers/OutLayerTechnique.cc
+++ b/src/visualisers/OutLayerTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelection.cc
\brief Implementation of the Template class HeightSelection.
diff --git a/src/visualisers/OutLayerTechnique.h b/src/visualisers/OutLayerTechnique.h
index f5e3102..6872980 100644
--- a/src/visualisers/OutLayerTechnique.h
+++ b/src/visualisers/OutLayerTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file HeightSelection.h
\brief Definition of the Template class HeightSelection.
diff --git a/src/visualisers/PolyShadingMethod.cc b/src/visualisers/PolyShadingMethod.cc
index 0f5591a..0323e00 100644
--- a/src/visualisers/PolyShadingMethod.cc
+++ b/src/visualisers/PolyShadingMethod.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PolyShadingMethod.h
\brief Definition of the Template class PolyShadingMethod.
diff --git a/src/visualisers/PolyShadingMethod.h b/src/visualisers/PolyShadingMethod.h
index bb3738b..b2e6968 100644
--- a/src/visualisers/PolyShadingMethod.h
+++ b/src/visualisers/PolyShadingMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PolyShadingMethod.h
\brief Definition of the Template class PolyShadingMethod.
diff --git a/src/visualisers/PolyShadingTechnique.cc b/src/visualisers/PolyShadingTechnique.cc
index 247b8dc..a77999e 100644
--- a/src/visualisers/PolyShadingTechnique.cc
+++ b/src/visualisers/PolyShadingTechnique.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PolyShadingMethod.h
\brief Definition of the Template class PolyShadingMethod.
diff --git a/src/visualisers/PolyShadingTechnique.h b/src/visualisers/PolyShadingTechnique.h
index 4227aab..679cc9d 100644
--- a/src/visualisers/PolyShadingTechnique.h
+++ b/src/visualisers/PolyShadingTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file PolyShadingTechnique.h
\brief Definition of the Template class PolyShadingTechnique.
diff --git a/src/visualisers/ShadingTechnique.h b/src/visualisers/ShadingTechnique.h
index fbd7314..97a18c4 100644
--- a/src/visualisers/ShadingTechnique.h
+++ b/src/visualisers/ShadingTechnique.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ShadingTechnique.h
\brief Definition of the Template class ShadingTechnique.
diff --git a/src/visualisers/SimplePolylineVisualiser.cc b/src/visualisers/SimplePolylineVisualiser.cc
index c04ccb8..8891361 100644
--- a/src/visualisers/SimplePolylineVisualiser.cc
+++ b/src/visualisers/SimplePolylineVisualiser.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file BoxPlotVisualiser.cc
\brief Implementation of the Template class BoxPlotVisualiser.
diff --git a/src/visualisers/SimplePolylineVisualiser.h b/src/visualisers/SimplePolylineVisualiser.h
index 82092e0..4a4b5bb 100644
--- a/src/visualisers/SimplePolylineVisualiser.h
+++ b/src/visualisers/SimplePolylineVisualiser.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SimplePolylineVisualiser.h
\brief Definition of the Template class SimplePolylineVisualiser.
diff --git a/src/visualisers/Streamlines.cc b/src/visualisers/Streamlines.cc
index 55225a6..b4c4639 100644
--- a/src/visualisers/Streamlines.cc
+++ b/src/visualisers/Streamlines.cc
@@ -1,12 +1,22 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+
+
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file WindPlotting.cc
\brief Implementation of the Template class Wind.
diff --git a/src/visualisers/Streamlines.h b/src/visualisers/Streamlines.h
index ec14857..bbd4686 100644
--- a/src/visualisers/Streamlines.h
+++ b/src/visualisers/Streamlines.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Streamlines.h
\brief Definition of the Template class Streamlines.
diff --git a/src/visualisers/SymbolAdvancedTableMode.cc b/src/visualisers/SymbolAdvancedTableMode.cc
index 264a878..949fa7b 100644
--- a/src/visualisers/SymbolAdvancedTableMode.cc
+++ b/src/visualisers/SymbolAdvancedTableMode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SymbolAdvancedTableMode.h
\brief Implementation of the Template class SymbolAdvancedTableMode.
diff --git a/src/visualisers/SymbolAdvancedTableMode.h b/src/visualisers/SymbolAdvancedTableMode.h
index fb884cf..49cf134 100644
--- a/src/visualisers/SymbolAdvancedTableMode.h
+++ b/src/visualisers/SymbolAdvancedTableMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SymbolAdvancedTableMode.cc
\brief Definition of the Template class SymbolAdvancedTableMode.
diff --git a/src/visualisers/SymbolMode.cc b/src/visualisers/SymbolMode.cc
index 65e52ce..fadb41d 100644
--- a/src/visualisers/SymbolMode.cc
+++ b/src/visualisers/SymbolMode.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SymbolMode.cc
\brief Implementation of the Template class SymbolMode.
diff --git a/src/visualisers/SymbolMode.h b/src/visualisers/SymbolMode.h
index 4487df7..d19a9ac 100644
--- a/src/visualisers/SymbolMode.h
+++ b/src/visualisers/SymbolMode.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SymbolMode.h
\brief Definition of the Template class SymbolMode.
@@ -126,10 +134,10 @@ public:
virtual void visit(LegendVisitor&);
- void prepare() { update(); properties();}
+ void prepare() { update(); }
void update();
void properties() const;
- SymbolProperties operator()(double) const { return properties_; }
+ SymbolProperties operator()(double) const { properties(); return properties_; }
void visit(Data&, LegendVisitor&);
protected:
diff --git a/src/visualisers/SymbolPlotting.cc b/src/visualisers/SymbolPlotting.cc
index b893722..3649a15 100644
--- a/src/visualisers/SymbolPlotting.cc
+++ b/src/visualisers/SymbolPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SymbolPlotting.cc
\brief Implementation of the Template class SymbolPlotting.
diff --git a/src/visualisers/SymbolPlotting.h b/src/visualisers/SymbolPlotting.h
index 9768c91..febb1b0 100644
--- a/src/visualisers/SymbolPlotting.h
+++ b/src/visualisers/SymbolPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file SymbolPlotting.h
\brief Definition of the Template class SymbolPlotting.
diff --git a/src/visualisers/TaylorGrid.cc b/src/visualisers/TaylorGrid.cc
index 967e9c6..00a7895 100644
--- a/src/visualisers/TaylorGrid.cc
+++ b/src/visualisers/TaylorGrid.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expres s or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TaylorGrid.cc
\brief Implementation of the Template class TaylorGrid.
diff --git a/src/visualisers/TaylorGrid.h b/src/visualisers/TaylorGrid.h
index ddf5668..3c6d447 100644
--- a/src/visualisers/TaylorGrid.h
+++ b/src/visualisers/TaylorGrid.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TaylorGrid.h
\brief Definition of the Template class TaylorGrid.
diff --git a/src/visualisers/TephiGrid.cc b/src/visualisers/TephiGrid.cc
index 71966cf..02ef583 100644
--- a/src/visualisers/TephiGrid.cc
+++ b/src/visualisers/TephiGrid.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either expres s or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TephiGrid.cc
\brief Implementation of the Template class TephiGrid.
diff --git a/src/visualisers/TephiGrid.h b/src/visualisers/TephiGrid.h
index 2ee711b..db7b1f6 100644
--- a/src/visualisers/TephiGrid.h
+++ b/src/visualisers/TephiGrid.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TephiGrid.h
\brief Definition of the Template class TephiGrid.
diff --git a/src/visualisers/TextOrientation.cc b/src/visualisers/TextOrientation.cc
index 79f3a80..cc3f826 100644
--- a/src/visualisers/TextOrientation.cc
+++ b/src/visualisers/TextOrientation.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TextOrientation.cc
\brief Implementation of the Template class TextOrientation.
diff --git a/src/visualisers/TextOrientation.h b/src/visualisers/TextOrientation.h
index 8f2e9c0..2da7a33 100644
--- a/src/visualisers/TextOrientation.h
+++ b/src/visualisers/TextOrientation.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file TextOrientation.h
\brief Definition of the Template class TextOrientation.
diff --git a/src/visualisers/UserDate.cc b/src/visualisers/UserDate.cc
index ccf6d65..e365298 100644
--- a/src/visualisers/UserDate.cc
+++ b/src/visualisers/UserDate.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file UserDate.cc
\brief Implementation of the Template class UserDate.
diff --git a/src/visualisers/UserDate.h b/src/visualisers/UserDate.h
index 09cdce9..22874db 100644
--- a/src/visualisers/UserDate.h
+++ b/src/visualisers/UserDate.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file UserDate.h
\brief Definition of the Template class UserDate.
diff --git a/src/visualisers/ValuePlot.cc b/src/visualisers/ValuePlot.cc
index 6b32b36..34695e3 100644
--- a/src/visualisers/ValuePlot.cc
+++ b/src/visualisers/ValuePlot.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ValuePlot.cc
\brief Implementation of the Template class ValuePlot.
diff --git a/src/visualisers/ValuePlot.h b/src/visualisers/ValuePlot.h
index 06dd297..8605a4b 100644
--- a/src/visualisers/ValuePlot.h
+++ b/src/visualisers/ValuePlot.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ValuePlot.h
\brief Definition of the Template class ValuePlot.
diff --git a/src/visualisers/ValuePlotBase.h b/src/visualisers/ValuePlotBase.h
index 5336417..dd7e31d 100644
--- a/src/visualisers/ValuePlotBase.h
+++ b/src/visualisers/ValuePlotBase.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ValuePlotBase.h
\brief Definition of the Template class ValuePlotBase.
diff --git a/src/visualisers/ValuePlotMethod.h b/src/visualisers/ValuePlotMethod.h
index 12368e7..8832370 100644
--- a/src/visualisers/ValuePlotMethod.h
+++ b/src/visualisers/ValuePlotMethod.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file ValuePlotMethod.h
\brief Definition of the Template class ValuePlotMethod.
diff --git a/src/visualisers/VisDefInfo.h b/src/visualisers/VisDefInfo.h
index 73f3214..169ae16 100644
--- a/src/visualisers/VisDefInfo.h
+++ b/src/visualisers/VisDefInfo.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file VisDefInfo.h
\brief Definition of class VisDefInfo.
diff --git a/src/visualisers/Wind.cc b/src/visualisers/Wind.cc
index 67fbd35..eb8d85f 100644
--- a/src/visualisers/Wind.cc
+++ b/src/visualisers/Wind.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Wind.cc
\brief Implementation of the Template class Wind.
@@ -89,7 +97,7 @@ void Wind::operator()(Data& data, BasicGraphicsObjectContainer& parent)
return;
- cout << points.size() << "--------------" << endl;
+
(*this->type_).prepare(parent, method->units());
(*this->type_).adjust(points, transformation);
diff --git a/src/visualisers/Wind.h b/src/visualisers/Wind.h
index 51abab2..21d26d8 100644
--- a/src/visualisers/Wind.h
+++ b/src/visualisers/Wind.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file Wind.h
\brief Definition of the Template class Wind.
diff --git a/src/visualisers/WindPlotting.cc b/src/visualisers/WindPlotting.cc
index fd09f85..47d83a0 100644
--- a/src/visualisers/WindPlotting.cc
+++ b/src/visualisers/WindPlotting.cc
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file WindPlotting.cc
\brief Implementation of the Template class Wind.
diff --git a/src/visualisers/WindPlotting.h b/src/visualisers/WindPlotting.h
index 234a20a..45294a2 100644
--- a/src/visualisers/WindPlotting.h
+++ b/src/visualisers/WindPlotting.h
@@ -1,12 +1,20 @@
-/*
- * (C) Copyright 1996-2016 ECMWF.
- *
- * This software is licensed under the terms of the Apache Licence Version 2.0
- * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
- * In applying this licence, ECMWF does not waive the privileges and immunities
- * granted to it by virtue of its status as an intergovernmental organisation nor
- * does it submit to any jurisdiction.
- */
+/******************************** LICENSE ********************************
+
+ Copyright 2007 European Centre for Medium-Range Weather Forecasts (ECMWF)
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ******************************** LICENSE ********************************/
/*! \file WindPlotting.h
\brief Definition of the Template class WindPlotting.
--
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