Merge branch 'release/jakarta' into build/jakarta/2017.334

Author: gempa-jabe

CHANGELOG.md

@@ -1,12 +1,37 @@
 # Jakarta
 
+## Release 2017.334 patch2
+
+```SC_API_VERSION 11.1.0```
+
+* doc
+
+  * Add amplitude units expected by each magnitude implementation to glossary
+  * Add to data model API documentation for Origin::latitude and Origin::longitude
+    that uncertainties are given in kilometers
+
+* trunk
+
+  * Fix memory leak and type mapping of QuakeML exporter used with sccnv
+  * Ship xsd and xsl files in ```share/xml```
+
+* scwfparam
+
+  * Add Rupture::strike attribute to strong motion data model extension
+
+* GUI
+
+  * Add StandardLegend class to create map legends in an easy way
+  * Add support for map legend descriptions in map layer configuration 
+
 ## Release 2017.334 patch1
 
 * trunk
 
   * Fix crash in FDSNWS recordstream if server cannot be reached
   * Updated sc3ml_0.10.xsd
   * Use correct name in connection info for Python scripts
+  * Fix SQL character escape bug for strings starting with a single quote
 
 * scamp
 

doc/base/api-python.rst

@@ -9116,7 +9116,8 @@ Reference
 
       Hypocenter longitude, with respect to the World Geodetic System 1984
       \(WGS84\) reference system
-      \(National Imagery and Mapping Agency 2000\) in degrees.
+      \(National Imagery and Mapping Agency 2000\) in degrees. The uncertainties
+      are given in kilometers.
 
    .. py:method:: latitude()
 
@@ -9127,6 +9128,7 @@ Reference
       :param longitude: :ref:`RealQuantity <api-python-datamodel-realquantity>`
 
       Hypocenter latitude, with respect to the WGS84 reference system in degrees.
+      The uncertainties are given in kilometers.
 
    .. py:method:: longitude()
 

doc/base/glossary.rst

@@ -330,6 +330,8 @@ is taken from Modern Global Seismology.
       In SeisComP3 a modified local magnitude Mlv is determined by simulation of a Wood-Anderson instrument and then measuring
       the amplitude in a 150 s time window on the vertical component of station with distances smaller than 8°.
 
+      The amplitude unit in SeisComP3 is **millimeter** (mm).
+
    magnitude, body-wave (mb)
       Magnitude developed for teleseismic body waves. mb is defined on the amplitude of the first few cycles of the P-wave,
       typically a time window of 20 s - 30 s. Only the first few cycles are used to minimize the effects of radiation pattern
@@ -352,6 +354,8 @@ is taken from Modern Global Seismology.
       In SeisComP3 mb is determined by simulation of a WWSSN short-period seismometer and then measuring the amplitudes in
       a 30 s time window at stations in the distance range of 5° to 105°.
 
+      The amplitude unit in SeisComP3 is **nanometer** (nm).
+
    magnitude, broadband body-wave (mB)   
       mB is a magnitude based on body waves like mb, but the amplitude is measured in a broad
       frequency range and longer time windows. Instead of amplitude measurements on displacement
@@ -370,7 +374,9 @@ is taken from Modern Global Seismology.
 
          l = min(11.5 \Delta, 60)
 
-   magnitude, surface wave (Ms)   
+      The amplitude unit in SeisComP3 is **nanometer per second** (nm/s).
+
+   magnitude, surface wave (Ms)
       Ms is a magnitude scale based on teleseismic surface waves. Ms is based on measurements of
       the maximum horizontal true ground motion displacement amplitudes
 
@@ -391,6 +397,8 @@ is taken from Modern Global Seismology.
       allow a broader spectrum of dominant periods. This formula is valid for distances of
       2° to 160° and source depth smaller than 50 km.
 
+      The amplitude unit in SeisComP3 is **meter per second** (m/s).
+
    magnitude, JMA (M_JMA)   
       M(JMA) is a magnitude similar to the Ms, but the formula is calibrated for instruments
       with 5 s period at local distances. The data set for the calibration was gained by the
