Commit 4f750cbe authored by SVN-Git Migration's avatar SVN-Git Migration

Imported Upstream version 1.21.1

parent 0992c2c5
Changes in 1.21.1
* Add swap option on keys, swapping symbol and text
Bug fixes
* Fix missing labels if colorbar out of plot
* Preserve tags when reloading datasets
* Handle nan/inf/-inf when as value in UI
* Remove dependence on pyqtconfig in build system
* Handle errors properly in 2D CSV read
* Do not crash if selecting siblings of document widget
* Fix accidental modification of data by line widget
* Improve PDF bounding box rounding to prevent chopping near edge
* Fix function plotter in embedding
* Fix astropy version checking
* Fix crash for error bar in CSV with blank previous column
Changes in 1.21:
* Add HDF5 saved document format
* Add filled curve error bar style
* Add fill left/right options for point plotter
* Add filetype filters to import dialog file browser dialog
* In file completer in import dialog, use selected tab as filter
* Move code to use PyQt new style signals
* Add a master color setting for xy point and nonorthpoint plot
* Line labelling algorithm much improved in contour plots, which
rotates text to match line angle and avoids label overlaps
* More accurate axis tick label bounding boxes, allowing rotated
labels to be placed close together
* Add reflection and rotation options to vector field widget
* Switch to scientific notation earlier when showing float settings
Bug fixes:
* Direction combo did not work in import dialog
* Saving text datasets did not work in Python3
* Fix partial dataset evaluation issue when loading documents
* 2D non-regular pixel spaced images give error if clipped in y
* Handle Unicode quoted characters in simple text data files
* xcent/ycent in Dataset2D import plugins were ignored
* promote_tab broken for import plugins
* Full screen view when all pages are deleted
* Crash with empty dataset and boxplot widget
* Fix copy and paste of datasets
* Python 3 resizing axis bug
* Crash if picking/zooming on document with no pages
* Crash if reediting histogram dataset with blank output entry
* Use end of text formatting string beyond format specifier
* When writing SVG text as text, use xml:space="preserve" to
avoid missing whitespace
* Embedding socket issue on Python 3.4+
Changes in 1.20.1:
* Include free-desktop appdata, MIME and desktop files
* When plotting xy widget filled error regions, plot line on top
......
......@@ -53,7 +53,7 @@ def processSetting(parent, setn):
for choice in setn.vallist:
ET.SubElement(setnxml, "choice").text = choice
if not isinstance(setn.default, setting.Reference):
if not isinstance(setn.default, setting.ReferenceBase):
ET.SubElement(setnxml, "default").text = setn.toText()
else:
ET.SubElement(setnxml, "default").text = "to reference"
......
Metadata-Version: 1.1
Name: veusz
Version: 1.20.1
Version: 1.21.1
Summary: A scientific plotting package
Home-page: http://home.gna.org/veusz/
Author: Jeremy Sanders
......
Veusz 1.20.1
Veusz 1.21.1
------------
http://home.gna.org/veusz/
......@@ -12,38 +12,21 @@ SAMP interfaces to its plotting facilities. It also allows for
manipulation and editing of datasets. Data can be captured from
external sources such as Internet sockets or other programs.
Changes in 1.20.1:
* Include free-desktop appdata, MIME and desktop files
* When plotting xy widget filled error regions, plot line on top
Bug fixes:
* Fix embedding interface startup problem in 1.20
* Additional embedding interface fixes for Python 3
* Fix crash in tutorial if flashing widget deleted
* Fix polar plot crash with reverse minumum and maximum radii
* Fix crash when changing range of broken axes interactively
* Fix object deletion crash in setting menu
* Check output dataset is not same as an input for histograms
* Fix for compilation on Qt 4.6
* Catch socket errors on embed client
* Fixes for formatting strings, including fixes for arguments of
the extended %Vg format and properly supporting %%
* When restoring window position, do not restore offscreen
Changes in 1.20:
* Add HDF5 file data import
* Allow expressions to be edited for linked 2D datasets
* Add support for 2D datasets with irregular gridpoints
* Add 2D data CSV import
* Allow safe renaming of linked datasets
* Support importing text from FITS files
Bug fixes:
* When capturing data from a file/named pipe, do not stop when no
more data are available
* Fixes mangling of text in saved files using Windows binary
* Fix encoding for standard file import
* Fix FITS import for python3
Changes in 1.21.1
* Add swap option on keys, swapping symbol and text
Bug fixes
* Fix missing labels if colorbar out of plot
* Preserve tags when reloading datasets
* Handle nan/inf/-inf when as value in UI
* Remove dependence on pyqtconfig in build system
* Handle errors properly in 2D CSV read
* Do not crash if selecting siblings of document widget
* Fix accidental modification of data by line widget
* Improve PDF bounding box rounding to prevent chopping near edge
* Fix function plotter in embedding
* Fix astropy version checking
* Fix crash for error bar in CSV with blank previous column
Features of package:
Plotting features:
......
# Veusz saved document (version 1.20.99)
# Saved at 2014-04-27T12:24:58.888827
SetData2DXYFunc(u'foo', (0.0, 10.0, 0.1), (0.0, 10.0, 0.1), u'(sin(x)+2)*(cos(y+x)+2)', linked=True)
Set('StyleSheet/Font/font', u'Liberation Serif')
Add('page', name='page1', autoadd=False)
To('page1')
Add('graph', name='graph1', autoadd=False)
To('graph1')
Set('leftMargin', u'1cm')
Set('bottomMargin', u'1cm')
Add('axis', name='x', autoadd=False)
To('x')
Set('autoRange', u'exact')
Set('TickLabels/format', u'%Vg \\emph{a}')
Set('MajorTicks/number', 10)
To('..')
Add('axis', name='y', autoadd=False)
To('y')
Set('autoRange', u'exact')
Set('direction', 'vertical')
Set('TickLabels/format', u'%Vg \\emph{b}')
Set('MajorTicks/number', 10)
To('..')
Add('contour', name='contour1', autoadd=False)
To('contour1')
Set('data', u'foo')
Set('numLevels', 10)
Set('ContourLabels/hide', False)
Set('Lines/lines', [('solid', '1pt', u'#5500ff', False), ('dotted', '1pt', u'#aa557f', False)])
To('..')
To('..')
To('..')
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.48.4 r9939"
version="1.0"
sodipodi:docname="error_curvefill.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
gridtolerance="10000"
guidetolerance="10"
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="29.125"
inkscape:cx="1.888412"
inkscape:cy="7.8848124"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="965"
inkscape:window-x="-2"
inkscape:window-y="-3"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:creator>
<cc:Agent>
<dc:title>Jeremy Sanders</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>Copyright (C) Jeremy Sanders</dc:title>
</cc:Agent>
</dc:rights>
<dc:publisher>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:publisher>
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<path
sodipodi:type="arc"
style="fill:#afedc2;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3504"
sodipodi:cx="8.7210302"
sodipodi:cy="8.6866951"
sodipodi:rx="6.1459227"
sodipodi:ry="6.7296138"
d="M 14.866953,8.6866951 A 6.1459227,6.7296138 0 1 1 2.5751076,8.6866951 A 6.1459227,6.7296138 0 1 1 14.866953,8.6866951 z"
transform="matrix(1.083345,-5.8214431e-2,5.4005331e-2,1.0275867,-1.9513475,-0.5044807)" />
<path
sodipodi:type="arc"
style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path3231"
sodipodi:cx="7.9141631"
sodipodi:cy="7.6394849"
sodipodi:rx="0.8755365"
sodipodi:ry="0.84120172"
d="M 8.7896996,7.6394849 A 0.8755365,0.84120172 0 1 1 7.0386266,7.6394849 A 0.8755365,0.84120172 0 1 1 8.7896996,7.6394849 z"
transform="matrix(0.9789257,0,0,1.0187806,0.149618,0.3200453)" />
</g>
</svg>
......@@ -10,7 +10,37 @@ from distutils.dep_util import newer, newer_group
import os
import sys
import PyQt4.pyqtconfig
import sip
sip.setapi('QString', 2)
import sipconfig
import PyQt4.QtCore
##################################################################
# try to get various useful things we need in order to build
# this is likely to break, I'm sure
QT_LIB_DIR = PyQt4.QtCore.QLibraryInfo.location(
PyQt4.QtCore.QLibraryInfo.LibrariesPath)
QT_INC_DIR = PyQt4.QtCore.QLibraryInfo.location(
PyQt4.QtCore.QLibraryInfo.HeadersPath)
QT_IS_FRAMEWORK = os.path.exists(
os.path.join(QT_LIB_DIR, 'QtCore.framework') )
try:
# >= 4.10
SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags']
except:
import PyQt4.pyqtconfig
SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
PYQT_SIP_DIR = os.path.join(
sipconfig.Configuration().default_sip_dir, 'PyQt4')
SIP_BIN = sipconfig.Configuration().sip_bin
SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
##################################################################
def replace_suffix(path, new_suffix):
return os.path.splitext(path)[0] + new_suffix
......@@ -35,43 +65,34 @@ class build_ext (distutils.command.build_ext.build_ext):
raise RuntimeError('cannot parse SIP-generated "%s"' % sbf)
def _find_sip(self):
cfg = PyQt4.pyqtconfig.Configuration()
return cfg.sip_bin
def _sip_inc_dir(self):
cfg = PyQt4.pyqtconfig.Configuration()
return cfg.sip_inc_dir
def get_includes(self):
def get_includes(self, cfg):
incdirs = []
for mod in ('QtCore', 'QtGui', 'QtXml'):
if cfg.qt_framework:
incdirs.append( os.path.join(cfg.qt_lib_dir,
mod + '.framework', 'Headers') )
if QT_IS_FRAMEWORK:
incdirs.append(
os.path.join(QT_LIB_DIR, mod + '.framework', 'Headers') )
else:
incdirs.append( os.path.join(cfg.qt_inc_dir, mod) )
incdirs.append( os.path.join(QT_INC_DIR, mod) )
return incdirs
def swig_sources (self, sources, extension=None):
if not self.extensions:
return
cfg = PyQt4.pyqtconfig.Configuration()
# add directory of input files as include path
indirs = list(set([os.path.dirname(x) for x in sources]))
# Add the SIP and Qt include directories to the include path
extension.include_dirs += [
cfg.sip_inc_dir,
cfg.qt_inc_dir,
] + self.get_includes(cfg) + indirs
SIP_INC_DIR,
QT_INC_DIR,
] + self.get_includes() + indirs
# link against libraries
if cfg.qt_framework:
if QT_IS_FRAMEWORK:
extension.extra_link_args = [
'-F', os.path.join(cfg.qt_lib_dir),
'-F', os.path.join(QT_LIB_DIR),
'-framework', 'QtGui',
'-framework', 'QtCore',
'-framework', 'QtXml'
......@@ -80,7 +101,7 @@ class build_ext (distutils.command.build_ext.build_ext):
extension.libraries = ['QtGui4', 'QtCore4', 'QtXml4']
else:
extension.libraries = ['QtGui', 'QtCore', 'QtXml']
extension.library_dirs = [cfg.qt_lib_dir]
extension.library_dirs = [QT_LIB_DIR]
depends = extension.depends
......@@ -101,25 +122,22 @@ class build_ext (distutils.command.build_ext.build_ext):
if not source.endswith('.sip')]
generated_sources = []
sip_bin = self._find_sip()
for sip in sip_sources:
# Use the sbf file as dependency check
sipbasename = os.path.basename(sip)
sbf = os.path.join(self.build_temp,
replace_suffix(sipbasename, '.sbf'))
if newer_group([sip]+depends, sbf) or self.force:
self._sip_compile(sip_bin, sip, sbf)
self._sip_compile(sip, sbf)
out = self._get_sip_output_list(sbf)
generated_sources.extend(out)
return generated_sources + other_sources
def _sip_compile(self, sip_bin, source, sbf):
cfg = PyQt4.pyqtconfig.Configuration()
self.spawn([sip_bin,
def _sip_compile(self, source, sbf):
self.spawn([SIP_BIN,
'-c', self.build_temp,
] + cfg.pyqt_sip_flags.split() + [
'-I', cfg.pyqt_sip_dir,
] + SIP_FLAGS.split() + [
'-I', PYQT_SIP_DIR,
'-b', sbf,
source])
......@@ -3,9 +3,9 @@ Encoding=UTF-8
Name=Veusz
GenericName=Scientific plotting
Comment=Scientific plotting and graphing package
MimeType=application/x-veusz
MimeType=application/x-veusz;
Exec=veusz %F
Icon=veusz
Terminal=false
Type=Application
Categories=Graphics;
Categories=DataVisualization;Science;
......@@ -4,6 +4,7 @@
<mime-type type="application/x-veusz">
<comment>Veusz saved document</comment>
<glob pattern="*.vsz"/>
<glob pattern="*.vszh5"/>
<magic priority="50">
<match type="string" value="# Veusz saved document" offset="0"/>
</magic>
......
......@@ -22,31 +22,32 @@
<g clip-path="url(#c1)">
<g fill="none" stroke-width="1.2">
<polyline fill="none" points="269.1,282.3 249.1,262.3 233.4,215.9 249.1,169.5 269.1,149.5 315.5,133.9 361.9,149.5 381.9,169.5 397.5,215.9 381.9,262.3 361.9,282.3 315.5,298 269.1,282.3"/>
<polyline fill="none" points="269.1,373.2 230,355.2 222.6,351 180.4,308.7 176.2,301.4 158.2,262.3 151.4,215.9 158.2,169.5 176.2,130.4 180.4,123.1 222.6,80.8 230,76.7 269.1,58.6 315.5,51.8 361.9,58.6 401,76.7 408.3,80.8 450.6,123.1 454.7,130.4 472.8,169.5 479.6,215.9 472.8,262.3 454.7,301.4 450.6,308.7 408.3,351 401,355.2 361.9,373.2 315.5,380 269.1,373.2"/>
<polyline fill="none" points="269.1,373.2 230,355.2 222.6,351 180.4,308.7 176.2,301.4 158.2,262.3 151.4,215.9 158.2,169.5 176.2,130.5 180.4,123.1 222.6,80.9 230,76.7 269.1,58.6 315.5,51.8 361.9,58.6 400.9,76.7 408.3,80.9 450.5,123.1 454.7,130.5 472.8,169.5 479.6,215.9 472.8,262.3 454.7,301.4 450.5,308.7 408.3,351 400.9,355.2 361.9,373.2 315.5,380 269.1,373.2"/>
<polyline fill="none" points="235.9,448 222.6,443.8 176.2,418.5 154.8,401.6 129.8,376.6 112.9,355.2 87.6,308.7 83.4,295.5"/>
<polyline fill="none" points="395,448 408.3,443.8 454.7,418.5 476.2,401.6 501.2,376.6"/>
<polyline fill="none" points="83.4,136.4 87.6,123.1 112.9,76.7 129.8,55.2 154.8,30.2"/>
<polyline fill="none" points="83.4,136.3 87.6,123.1 112.9,76.7 129.8,55.2 154.8,30.2"/>
<polyline fill="none" points="501.2,55.2 476.2,30.2"/>
</g>
<g fill="none" stroke-dasharray="0.1,2.5" stroke-width="1.2">
<polyline fill="none" points="315.5,232.3 299.1,215.9 315.5,199.5 331.9,215.9 315.5,232.3"/>
<polyline fill="none" points="315.5,248.7 282.7,215.9 315.5,183.1 348.3,215.9 315.5,248.7"/>
<polyline fill="none" points="315.5,265.1 308.7,262.3 269.1,222.7 266.2,215.9 269.1,209.1 308.7,169.5 315.5,166.7 322.3,169.5 361.9,209.1 364.7,215.9 361.9,222.7 322.3,262.3 315.5,265.1"/>
<polyline fill="none" points="269.1,262.3 249.8,215.9 269.1,169.5 315.5,150.3 361.9,169.5 381.1,215.9 361.9,262.3 315.5,281.6 269.1,262.3"/>
<polyline fill="none" points="315.5,314.4 291.6,308.7 269.1,302.3 229.1,262.3 222.6,239.8 217,215.9 222.6,192.1 229.1,169.5 269.1,129.6 291.6,123.1 315.5,117.4 339.3,123.1 361.9,129.6 401.8,169.5 408.3,192.1 413.9,215.9 408.3,239.8 401.8,262.3 361.9,302.3 339.3,308.7 315.5,314.4"/>
<polyline fill="none" points="269.1,320.7 250.4,308.7 222.6,281 210.7,262.3 200.6,215.9 210.7,169.5 222.6,150.8 250.4,123.1 269.1,111.1 315.5,101 361.9,111.1 380.6,123.1 408.3,150.8 420.3,169.5 430.4,215.9 420.3,262.3 408.3,281 380.6,308.7 361.9,320.7 315.5,330.8 269.1,320.7"/>
<polyline fill="none" points="222.6,308.7 193,262.3 184.2,215.9 193,169.5 222.6,123.1 269.1,93.4 315.5,84.6 361.9,93.4 408.3,123.1 438,169.5 446.8,215.9 438,262.3 408.3,308.7 361.9,338.4 315.5,347.2 269.1,338.4 222.6,308.7"/>
<polyline fill="none" points="269.1,262.3 269.1,262.3 249.8,215.9 269.1,169.5 269.1,169.5 315.5,150.3 361.9,169.5 361.9,169.5 381.1,215.9 361.9,262.3 361.9,262.3 315.5,281.6 269.1,262.3"/>
<polyline fill="none" points="315.5,314.4 291.6,308.7 269.1,302.3 229.1,262.3 222.6,239.8 217,215.9 222.6,192.1 229.1,169.5 269.1,129.6 291.6,123.1 315.5,117.5 339.3,123.1 361.9,129.6 401.8,169.5 408.3,192.1 413.9,215.9 408.3,239.8 401.8,262.3 361.9,302.3 339.3,308.7 315.5,314.4"/>
<polyline fill="none" points="269.1,320.7 250.3,308.7 222.6,281.1 210.7,262.3 200.6,215.9 210.7,169.5 222.6,150.8 250.3,123.1 269.1,111.1 315.5,101 361.9,111.1 380.6,123.1 408.3,150.8 420.3,169.5 430.4,215.9 420.3,262.3 408.3,281.1 380.6,308.7 361.9,320.7 315.5,330.8 269.1,320.7"/>
<polyline fill="none" points="222.6,308.8 222.6,308.7 193,262.3 184.2,215.9 193,169.5 222.6,123.1 222.6,123.1 269.1,93.4 315.5,84.6 361.9,93.4 408.3,123.1 408.3,123.1 438,169.5 446.8,215.9 438,262.3 408.3,308.7 408.3,308.8 361.9,338.4 315.5,347.2 269.1,338.4 222.6,308.8"/>
<polyline fill="none" points="269.1,356.1 267,355.2 222.6,329.9 201.5,308.7 176.2,264.4 175.3,262.3 167.8,215.9 175.3,169.5 176.2,167.4 201.5,123.1 222.6,102 267,76.7 269.1,75.7 315.5,68.2 361.9,75.7 364,76.7 408.3,102 429.4,123.1 454.7,167.4 455.7,169.5 463.2,215.9 455.7,262.3 454.7,264.4 429.4,308.7 408.3,329.9 364,355.2 361.9,356.1 315.5,363.6 269.1,356.1"/>
<polyline fill="none" points="222.6,370.4 202,355.2 176.2,329.4 161,308.7 141.1,262.3 135,215.9 141.1,169.5 161,123.1 176.2,102.4 202,76.7 222.6,61.5 269.1,41.6 315.5,35.4 361.9,41.6 408.3,61.5 429,76.7 454.7,102.4 469.9,123.1 489.8,169.5 496,215.9 489.8,262.3 469.9,308.7 454.7,329.4 429,355.2 408.3,370.4 361.9,390.3 315.5,396.4 269.1,390.3 222.6,370.4"/>
<polyline fill="none" points="501.2,278.2 488.9,308.7 454.7,355.2 408.3,389.3 377.8,401.6 361.9,407.3 315.5,412.8 269.1,407.3 253.2,401.6 222.6,389.3 176.2,355.2 142.1,308.7 129.8,278.2 124.1,262.3 118.5,215.9 124.1,169.5 129.8,153.6 142.1,123.1 176.2,76.7 222.6,42.5 253.2,30.2"/>
<polyline fill="none" points="501.2,153.6 488.9,123.1 454.7,76.7 408.3,42.5 377.8,30.2"/>
<polyline fill="none" points="222.6,370.3 202,355.2 176.2,329.4 161.1,308.7 141.1,262.3 135,215.9 141.1,169.5 161.1,123.1 176.2,102.5 202,76.7 222.6,61.5 269.1,41.5 315.5,35.4 361.9,41.5 408.3,61.5 428.9,76.7 454.7,102.5 469.9,123.1 489.9,169.5 496,215.9 489.9,262.3 469.9,308.7 454.7,329.4 428.9,355.2 408.3,370.3 361.9,390.3 315.5,396.4 269.1,390.3 222.6,370.3"/>
<polyline fill="none" points="501.2,278.2 488.9,308.7 454.7,355.1 454.7,355.2 408.3,389.3 377.8,401.6 361.9,407.3 315.5,412.8 269.1,407.3 253.2,401.6 222.6,389.3 176.3,355.2 176.2,355.1 142.1,308.7 129.8,278.2 124.1,262.3 118.6,215.9 124.1,169.5 129.8,153.6 142.1,123.1 176.2,76.7 176.3,76.7 222.6,42.5 253.2,30.2"/>
<polyline fill="none" points="501.2,153.6 488.9,123.1 454.7,76.7 454.7,76.7 408.3,42.5 377.8,30.2"/>
<polyline fill="none" points="501.2,319.7 476.4,355.2 454.7,376.8 419.2,401.6 408.3,407.9 361.9,424.1 315.5,429.3 269.1,424.1 222.6,407.9 211.7,401.6 176.2,376.8 154.6,355.2 129.8,319.7 123.5,308.7 107.3,262.3 102.1,215.9 107.3,169.5 123.5,123.1 129.8,112.2 154.6,76.7 176.2,55 211.7,30.2"/>
<polyline fill="none" points="501.2,112.2 476.4,76.7 454.7,55 419.2,30.2"/>
<polyline fill="none" points="501.2,350.7 498.1,355.2 454.7,398.5 450.3,401.6 408.3,425.9 361.9,440.9 315.5,445.7 269.1,440.9 222.6,425.9 180.6,401.6 176.2,398.5 132.9,355.2 129.8,350.7 105.5,308.7 90.5,262.3 85.7,215.9 90.5,169.5 105.5,123.1 129.8,81.1 132.9,76.7 176.2,33.3 180.6,30.2"/>
<polyline fill="none" points="501.2,350.7 498.1,355.2 454.7,398.5 450.3,401.6 408.3,425.9 361.9,440.9 315.5,445.7 269.1,440.9 222.6,425.9 180.7,401.6 176.2,398.5 132.9,355.2 129.8,350.7 105.5,308.7 90.5,262.3 85.7,215.9 90.5,169.5 105.5,123.1 129.8,81.1 132.9,76.7 176.2,33.3 180.7,30.2"/>
<polyline fill="none" points="501.2,81.1 498.1,76.7 454.7,33.3 450.3,30.2"/>
<polyline fill="none" points="194.4,448 176.2,438.3 129.8,401.6 93.1,355.2 83.4,337"/>
<polyline fill="none" points="436.6,448 454.7,438.3 501.2,401.6"/>
<polyline fill="none" points="83.4,94.8 93.1,76.7 129.8,30.2"/>
<polyline fill="none" points="194.4,448 176.2,438.3 129.8,401.6 129.8,401.6 93.1,355.2 83.4,337"/>
<polyline fill="none" points="436.6,448 454.7,438.3 501.1,401.6 501.2,401.6"/>
<polyline fill="none" points="83.4,94.8 93.1,76.7 129.8,30.3 129.8,30.2"/>
<polyline fill="none" points="501.2,30.3 501.1,30.2"/>
<polyline fill="none" points="161.7,448 129.8,423.6 107.8,401.6 83.4,369.7"/>
<polyline fill="none" points="469.3,448 501.2,423.6"/>
<polyline fill="none" points="83.4,62.1 107.8,30.2"/>
......
This diff is collapsed.
......@@ -46,7 +46,7 @@
<g fill="#d9ffe5" stroke="none" stroke-width="1">
<path d="m286.5,276.8l76.7,-187l76.7,74.8l76.7,89.7l0,134.6l-460.4,0l0,-74.8l76.7,-74.8l76.7,52.3"/>
</g>
<g fill="none" stroke="#005500" stroke-linecap="butt" stroke-width="0.6">
<g fill="none" stroke-linecap="butt" stroke-width="0.6">
<path d="M56.3,321.7l0,-14.9M133,254.3l0,-29.9M209.8,300.7l0,-17.9M286.5,284.2l0,-14.9M363.2,104.6l0,-29.9M440,175.7l0,-22.4M516.7,269.3l0,-29.9"/>
</g>
<g fill="#00aa7f" stroke-width="1.2">
......
......@@ -117,66 +117,21 @@
<polyline fill="none" points="75.5,238.5 89.6,227.5 114.8,222.7 135.7,232.5 143.8,223 168,243.7 185.1,236.6 197.5,249.5 217.3,231.2 234,237.2 265.5,264.9 271.5,269.9 303.4,260.8 319.7,270.2 329.8,257.6"/>
</g>
<g fill="none" stroke="#ff00ff" stroke-linecap="butt" stroke-width="0.6">
<path d="m87.3,238.5c0,-3.8,-5.2,-6.8,-11.7,-6.8"/>
<path d="m75.5,231.7c-6.5,0,-11.7,3,-11.7,6.8"/>
<path d="m63.7,238.5c0,6.9,5.2,12.5,11.7,12.5"/>
<path d="m75.5,251.1c6.5,0,11.7,-5.6,11.7,-12.5"/>
<path d="m95.6,227.5c0,-4.2,-2.6,-7.6,-5.9,-7.6"/>
<path d="m89.6,219.8c-3.3,0,-5.9,3.4,-5.9,7.6"/>
<path d="m83.6,227.5c0,5.2,2.6,9.5,5.9,9.5"/>
<path d="m89.6,237c3.3,0,5.9,-4.2,5.9,-9.5"/>
<path d="m119.8,222.7c0,-10.2,-2.1,-18.6,-4.9,-18.6"/>
<path d="m114.8,204.1c-2.7,0,-4.9,8.3,-4.9,18.6"/>
<path d="m109.9,222.7c0,11.3,2.1,20.6,4.9,20.6"/>
<path d="m114.8,243.4c2.7,0,4.9,-9.2,4.9,-20.6"/>
<path d="m138.7,232.5c0,-11.4,-1.3,-20.7,-2.9,-20.7"/>
<path d="m135.7,211.7c-1.6,0,-2.9,9.3,-2.9,20.7"/>
<path d="m132.8,232.5c0,8.1,1.3,14.6,2.9,14.6"/>
<path d="m135.7,247.2c1.6,0,2.9,-6.5,2.9,-14.6"/>
<path d="m153.7,223c0,-11.8,-4.4,-21.5,-9.8,-21.5"/>
<path d="m143.8,201.5c-5.4,0,-9.8,9.6,-9.8,21.5"/>
<path d="m133.9,223c0,1.8,4.4,3.2,9.8,3.2"/>
<path d="m143.8,226.3c5.4,0,9.8,-1.4,9.8,-3.2"/>
<path d="m172.8,243.7c0,-1.8,-2.1,-3.3,-4.8,-3.3"/>
<path d="m168,240.4c-2.6,0,-4.8,1.5,-4.8,3.3"/>
<path d="m163.1,243.7c0,1.2,2.1,2.3,4.8,2.3"/>
<path d="m168,246c2.6,0,4.8,-1,4.8,-2.3"/>
<path d="m201.9,236.6c0,-12.3,-7.5,-22.3,-16.8,-22.3"/>
<path d="m185.1,214.3c-9.2,0,-16.8,10,-16.8,22.3"/>
<path d="m168.3,236.6c0,9.3,7.5,16.9,16.8,16.9"/>
<path d="m185.1,253.6c9.2,0,16.8,-7.5,16.8,-16.9"/>
<path d="m211,249.5c0,-4.3,-6,-7.8,-13.5,-7.8"/>
<path d="m197.5,241.6c-7.4,0,-13.5,3.5,-13.5,7.8"/>
<path d="m183.9,249.5c0,4.3,6,7.9,13.5,7.9"/>
<path d="m197.5,257.5c7.4,0,13.5,-3.5,13.5,-7.9"/>
<path d="m229.5,231.2c0,-3.2,-5.4,-5.8,-12.1,-5.8"/>
<path d="m217.3,225.3c-6.7,0,-12.1,2.6,-12.1,5.8"/>
<path d="m205.2,231.2c0,3.1,5.4,5.7,12.1,5.7"/>
<path d="m217.3,236.9c6.7,0,12.1,-2.5,12.1,-5.7"/>
<path d="m247.8,237.2c0,-10.6,-6.1,-19.2,-13.7,-19.2"/>
<path d="m234,217.9c-7.5,0,-13.7,8.6,-13.7,19.2"/>
<path d="m220.3,237.2c0,12.6,6.1,22.8,13.7,22.8"/>
<path d="m234,260c7.5,0,13.7,-10.2,13.7,-22.8"/>
<path d="m266.3,264.9c0,-6.9,-0.3,-12.6,-0.7,-12.6"/>
<path d="m265.5,252.3c-0.4,0,-0.7,5.6,-0.7,12.6"/>
<path d="m264.8,264.9c0,1.3,0.3,2.4,0.7,2.4"/>
<path d="m265.5,267.4c0.4,0,0.7,-1,0.7,-2.4"/>
<path d="m287.7,269.9c0,-4.7,-7.2,-8.5,-16.2,-8.5"/>
<path d="m271.5,261.3c-8.9,0,-16.2,3.8,-16.2,8.5"/>
<path d="m255.2,269.9c0,11.8,7.2,21.4,16.2,21.4"/>
<path d="m271.5,291.4c8.9,0,16.2,-9.6,16.2,-21.4"/>
<path d="m311.4,260.8c0,-0.8,-3.6,-1.5,-8,-1.5"/>
<path d="m303.4,259.2c-4.4,0,-8,0.7,-8,1.5"/>
<path d="m295.4,260.8c0,8,3.6,14.5,8,14.5"/>
<path d="m303.4,275.3c4.4,0,8,-6.4,8,-14.5"/>
<path d="m332.3,270.2c0,-5.9,-5.6,-10.8,-12.5,-10.8"/>
<path d="m319.7,259.4c-6.9,0,-12.5,4.8,-12.5,10.8"/>
<path d="m307.2,270.2c0,5.5,5.6,10,12.5,10"/>
<path d="m319.7,280.3c6.9,0,12.5,-4.4,12.5,-10"/>
<path d="m333.3,257.6c0,-5.1,-1.5,-9.2,-3.5,-9.2"/>
<path d="m329.8,248.4c-1.9,0,-3.5,4.1,-3.5,9.2"/>
<path d="m326.2,257.6c0,13.7,1.5,24.9,3.5,24.9"/>
<path d="m329.8,282.6c1.9,0,3.5,-11.1,3.5,-24.9"/>
<path d="m87.3,238.5c0,-3.8,-5.2,-6.8,-11.7,-6.8c-6.5,0,-11.7,3,-11.7,6.8c0,6.9,5.2,12.5,11.7,12.5c6.5,0,11.7,-5.6,11.7,-12.5"/>
<path d="m95.6,227.5c0,-4.2,-2.6,-7.6,-5.9,-7.6c-3.3,0,-5.9,3.4,-5.9,7.6c0,5.2,2.6,9.5,5.9,9.5c3.3,0,5.9,-4.2,5.9,-9.5"/>
<path d="m119.8,222.7c0,-10.2,-2.1,-18.6,-4.9,-18.6c-2.7,0,-4.9,8.3,-4.9,18.6c0,11.3,2.1,20.6,4.9,20.6c2.7,0,4.9,-9.2,4.9,-20.6"/>
<path d="m138.7,232.5c0,-11.4,-1.3,-20.7,-2.9,-20.7c-1.6,0,-2.9,9.3,-2.9,20.7c0,8.1,1.3,14.6,2.9,14.6c1.6,0,2.9,-6.5,2.9,-14.6"/>
<path d="m153.7,223c0,-11.8,-4.4,-21.5,-9.8,-21.5c-5.4,0,-9.8,9.6,-9.8,21.5c0,1.8,4.4,3.2,9.8,3.2c5.4,0,9.8,-1.4,9.8,-3.2"/>
<path d="m172.8,243.7c0,-1.8,-2.1,-3.3,-4.8,-3.3c-2.6,0,-4.8,1.5,-4.8,3.3c0,1.2,2.1,2.3,4.8,2.3c2.6,0,4.8,-1,4.8,-2.3"/>
<path d="m201.9,236.6c0,-12.3,-7.5,-22.3,-16.8,-22.3c-9.2,0,-16.8,10,-16.8,22.3c0,9.3,7.5,16.9,16.8,16.9c9.2,0,16.8,-7.5,16.8,-16.9"/>
<path d="m211,249.5c0,-4.3,-6,-7.8,-13.5,-7.8c-7.4,0,-13.5,3.5,-13.5,7.8c0,4.3,6,7.9,13.5,7.9c7.4,0,13.5,-3.5,13.5,-7.9"/>
<path d="m229.5,231.2c0,-3.2,-5.4,-5.8,-12.1,-5.8c-6.7,0,-12.1,2.6,-12.1,5.8c0,3.1,5.4,5.7,12.1,5.7c6.7,0,12.1,-2.5,12.1,-5.7"/>
<path d="m247.8,237.2c0,-10.6,-6.1,-19.2,-13.7,-19.2c-7.5,0,-13.7,8.6,-13.7,19.2c0,12.6,6.1,22.8,13.7,22.8c7.5,0,13.7,-10.2,13.7,-22.8"/>
<path d="m266.3,264.9c0,-6.9,-0.3,-12.6,-0.7,-12.6c-0.4,0,-0.7,5.6,-0.7,12.6c0,1.3,0.3,2.4,0.7,2.4c0.4,0,0.7,-1,0.7,-2.4"/>
<path d="m287.7,269.9c0,-4.7,-7.2,-8.5,-16.2,-8.5c-8.9,0,-16.2,3.8,-16.2,8.5c0,11.8,7.2,21.4,16.2,21.4c8.9,0,16.2,-9.6,16.2,-21.4"/>
<path d="m311.4,260.8c0,-0.8,-3.6,-1.5,-8,-1.5c-4.4,0,-8,0.7,-8,1.5c0,8,3.6,14.5,8,14.5c4.4,0,8,-6.4,8,-14.5"/>
<path d="m332.3,270.2c0,-5.9,-5.6,-10.8,-12.5,-10.8c-6.9,0,-12.5,4.8,-12.5,10.8c0,5.5,5.6,10,12.5,10c6.9,0,12.5,-4.4,12.5,-10"/>
<path d="m333.3,257.6c0,-5.1,-1.5,-9.2,-3.5,-9.2c-1.9,0,-3.5,4.1,-3.5,9.2c0,13.7,1.5,24.9,3.5,24.9c1.9,0,3.5,-11.1,3.5,-24.9"/>
</g>
<g fill="#ff00ff" stroke-linejoin="miter" stroke-width="0.6">
<use xlink:href="#p1" x="75.5" y="238.5"/>
......
This diff is collapsed.
......@@ -71,18 +71,9 @@
</g>
<g clip-path="url(#c3)">
<g fill="none" stroke="#ff0000" stroke-width="0.6">
<path d="m239.9,174.6c0,-3.3,0,-6,0,-6"/>
<path d="m239.9,168.6c0,0,0,2.6,0,6"/>
<path d="m239.9,174.6c0,3.3,0,6,0,6"/>
<path d="m239.9,180.6c0,0,0,-2.6,0,-6"/>
<path d="m272.4,174.6c0,-3.3,-2.6,-6,-6,-6"/>
<path d="m266.4,168.6c-3.3,0,-6,2.6,-6,6"/>
<path d="m260.4,174.6c0,3.3,2.6,6,6,6"/>
<path d="m266.4,180.6c3.3,0,6,-2.6,6,-6"/>
<path d="m293,174.6c0,-3.3,0,-6,0,-6"/>
<path d="m293,168.6c0,0,0,2.6,0,6"/>
<path d="m293,174.6c0,3.3,0,6,0,6"/>
<path d="m293,180.6c0,0,0,-2.6,0,-6"/>
<path d="m239.9,174.6c0,3.3,0,6,0,6c0,0,0,-2.6,0,-6c0,-3.3,0,-6,0,-6c0,0,0,2.6,0,6"/>
<path d="m272.4,174.6c0,3.3,-2.6,6,-6,6c-3.3,0,-6,-2.6,-6,-6c0,-3.3,2.6,-6,6,-6c3.3,0,6,2.6,6,6"/>
<path d="m293,174.6c0,3.3,0,6,0,6c0,0,0,-2.6,0,-6c0,-3.3,0,-6,0,-6c0,0,0,2.6,0,6"/>
</g>
<g fill="#ff0000" stroke="none" stroke-linejoin="miter" stroke-width="1">
<g transform="translate(266.4,174.6)">
......@@ -97,66 +88,21 @@
</g>
<g clip-path="url(#c4)">
<g fill="none" stroke="#ff0000" stroke-linecap="butt" stroke-width="0.6">
<path d="m260.3,107.5c0,-0.4,-26.1,-0.8,-58.3,-0.8"/>
<path d="m201.9,106.7c-10768.9,0,-19498.9,0.3,-19498.9,0.8"/>
<path d="m-19296.9,107.5c0,0.4,8729.9,0.8,19498.9,0.8"/>
<path d="m201.9,108.3c32.2,0,58.3,-0.3,58.3,-0.8"/>
<path d="m318.6,71.6c0,-0.7,-10.8,-1.2,-24.2,-1.2"/>
<path d="m294.4,70.3c-18.8,0,-34.1,0.5,-34.1,1.2"/>
<path d="m260.3,71.6c0,0.7,15.2,1.2,34.1,1.2"/>
<path d="m294.4,72.8c13.3,0,24.2,-0.5,24.2,-1.2"/>
<path d="m352.7,62.8c0,-1,-6.8,-1.8,-15.3,-1.8"/>
<path d="m337.4,61c-10.3,0,-18.7,0.8,-18.7,1.8"/>
<path d="m318.6,62.8c0,1,8.4,1.8,18.7,1.8"/>
<path d="m337.4,64.6c8.4,0,15.3,-0.8,15.3,-1.8"/>
<path d="m376.9,58.4c0,-1.3,-5,-2.3,-11.2,-2.3"/>
<path d="m365.7,56c-7.1,0,-12.9,1,-12.9,2.3"/>
<path d="m352.7,58.4c0,1.2,5.8,2.3,12.9,2.3"/>
<path d="m365.7,60.7c6.2,0,11.2,-1,11.2,-2.3"/>
<path d="m395.7,59.9c0,-1.6,-3.9,-2.9,-8.8,-2.9"/>
<path d="m386.8,56.9c-5.4,0,-9.9,1.3,-9.9,2.9"/>
<path d="m376.9,59.9c0,1.5,4.4,2.8,9.9,2.8"/>
<path d="m386.8,62.7c4.8,0,8.8,-1.2,8.8,-2.8"/>
<path d="m411.1,56.6c0,-2,-3.2,-3.7,-7.3,-3.7"/>
<path d="m403.7,52.8c-4.4,0,-8,1.6,-8,3.7"/>
<path d="m395.7,56.6c0,2,3.5,3.7,8,3.7"/>
<path d="m403.7,60.3c4,0,7.3,-1.6,7.3,-3.7"/>
<path d="m424,60.3c0,-2.5,-2.7,-4.5,-6.2,-4.5"/>
<path d="m417.8,55.8c-3.7,0,-6.7,2,-6.7,4.5"/>
<path d="m411.1,60.3c0,2.3,3,4.3,6.7,4.3"/>
<path d="m417.8,64.6c3.4,0,6.2,-1.9,6.2,-4.3"/>
<path d="m435.3,57.5c0,-3.3,-2.4,-6.1,-5.4,-6.1"/>
<path d="m429.8,51.3c-3.2,0,-5.8,2.7,-5.8,6.1"/>
<path d="m424,57.5c0,3.1,2.6,5.6,5.8,5.6"/>
<path d="m429.8,63.1c3,0,5.4,-2.5,5.4,-5.6"/>
<path d="m445.2,68.6c0,-4.5,-2.1,-8.2,-4.8,-8.2"/>
<path d="m440.4,60.3c-2.8,0,-5.1,3.7,-5.1,8.2"/>
<path d="m435.3,68.6c0,3.8,2.2,6.8,5.1,6.8"/>
<path d="m440.4,75.5c2.6,0,4.8,-3,4.8,-6.8"/>
<path d="m454.1,84.2c0,-5,-1.9,-9.2,-4.3,-9.2"/>
<path d="m449.7,75c-2.5,0,-4.5,4.1,-4.5,9.2"/>
<path d="m445.2,84.2c0,4,2,7.4,4.5,7.4"/>
<path d="m449.7,91.6c2.3,0,4.3,-3.3,4.3,-7.4"/>
<path d="m462.1,80.4c0,-5.6,-1.7,-10.2,-3.9,-10.2"/>
<path d="m458.2,70.1c-2.2,0,-4.1,4.6,-4.1,10.2"/>
<path d="m454.1,80.4c0,5.8,1.8,10.5,4.1,10.5"/>
<path d="m458.2,90.9c2.1,0,3.9,-4.7,3.9,-10.5"/>
<path d="m469.4,75.5c0,-7.7,-1.6,-13.9,-3.5,-13.9"/>
<path d="m465.8,61.5c-2,0,-3.7,6.2,-3.7,13.9"/>
<path d="m462.1,75.5c0,6.3,1.6,11.4,3.7,11.4"/>
<path d="m465.8,86.9c1.9,0,3.5,-5.1,3.5,-11.4"/>
<path d="m476.1,97.8c0,-8.2,-1.4,-14.9,-3.3,-14.9"/>
<path d="m472.8,82.8c-1.8,0,-3.4,6.6,-3.4,14.9"/>
<path d="m469.4,97.8c0,7.3,1.5,13.3,3.4,13.3"/>
<path d="m472.8,111.1c1.8,0,3.3,-5.9,3.3,-13.3"/>
<path d="m482.4,123.2c0,-9.1,-1.3,-16.6,-3,-16.6"/>
<path d="m479.3,106.6c-1.7,0,-3.1,7.4,-3.1,16.6"/>
<path d="m476.1,123.2c0,7.4,1.4,13.4,3.1,13.4"/>
<path d="m479.3,136.7c1.6,0,3,-6,3,-13.4"/>
<path d="m488.2,114.1c0,-12,-1.2,-21.8,-2.8,-21.8"/>
<path d="m485.3,92.2c-1.6,0,-2.9,9.7,-2.9,21.8"/>
<path d="m482.4,114.1c0,7.9,1.3,14.3,2.9,14.3"/>
<path d="m485.3,128.4c1.5,0,2.8,-6.4,2.8,-14.3"/>
<path d="m260.3,107.5c0,-0.4,-26.1,-0.8,-58.3,-0.8l0,0c-10768.9,0,-19498.9,0.3,-19498.9,0.8c0,0.4,8729.9,0.8,19498.9,0.8l0,0c32.2,0,58.3,-0.3,58.3,-0.8"/>
<path d="m318.6,71.6c0,-0.7,-10.8,-1.2,-24.2,-1.2c-18.8,0,-34.1,0.5,-34.1,1.2c0,0.7,15.2,1.2,34.1,1.2c13.3,0,24.2,-0.5,24.2,-1.2"/>
<path d="m352.7,62.8c0,-1,-6.8,-1.8,-15.3,-1.8c-10.3,0,-18.7,0.8,-18.7,1.8c0,1,8.4,1.8,18.7,1.8c8.4,0,15.3,-0.8,15.3,-1.8"/>
<path d="m376.9,58.4c0,-1.3,-5,-2.3,-11.2,-2.3c-7.1,0,-12.9,1,-12.9,2.3c0,1.2,5.8,2.3,12.9,2.3c6.2,0,11.2,-1,11.2,-2.3"/>
<path d="m395.7,59.9c0,-1.6,-3.9,-2.9,-8.8,-2.9c-5.4,0,-9.9,1.3,-9.9,2.9c0,1.5,4.4,2.8,9.9,2.8c4.8,0,8.8,-1.2,8.8,-2.8"/>
<path d="m411.1,56.6c0,-2,-3.2,-3.7,-7.3,-3.7c-4.4,0,-8,1.6,-8,3.7c0,2,3.5,3.7,8,3.7c4,0,7.3,-1.6,7.3,-3.7"/>
<path d="m424,60.3c0,-2.5,-2.7,-4.5,-6.2,-4.5c-3.7,0,-6.7,2,-6.7,4.5c0,2.3,3,4.3,6.7,4.3c3.4,0,6.2,-1.9,6.2,-4.3"/>
<path d="m435.3,57.5c0,-3.3,-2.4,-6.1,-5.4,-6.1c-3.2,0,-5.8,2.7,-5.8,6.1c0,3.1,2.6,5.6,5.8,5.6c3,0,5.4,-2.5,5.4,-5.6"/>
<path d="m445.2,68.6c0,-4.5,-2.1,-8.2,-4.8,-8.2c-2.8,0,-5.1,3.7,-5.1,8.2c0,3.8,2.2,6.8,5.1,6.8c2.6,0,4.8,-3,4.8,-6.8"/>
<path d="m454.1,84.2c0,-5,-1.9,-9.2,-4.3,-9.2c-2.5,0,-4.5,4.1,-4.5,9.2c0,4,2,7.4,4.5,7.4c2.3,0,4.3,-3.3,4.3,-7.4"/>
<path d="m462.1,80.4c0,-5.6,-1.7,-10.2,-3.9,-10.2c-2.2,0,-4.1,4.6,-4.1,10.2c0,5.8,1.8,10.5,4.1,10.5c2.1,0,3.9,-4.7,3.9,-10.5"/>
<path d="m469.4,75.5c0,-7.7,-1.6,-13.9,-3.5,-13.9c-2,0,-3.7,6.2,-3.7,13.9c0,6.3,1.6,11.4,3.7,11.4c1.9,0,3.5,-5.1,3.5,-11.4"/>
<path d="m476.1,97.8c0,-8.2,-1.4,-14.9,-3.3,-14.9c-1.8,0,-3.4,6.6,-3.4,14.9c0,7.3,1.5,13.3,3.4,13.3c1.8,0,3.3,-5.9,3.3,-13.3"/>
<path d="m482.4,123.2c0,-9.1,-1.3,-16.6,-3,-16.6c-1.7,0,-3.1,7.4,-3.1,16.6c0,7.4,1.4,13.4,3.1,13.4c1.6,0,3,-6,3,-13.4"/>
<path d="m488.2,114.1c0,-12,-1.2,-21.8,-2.8,-21.8c-1.6,0,-2.9,9.7,-2.9,21.8c0,7.9,1.3,14.3,2.9,14.3c1.5,0,2.8,-6.4,2.8,-14.3"/>
</g>
<g fill="#ff0000" stroke="none" stroke-linejoin="miter" stroke-width="1">
<use xlink:href="#p0" x="201.9" y="107.5"/>
......
......@@ -21,9 +21,9 @@
</g>
<g clip-path="url(#c1)">
<g fill="none" stroke-width="1.2">
<polyline fill="none" points="292.3,350 290.8,341 290.4,329.7 290.9,318.4 291.9,307.1 292.3,304 294.2,295.7 297,284.4 299.7,273.1 302.3,261.8 304.9,250.4 307.2,240.1 307.7,239.1 313,227.8 317.4,216.5 321.2,205.2 322.2,202 337.2,196.4 338.5,205.2 339.5,216.5 339.8,227.8 339.5,239.1 338.9,250.4 338,261.8 337.2,269.2 336.2,273.1 333.2,284.4 330.1,295.7 327,307.1 324,318.4 322.2,324.4 318.5,329.7 311.8,341 307.2,349.9 292.3,350"/>
<polyline fill="none" points="292.3,383.4 282.2,375 278.2,363.7 277.6,352.3 278.3,341 279.8,329.7 281.6,318.4 283.6,307.1 285.8,295.7 288,284.4 290.2,273.1 292.3,262.9 292.6,261.8 296.2,250.4 299.5,239.1 302.6,227.8 305.5,216.5 307.2,209.9 309.4,205.2 314,193.8 318.2,182.5 322,171.2 322.2,170.4 331.6,159.9 337.2,151.5 341.8,159.9 345.7,171.2 347.9,182.5 349.1,193.8 349.4,205.2 349.2,216.5 348.6,227.8 347.6,239.1 346.3,250.4 344.7,261.8 343,273.1 341.1,284.4 339,295.7 337.2,305 336.5,307.1 332.3,318.4 328.3,329.7 324.4,341 322.2,347.2 318.8,352.3 311.9,363.7 307.2,372 302.6,375 292.3,383.4"/>
<polyline fill="none" points="277.3,421.4 274.8,420.3 263,408.9 262.3,407.5 260.6,397.6 260,386.3 260.2,375 260.9,363.7 262.1,352.3 262.3,350.3 263.9,341 266,329.7 268.3,318.4 270.5,307.1 272.8,295.7 275.2,284.4 277.3,274.1 277.6,273.1 280.7,261.8 283.7,250.4 286.5,239.1 289.3,227.8 292,216.5 292.3,215.6 295.7,205.2 299.1,193.8 302.4,182.5 305.5,171.2 307.2,164.8 309.2,159.9 313.6,148.6 317.6,137.2 321.3,125.9 322.2,123 327.4,114.6 333.4,103.3 337.2,95.4 352.2,95.7 354.4,103.3 357,114.6 359.1,125.9 360.5,137.2 361.6,148.6 362.2,159.9 362.5,171.2 362.4,182.5 362.1,193.8 361.6,205.2 360.8,216.5 359.9,227.8 358.7,239.1 357.4,250.4 355.9,261.8 354.2,273.1 352.4,284.4 352.2,286 349.7,295.7 346.8,307.1 343.8,318.4 340.7,329.7 337.6,341 337.2,342.3 332.8,352.3 327.9,363.7 323.2,375 322.2,377.1 316,386.3 309,397.6 307.2,400.5 298.4,408.9 292.3,415.4 279.9,420.3 277.3,421.4"/>
<polyline fill="none" points="292.3,351.7 287.6,341 287.6,329.7 288.7,318.4 289.4,307.1 292.3,296.3 292.5,295.7 292.7,284.4 297.5,273.1 300,261.8 303.7,250.4 307.2,239.7 307.7,239.1 307.7,227.8 315.1,216.5 317.5,205.2 322.2,194.4 337.2,194.4 341.9,205.2 341.9,216.5 340.7,227.8 340.7,239.1 340,250.4 340,261.8 337.2,272.5 336.9,273.1 336.9,284.4 331.9,295.7 329.5,307.1 325.8,318.4 322.2,329.1 321.8,329.7 314.3,341 307.2,351.7 292.3,351.7"/>
<polyline fill="none" points="292.3,389.2 288.4,386.3 277.3,377.9 276.3,375 276.3,363.7 276.3,352.3 276.5,341 276.7,329.7 277.3,326.8 280.1,318.4 282.5,307.1 283.8,295.7 285.5,284.4 288.5,273.1 291.6,261.8 292.3,258.9 295.1,250.4 298.8,239.1 300.5,227.8 303.5,216.5 306.6,205.2 307.2,202.3 311,193.8 316,182.5 321.3,171.2 322.2,168.3 327.8,159.9 335.3,148.6 337.2,145.7 341,148.6 346.6,159.9 346.6,171.2 352.2,179.6 352.8,182.5 352.8,193.8 352.7,205.2 352.7,216.5 352.2,219.4 349.4,227.8 349.4,239.1 346.9,250.4 346.9,261.8 343.9,273.1 342.8,284.4 340.3,295.7 337.7,307.1 337.2,309.9 334.4,318.4 329,329.7 326,341 322.9,352.3 322.2,353.8 313.5,363.7 308.2,375 307.2,376.4 294.2,386.3 292.3,389.2"/>
<polyline fill="none" points="277.3,425.1 264.5,420.3 262.3,418.6 259.1,408.9 259.1,397.6 259.1,386.3 259.8,375 260.2,363.7 260.5,352.3 262.3,342.6 262.8,341 265.2,329.7 267.7,318.4 270.2,307.1 271.2,295.7 273.3,284.4 275.7,273.1 277.3,268.2 280.2,261.8 282.7,250.4 285.1,239.1 288.3,227.8 290.4,216.5 292.3,211.6 295.1,205.2 297.6,193.8 300.1,182.5 305.1,171.2 307.2,161.5 307.8,159.9 311.5,148.6 316.7,137.2 319.7,125.9 322.2,116.2 323.3,114.6 332.9,103.3 337.2,93.6 352.2,93.6 356.4,103.3 359.1,114.6 360.7,125.9 362.9,137.2 363.7,148.6 363.7,159.9 363.7,171.2 364.3,182.5 364.3,193.8 362.6,205.2 362.6,216.5 360.4,227.8 359.4,239.1 358.3,250.4 356.9,261.8 355.3,273.1 353.6,284.4 352.2,294.1 351.8,295.7 347.6,307.1 345.4,318.4 341.2,329.7 338.8,341 337.2,345.9 334.3,352.3 329.3,363.7 324.1,375 322.2,379.8 317.9,386.3 309.8,397.6 307.2,402.5 301.5,408.9 292.3,419.4 290.1,420.3 277.3,425.1"/>
</g>
</g>
<g clip-path="url(#c0)">
......
......@@ -23,12 +23,12 @@
<path d="m-120.4,-24l240.9,0l0,48.1l-240.9,0l0,-48.1"/>
</g>