@@ -403,6 +411,8 @@ is taken from Modern Global Seismology.
       This equation is valid for local (< 2000 km) and shallow (< 80 km) earthquakes. For
       deeper earthquakes additional correction functions have to be applied (Katsumata, 1996).
 
+      The amplitude unit in SeisComP3 is **micrometer** (um).
+
    magnitude, moment (Mw)   
       The moment magnitude is a magnitude scale related to the seismic moment M\ :sub:`0` and
       thus to the released seismic energy.
@@ -423,6 +433,8 @@ is taken from Modern Global Seismology.
       of multiple records results in an estimation of the moment magnitude without correction
       for the source mechanism (Tsuboi et al., 1995).
 
+      The amplitude unit in SeisComP3 is **nanometer times second** (nm*s).
+
    mainshock   
       The largest earthquake in a sequence, sometimes preceded by one or more foreshocks, 
       and almost always followed by many aftershocks.

src/gui-qt4/libs/seiscomp3/gui/core/scheme.cpp

@@ -326,8 +326,8 @@ Scheme::Colors::Map::Map() :
 // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Scheme::Colors::Legend::Legend() :
 	background(255, 255, 255, 224),
-	border(0, 0, 0),
-	text(0, 0, 0),
+	border(160, 160, 160),
+	text(64, 64, 64),
 	headerText(0, 0, 0)
 {}
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<

src/gui-qt4/libs/seiscomp3/gui/map/CMakeLists.txt

@@ -1,6 +1,7 @@
 SET(GUI_MAP_SOURCES
 	layer.cpp
 	legend.cpp
+	standardlegend.cpp
 	mapsymbol.cpp
 	mapsymbolcollection.cpp
 	maptree.cpp
@@ -26,6 +27,7 @@ SET(GUI_MAP_HEADERS
 
 SET(GUI_MAP_MOC_HEADERS
 	legend.h
+	standardlegend.h
 	layer.h
 	imagetree.h
 	canvas.h

src/gui-qt4/libs/seiscomp3/gui/map/canvas.cpp

@@ -407,10 +407,10 @@ void Canvas::init() {
 		connect(_maptree.get(), SIGNAL(tilesUpdated()), this, SLOT(updatedTiles()));
 	}
 
-	_citiesLayer._canvas = this;
+	setupLayer(&_citiesLayer);
 	_citiesLayer.setVisible(SCScheme.map.showCities);
 
-	_gridLayer._canvas = this;
+	setupLayer(&_gridLayer);
 	_gridLayer.setGridDistance(QPointF(15.0, 15.0));
 	_gridLayer.setVisible(SCScheme.map.showGrid);
 
@@ -1415,6 +1415,7 @@ void Canvas::drawLegends(QPainter& painter) {
 			painter.setBrush(SCScheme.colors.legend.background);
 			painter.drawRect(contentRect);
 
+			painter.setPen(SCScheme.colors.legend.text);
 			legend->draw(contentRect, painter);
 		}
 		else {

src/gui-qt4/libs/seiscomp3/gui/map/canvas.h

@@ -49,6 +49,11 @@ DEFINE_SMARTPOINTER(TextureCache);
 struct SC_GUI_API LayerProperties {
 	const LayerProperties *parent;
 	std::string            name;
+	std::string            title;
+	Qt::Orientation        orientation;
+	Qt::Alignment          legendArea;
+	std::string            label;
+	int                    index;
 	bool                   visible;
 	QPen                   pen;
 	QBrush                 brush;
@@ -60,14 +65,16 @@ struct SC_GUI_API LayerProperties {
 	bool                   filled;
 
 	LayerProperties(const std::string &name)
-	: parent(NULL), name(name)
-	, visible(true), drawName(false)
+	: parent(NULL), name(name), orientation(Qt::Vertical)
+	, legendArea(Qt::AlignTop | Qt::AlignLeft)
+	, index(0), visible(true), drawName(false)
 	, debug(false), rank(-1), roughness(3)
 	, filled(false) {}
 
-	LayerProperties(const std::string &name, const LayerProperties* parent)
-	: parent(parent), name(name)
-	, visible(parent->visible), pen(parent->pen)
+	LayerProperties(const std::string &name, const LayerProperties *parent)
+	: parent(parent), name(name), orientation(Qt::Vertical)
+	, legendArea(Qt::AlignTop | Qt::AlignLeft)
+	, index(0), visible(parent->visible), pen(parent->pen)
 	, brush(parent->brush), font(parent->font)
 	, drawName(parent->drawName), debug(parent->debug)
 	, rank(-1), roughness(parent->roughness)

src/gui-qt4/libs/seiscomp3/gui/map/layers/citieslayer.cpp

@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) by GFZ Potsdam                                          *
+ *   Copyright (C) by GFZ Potsdam, gempa GmbH                              *
  *                                                                         *
  *   You can redistribute and/or modify this program under the             *
  *   terms of the SeisComP Public License.                                 *
@@ -10,23 +10,57 @@
  *   SeisComP Public License for more details.                             *
  ***************************************************************************/
 
+
 #include <seiscomp3/gui/map/layers/citieslayer.h>
 
 #include <seiscomp3/gui/core/application.h>
 #include <seiscomp3/gui/map/canvas.h>
 #include <seiscomp3/gui/map/projection.h>
+#include <seiscomp3/gui/map/standardlegend.h>
+
 
 namespace Seiscomp {
 namespace Gui {
 namespace Map {
 
+#define CITY_NORMAL_SYMBOL_SIZE 4
+#define CITY_BIG_SYMBOL_SIZE    6
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+
+
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 CitiesLayer::CitiesLayer(QObject* parent) : Layer(parent), _selectedCity(NULL) {
 	setName("cities");
-}
 
-CitiesLayer::~CitiesLayer() {
+	StandardLegend *legend = new StandardLegend(this);
+	legend->setTitle(tr("Cities"));
+	legend->setArea(Qt::Alignment(Qt::AlignTop | Qt::AlignRight));
+	legend->addItem(new StandardLegendItem(SCScheme.colors.map.cityOutlines,
+	                                       SCScheme.colors.map.cityNormal, tr("1Mio- inhabitants"),
+	                                       CITY_NORMAL_SYMBOL_SIZE));
+	legend->addItem(new StandardLegendItem(SCScheme.colors.map.cityOutlines,
+	                                       SCScheme.colors.map.cityNormal, tr("1Mio+ inhabitants"),
+	                                       CITY_BIG_SYMBOL_SIZE));
+	legend->addItem(new StandardLegendItem(SCScheme.colors.map.cityOutlines,
+	                                       SCScheme.colors.map.cityCapital, tr("Capital"),
+	                                       CITY_BIG_SYMBOL_SIZE));
+	addLegend(legend);
 }
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+
+
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+CitiesLayer::~CitiesLayer() {}
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
 
+
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 void CitiesLayer::draw(const Seiscomp::Gui::Map::Canvas* canvas,
                        QPainter& painter) {
 	if ( !isVisible() ) return;
@@ -71,7 +105,12 @@ void CitiesLayer::draw(const Seiscomp::Gui::Map::Canvas* canvas,
 
 	painter.restore();
 }
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+
 
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 void CitiesLayer::drawCity(QPainter& painter, Grid &grid, QFont &font,
                            bool &lastUnderline, bool &lastBold,
                            const Projection* projection,
@@ -165,15 +204,30 @@ void CitiesLayer::drawCity(QPainter& painter, Grid &grid, QFont &font,
 	painter.drawText(labelRect, Qt::AlignLeft | Qt::AlignTop |
 	                 Qt::TextSingleLine, city.name().c_str());
 }
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+
 
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 void CitiesLayer::setSelectedCity(const Math::Geo::CityD* c) {
 	_selectedCity = c;
 }
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
+
+
+
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 const Math::Geo::CityD* CitiesLayer::selectedCity() const {
 	return _selectedCity;
 }
+// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+
+
 
+// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 } // namespace Map
 } // namespce Gui
 } // namespace Seiscomp

src/gui-qt4/libs/seiscomp3/gui/map/layers/citieslayer.h

@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) by GFZ Potsdam                                          *
+ *   Copyright (C) by GFZ Potsdam, gempa GmbH                              *
  *                                                                         *
  *   You can redistribute and/or modify this program under the             *
  *   terms of the SeisComP Public License.                                 *