[QGIS Commit] r12705 - in trunk/qgis: . images/north_arrows src/app
src/core/gps
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Jan 8 07:36:50 EST 2010
Author: jef
Date: 2010-01-08 07:36:47 -0500 (Fri, 08 Jan 2010)
New Revision: 12705
Removed:
trunk/qgis/images/north_arrows/gpsarrow.svg~
trunk/qgis/images/north_arrows/gpsarrow2.svg~
Modified:
trunk/qgis/CMakeLists.txt
trunk/qgis/src/app/CMakeLists.txt
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/core/gps/qgsnmeaconnection.cpp
Log:
more fixes: optional QWT
Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/CMakeLists.txt 2010-01-08 12:36:47 UTC (rev 12705)
@@ -302,7 +302,6 @@
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
- ADD_DEFINITIONS("-DQWT_DLL")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
Deleted: trunk/qgis/images/north_arrows/gpsarrow.svg~
===================================================================
--- trunk/qgis/images/north_arrows/gpsarrow.svg~ 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/images/north_arrows/gpsarrow.svg~ 2010-01-08 12:36:47 UTC (rev 12705)
@@ -1,426 +0,0 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg2816"
- version="1.1"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="New document 2">
- <defs
- id="defs2818">
- <linearGradient
- id="linearGradient2830">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832" />
- <stop
- id="stop3622"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective2824" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830"
- id="linearGradient2836"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.438278,19.203304)" />
- <inkscape:perspective
- id="perspective3632"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830-8"
- id="linearGradient2836-4"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.25646,19.385122)" />
- <linearGradient
- id="linearGradient2830-8">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832-7" />
- <stop
- id="stop3622-3"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834-3" />
- </linearGradient>
- <linearGradient
- y2="71.858025"
- x2="48.086071"
- y1="29.754156"
- x1="41.021702"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.46692,19.117684)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3642"
- xlink:href="#linearGradient2830-8"
- inkscape:collect="always" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-0.63636364"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1680"
- inkscape:window-height="976"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata2821">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:0.63114756;fill:url(#linearGradient3642);fill-opacity:1;stroke:#b6b6b6;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 32.620505,47.51011 C 29.333417,45.924879 13.880986,63.98066 2.0419629,61.633695 -0.11223409,48.256623 27.23677,8.9536282 33.05656,2.0131492 38.078896,8.7098952 65.187759,47.03309 61.342958,61.605402 44.439079,64.866023 36.268978,46.111427 32.620505,47.51011 z"
- id="path2828-5"
- sodipodi:nodetypes="ccccc" />
- <path
- style="opacity:0.63114756;fill:url(#linearGradient2836);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 32.649147,47.59573 C 29.362059,46.010499 13.909628,64.06628 2.0706049,61.719315 -0.08359248,48.342243 27.265412,9.0392481 33.085202,2.0987694 38.107538,8.7955159 65.216401,47.11871 61.3716,61.691022 44.467721,64.951643 36.29762,46.197047 32.649147,47.59573 z"
- id="path2828"
- sodipodi:nodetypes="ccccc" />
- </g>
-</svg>
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg2816"
- version="1.1"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="New document 2">
- <defs
- id="defs2818">
- <linearGradient
- id="linearGradient2830">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832" />
- <stop
- id="stop3622"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective2824" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830"
- id="linearGradient2836"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.438278,19.203304)" />
- <inkscape:perspective
- id="perspective3632"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830-8"
- id="linearGradient2836-4"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.25646,19.385122)" />
- <linearGradient
- id="linearGradient2830-8">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832-7" />
- <stop
- id="stop3622-3"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834-3" />
- </linearGradient>
- <linearGradient
- y2="71.858025"
- x2="48.086071"
- y1="29.754156"
- x1="41.021702"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.46692,19.117684)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3642"
- xlink:href="#linearGradient2830-8"
- inkscape:collect="always" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-0.63636364"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1680"
- inkscape:window-height="976"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata2821">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:0.63114756;fill:url(#linearGradient3642);fill-opacity:1;stroke:#b6b6b6;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 32.620505,47.51011 C 29.333417,45.924879 13.880986,63.98066 2.0419629,61.633695 -0.11223409,48.256623 27.23677,8.9536282 33.05656,2.0131492 38.078896,8.7098952 65.187759,47.03309 61.342958,61.605402 44.439079,64.866023 36.268978,46.111427 32.620505,47.51011 z"
- id="path2828-5"
- sodipodi:nodetypes="ccccc" />
- <path
- style="opacity:0.63114756;fill:url(#linearGradient2836);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 32.649147,47.59573 C 29.362059,46.010499 13.909628,64.06628 2.0706049,61.719315 -0.08359248,48.342243 27.265412,9.0392481 33.085202,2.0987694 38.107538,8.7955159 65.216401,47.11871 61.3716,61.691022 44.467721,64.951643 36.29762,46.197047 32.649147,47.59573 z"
- id="path2828"
- sodipodi:nodetypes="ccccc" />
- </g>
-</svg>
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg2816"
- version="1.1"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="New document 2">
- <defs
- id="defs2818">
- <linearGradient
- id="linearGradient2830">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832" />
- <stop
- id="stop3622"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective2824" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830"
- id="linearGradient2836"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.438278,19.203304)" />
- <inkscape:perspective
- id="perspective3632"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830-8"
- id="linearGradient2836-4"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.25646,19.385122)" />
- <linearGradient
- id="linearGradient2830-8">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832-7" />
- <stop
- id="stop3622-3"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834-3" />
- </linearGradient>
- <linearGradient
- y2="71.858025"
- x2="48.086071"
- y1="29.754156"
- x1="41.021702"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.46692,19.117684)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient3642"
- xlink:href="#linearGradient2830-8"
- inkscape:collect="always" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-0.63636364"
- inkscape:cy="32"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1680"
- inkscape:window-height="976"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata2821">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <path
- style="opacity:0.63114756;fill:url(#linearGradient3642);fill-opacity:1;stroke:#b6b6b6;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 32.620505,47.51011 C 29.333417,45.924879 13.880986,63.98066 2.0419629,61.633695 -0.11223409,48.256623 27.23677,8.9536282 33.05656,2.0131492 38.078896,8.7098952 65.187759,47.03309 61.342958,61.605402 44.439079,64.866023 36.268978,46.111427 32.620505,47.51011 z"
- id="path2828-5"
- sodipodi:nodetypes="ccccc" />
- <path
- style="opacity:0.63114756;fill:url(#linearGradient2836);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="M 32.649147,47.59573 C 29.362059,46.010499 13.909628,64.06628 2.0706049,61.719315 -0.08359248,48.342243 27.265412,9.0392481 33.085202,2.0987694 38.107538,8.7955159 65.216401,47.11871 61.3716,61.691022 44.467721,64.951643 36.29762,46.197047 32.649147,47.59573 z"
- id="path2828"
- sodipodi:nodetypes="ccccc" />
- </g>
-</svg>
Deleted: trunk/qgis/images/north_arrows/gpsarrow2.svg~
===================================================================
--- trunk/qgis/images/north_arrows/gpsarrow2.svg~ 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/images/north_arrows/gpsarrow2.svg~ 2010-01-08 12:36:47 UTC (rev 12705)
@@ -1,693 +0,0 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg2816"
- version="1.1"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="arrow.svg">
- <defs
- id="defs2818">
- <linearGradient
- id="linearGradient2830">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832" />
- <stop
- id="stop3622"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective2824" />
- <inkscape:perspective
- id="perspective3632"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830-8"
- id="linearGradient2836-4"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.25646,19.385122)" />
- <linearGradient
- id="linearGradient2830-8">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832-7" />
- <stop
- id="stop3622-3"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834-3" />
- </linearGradient>
- <inkscape:perspective
- id="perspective3662"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3696"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3768"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3790"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <filter
- inkscape:collect="always"
- id="filter3852">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.157102"
- id="feGaussianBlur3854" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-33.272727"
- inkscape:cy="24.727273"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1680"
- inkscape:window-height="976"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:window-maximized="1"
- showguides="true"
- inkscape:guide-bbox="true" />
- <metadata
- id="metadata2821">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <g
- id="g3823"
- style="stroke:#c9c9c9;stroke-opacity:1;filter:url(#filter3852)">
- <path
- id="path3728"
- d="m 31.90909,40.328839 c 0,-16.96095 0,-16.96095 0,-16.96095"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3730"
- d="m 23.998259,31.848365 c 16.310152,0 16.310152,0 16.310152,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- transform="matrix(0.76610394,0,0,-0.73954782,7.3937644,55.39087)"
- d="M 62.545454,32 A 30.545454,30.545454 0 1 1 1.454546,32 30.545454,30.545454 0 1 1 62.545454,32 z"
- sodipodi:ry="30.545454"
- sodipodi:rx="30.545454"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path2854-4"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:13.85237597999999970;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- sodipodi:type="arc" />
- <path
- id="path3652-6"
- d="m 31.90909,57.97056 c 0,-9.021794 0,-9.021794 0,-9.021794"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3652-8-6"
- d="m 31.90909,14.747963 c 0,-9.0217945 0,-9.0217945 0,-9.0217945"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3676-6"
- d="m 49.006099,31.72534 8.955577,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3678-6"
- d="m 5.8565051,31.72534 8.3042589,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3813"
- transform="translate(82.909091,7.4545455)">
- <g
- transform="matrix(0.84139481,0,0,0.85626031,6.6145303,1.1988726)"
- style="stroke-width:8.69999981;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3804">
- <path
- sodipodi:type="arc"
- style="opacity:0.94262294;fill:none;stroke:#000000;stroke-width:10.38928127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="path2854"
- sodipodi:cx="32"
- sodipodi:cy="32"
- sodipodi:rx="30.545454"
- sodipodi:ry="30.545454"
- d="M 62.545454,32 C 62.545454,48.869788 48.869788,62.545454 32,62.545454 15.130212,62.545454 1.454546,48.869788 1.454546,32 1.454546,15.130212 15.130212,1.454546 32,1.454546 48.869788,1.454546 62.545454,15.130212 62.545454,32 z"
- transform="matrix(0.85544901,0,0,0.81973472,-95.374373,0.586671)" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,-2.4545454 c 0,9.9999994 0,9.9999994 0,9.9999994"
- id="path3652" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,21.818182 c 0,10 0,10 0,10"
- id="path3652-8" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -73.272727,26.818182 10,0"
- id="path3676" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -97.272725,26.818182 9.27273,0"
- id="path3678" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,45.818182 c 0,10 0,10 0,10"
- id="path3652-2" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -47.545456,26.818182 9.27273,0"
- id="path3678-2" />
- </g>
- </g>
- </g>
-</svg>
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg2816"
- version="1.1"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="arrow.svg">
- <defs
- id="defs2818">
- <linearGradient
- id="linearGradient2830">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832" />
- <stop
- id="stop3622"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective2824" />
- <inkscape:perspective
- id="perspective3632"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830-8"
- id="linearGradient2836-4"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.25646,19.385122)" />
- <linearGradient
- id="linearGradient2830-8">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832-7" />
- <stop
- id="stop3622-3"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834-3" />
- </linearGradient>
- <inkscape:perspective
- id="perspective3662"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3696"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3768"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3790"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <filter
- inkscape:collect="always"
- id="filter3852">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.157102"
- id="feGaussianBlur3854" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-33.272727"
- inkscape:cy="24.727273"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1680"
- inkscape:window-height="976"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:window-maximized="1"
- showguides="true"
- inkscape:guide-bbox="true" />
- <metadata
- id="metadata2821">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <g
- id="g3823"
- style="stroke:#c9c9c9;stroke-opacity:1;filter:url(#filter3852)">
- <path
- id="path3728"
- d="m 31.90909,40.328839 c 0,-16.96095 0,-16.96095 0,-16.96095"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3730"
- d="m 23.998259,31.848365 c 16.310152,0 16.310152,0 16.310152,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- transform="matrix(0.76610394,0,0,-0.73954782,7.3937644,55.39087)"
- d="M 62.545454,32 A 30.545454,30.545454 0 1 1 1.454546,32 30.545454,30.545454 0 1 1 62.545454,32 z"
- sodipodi:ry="30.545454"
- sodipodi:rx="30.545454"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path2854-4"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:13.85237597999999970;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- sodipodi:type="arc" />
- <path
- id="path3652-6"
- d="m 31.90909,57.97056 c 0,-9.021794 0,-9.021794 0,-9.021794"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3652-8-6"
- d="m 31.90909,14.747963 c 0,-9.0217945 0,-9.0217945 0,-9.0217945"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3676-6"
- d="m 49.006099,31.72534 8.955577,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3678-6"
- d="m 5.8565051,31.72534 8.3042589,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3813"
- transform="translate(82.909091,7.4545455)">
- <g
- transform="matrix(0.84139481,0,0,0.85626031,6.6145303,1.1988726)"
- style="stroke-width:8.69999981;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3804">
- <path
- sodipodi:type="arc"
- style="opacity:0.94262294;fill:none;stroke:#000000;stroke-width:10.38928127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="path2854"
- sodipodi:cx="32"
- sodipodi:cy="32"
- sodipodi:rx="30.545454"
- sodipodi:ry="30.545454"
- d="M 62.545454,32 C 62.545454,48.869788 48.869788,62.545454 32,62.545454 15.130212,62.545454 1.454546,48.869788 1.454546,32 1.454546,15.130212 15.130212,1.454546 32,1.454546 48.869788,1.454546 62.545454,15.130212 62.545454,32 z"
- transform="matrix(0.85544901,0,0,0.81973472,-95.374373,0.586671)" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,-2.4545454 c 0,9.9999994 0,9.9999994 0,9.9999994"
- id="path3652" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,21.818182 c 0,10 0,10 0,10"
- id="path3652-8" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -73.272727,26.818182 10,0"
- id="path3676" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -97.272725,26.818182 9.27273,0"
- id="path3678" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,45.818182 c 0,10 0,10 0,10"
- id="path3652-2" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -47.545456,26.818182 9.27273,0"
- id="path3678-2" />
- </g>
- </g>
- </g>
-</svg>
-<?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:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="64px"
- height="64px"
- id="svg2816"
- version="1.1"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="arrow.svg">
- <defs
- id="defs2818">
- <linearGradient
- id="linearGradient2830">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832" />
- <stop
- id="stop3622"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834" />
- </linearGradient>
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 32 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="64 : 32 : 1"
- inkscape:persp3d-origin="32 : 21.333333 : 1"
- id="perspective2824" />
- <inkscape:perspective
- id="perspective3632"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2830-8"
- id="linearGradient2836-4"
- x1="41.021702"
- y1="29.754156"
- x2="48.086071"
- y2="71.858025"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.87256797,-0.4965131,0.48748535,0.88872707,-18.25646,19.385122)" />
- <linearGradient
- id="linearGradient2830-8">
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="0"
- id="stop2832-7" />
- <stop
- id="stop3622-3"
- offset="0.5"
- style="stop-color:#0078ff;stop-opacity:0.49803922;" />
- <stop
- style="stop-color:#0078ff;stop-opacity:1;"
- offset="1"
- id="stop2834-3" />
- </linearGradient>
- <inkscape:perspective
- id="perspective3662"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3696"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3768"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <inkscape:perspective
- id="perspective3790"
- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
- inkscape:vp_z="1 : 0.5 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 0.5 : 1"
- sodipodi:type="inkscape:persp3d" />
- <filter
- inkscape:collect="always"
- id="filter3852">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="1.157102"
- id="feGaussianBlur3854" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="5.5"
- inkscape:cx="-33.272727"
- inkscape:cy="24.727273"
- inkscape:current-layer="layer1"
- showgrid="true"
- inkscape:document-units="px"
- inkscape:grid-bbox="true"
- inkscape:window-width="1680"
- inkscape:window-height="976"
- inkscape:window-x="0"
- inkscape:window-y="25"
- inkscape:window-maximized="1"
- showguides="true"
- inkscape:guide-bbox="true" />
- <metadata
- id="metadata2821">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- id="layer1"
- inkscape:label="Layer 1"
- inkscape:groupmode="layer">
- <g
- id="g3823"
- style="stroke:#c9c9c9;stroke-opacity:1;filter:url(#filter3852)">
- <path
- id="path3728"
- d="m 31.90909,40.328839 c 0,-16.96095 0,-16.96095 0,-16.96095"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3730"
- d="m 23.998259,31.848365 c 16.310152,0 16.310152,0 16.310152,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- transform="matrix(0.76610394,0,0,-0.73954782,7.3937644,55.39087)"
- d="M 62.545454,32 A 30.545454,30.545454 0 1 1 1.454546,32 30.545454,30.545454 0 1 1 62.545454,32 z"
- sodipodi:ry="30.545454"
- sodipodi:rx="30.545454"
- sodipodi:cy="32"
- sodipodi:cx="32"
- id="path2854-4"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:13.85237597999999970;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- sodipodi:type="arc" />
- <path
- id="path3652-6"
- d="m 31.90909,57.97056 c 0,-9.021794 0,-9.021794 0,-9.021794"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3652-8-6"
- d="m 31.90909,14.747963 c 0,-9.0217945 0,-9.0217945 0,-9.0217945"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3676-6"
- d="m 49.006099,31.72534 8.955577,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- id="path3678-6"
- d="m 5.8565051,31.72534 8.3042589,0"
- style="opacity:0.96311471999999998;fill:none;stroke:#c9c9c9;stroke-width:10.42680550000000039;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- </g>
- <g
- id="g3813"
- transform="translate(82.909091,7.4545455)">
- <g
- transform="matrix(0.84139481,0,0,0.85626031,6.6145303,1.1988726)"
- style="stroke-width:8.69999981;stroke-miterlimit:4;stroke-dasharray:none"
- id="g3804">
- <path
- sodipodi:type="arc"
- style="opacity:0.94262294;fill:none;stroke:#000000;stroke-width:10.38928127;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- id="path2854"
- sodipodi:cx="32"
- sodipodi:cy="32"
- sodipodi:rx="30.545454"
- sodipodi:ry="30.545454"
- d="M 62.545454,32 C 62.545454,48.869788 48.869788,62.545454 32,62.545454 15.130212,62.545454 1.454546,48.869788 1.454546,32 1.454546,15.130212 15.130212,1.454546 32,1.454546 48.869788,1.454546 62.545454,15.130212 62.545454,32 z"
- transform="matrix(0.85544901,0,0,0.81973472,-95.374373,0.586671)" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,-2.4545454 c 0,9.9999994 0,9.9999994 0,9.9999994"
- id="path3652" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,21.818182 c 0,10 0,10 0,10"
- id="path3652-8" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -73.272727,26.818182 10,0"
- id="path3676" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -97.272725,26.818182 9.27273,0"
- id="path3678" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -67.818182,45.818182 c 0,10 0,10 0,10"
- id="path3652-2" />
- <path
- style="fill:none;stroke:#000000;stroke-width:8.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
- d="m -47.545456,26.818182 9.27273,0"
- id="path3678-2" />
- </g>
- </g>
- </g>
-</svg>
Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/src/app/CMakeLists.txt 2010-01-08 12:36:47 UTC (rev 12705)
@@ -111,25 +111,9 @@
attributetable/qgsattributetablefiltermodel.cpp
attributetable/qgsattributetableidcolumnpair.cpp
attributetable/qgsattributetabledelegate.cpp
+)
- gps/qgsgpsinformationwidget.cpp
- gps/qgsgpsmarker.cpp
- gps/qwtpolar/qwt_polar_canvas.cpp
- gps/qwtpolar/qwt_polar_curve.cpp
- gps/qwtpolar/qwt_polar_fitter.cpp
- gps/qwtpolar/qwt_polar_grid.cpp
- gps/qwtpolar/qwt_polar_itemdict.cpp
- gps/qwtpolar/qwt_polar_item.cpp
- gps/qwtpolar/qwt_polar_layout.cpp
- gps/qwtpolar/qwt_polar_magnifier.cpp
- gps/qwtpolar/qwt_polar_marker.cpp
- gps/qwtpolar/qwt_polar_panner.cpp
- gps/qwtpolar/qwt_polar_plot.cpp
- gps/qwtpolar/qwt_polar_point.cpp
- gps/qwtpolar/qwt_polar_spectrogram.cpp
- )
-
SET (QGIS_APP_MOC_HDRS
qgisapp.h
qgisappinterface.h
@@ -219,13 +203,40 @@
attributetable/qgsattributetabledialog.h
attributetable/qgsattributetabledelegate.h
- gps/qgsgpsinformationwidget.h
- gps/qwtpolar/qwt_polar_canvas.h
- gps/qwtpolar/qwt_polar_magnifier.h
- gps/qwtpolar/qwt_polar_panner.h
- gps/qwtpolar/qwt_polar_plot.h
)
+IF( QWT_FOUND )
+ ADD_DEFINITIONS(-DHAVE_QWT)
+
+ SET(QGIS_APP_SRCS
+ ${QGIS_APP_SRCS}
+ gps/qgsgpsinformationwidget.cpp
+ gps/qgsgpsmarker.cpp
+ gps/qwtpolar/qwt_polar_canvas.cpp
+ gps/qwtpolar/qwt_polar_curve.cpp
+ gps/qwtpolar/qwt_polar_fitter.cpp
+ gps/qwtpolar/qwt_polar_grid.cpp
+ gps/qwtpolar/qwt_polar_itemdict.cpp
+ gps/qwtpolar/qwt_polar_item.cpp
+ gps/qwtpolar/qwt_polar_layout.cpp
+ gps/qwtpolar/qwt_polar_magnifier.cpp
+ gps/qwtpolar/qwt_polar_marker.cpp
+ gps/qwtpolar/qwt_polar_panner.cpp
+ gps/qwtpolar/qwt_polar_plot.cpp
+ gps/qwtpolar/qwt_polar_point.cpp
+ gps/qwtpolar/qwt_polar_spectrogram.cpp
+ )
+
+ SET (QGIS_APP_MOC_HDRS
+ ${QGIS_APP_MOC_HDRS}
+ gps/qgsgpsinformationwidget.h
+ gps/qwtpolar/qwt_polar_canvas.h
+ gps/qwtpolar/qwt_polar_magnifier.h
+ gps/qwtpolar/qwt_polar_panner.h
+ gps/qwtpolar/qwt_polar_plot.h
+ )
+ENDIF( QWT_FOUND )
+
IF (POSTGRES_FOUND)
IF(HAVE_PGCONFIG)
ADD_DEFINITIONS(-DHAVE_PGCONFIG=1)
@@ -260,10 +271,8 @@
IF (WIN32)
-
IF (MSVC)
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc)
- ADD_DEFINITIONS(-DQWT_DLL)
ELSE(MSVC)
# Icon for windows MINGW
@@ -291,7 +300,6 @@
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
${QT_QTUITOOLS_INCLUDE_DIR}
- ${QWT_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
@@ -337,11 +345,18 @@
${QT_QTUITOOLS_LIBRARY}
#should only be needed for win
${QT_QTMAIN_LIBRARY}
- ${QWT_LIBRARY}
qgis_core
qgis_gui
)
+IF( QWT_FOUND )
+ IF( WIN32 )
+ ADD_DEFINITIONS(-DQWT_DLL)
+ ENDIF( WIN32 )
+ INCLUDE_DIRECTORIES(${QWT_INCLUDE_DIR})
+ TARGET_LINK_LIBRARIES(qgis ${QWT_LIBRARY})
+ENDIF( QWT_FOUND )
+
IF(NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis ${SQLITE_LIBRARY})
ENDIF(NOT WITH_INTERNAL_SPATIALITE)
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/src/app/qgisapp.cpp 2010-01-08 12:36:47 UTC (rev 12705)
@@ -140,7 +140,10 @@
#include "ogr/qgsopenvectorlayerdialog.h"
#include "qgsattributetabledialog.h"
#include "qgsvectorfilewriter.h"
+
+#ifdef HAVE_QWT
#include "qgsgpsinformationwidget.h"
+#endif
//
// Gdal/Ogr includes
@@ -556,11 +559,14 @@
// Add the recently accessed project file paths to the File menu
mRecentProjectPaths = settings.value( "/UI/recentProjectsList" ).toStringList();
+
+#if HAVE_QWT
// Restore state of GPS Tracker
if ( settings.value( "/gps/widgetEnabled", false ).toBool() )
{
showGpsTool();
}
+#endif
}
@@ -2124,6 +2130,8 @@
{
QgsDebugMsg( "restore of UI geometry failed" );
}
+
+#ifdef HAVE_QWT
// Persist state of GPS Tracker
if ( mpGpsWidget )
{
@@ -2134,6 +2142,7 @@
{
settings.setValue( "/gps/widgetEnabled", false );
}
+#endif
}
///////////// END OF GUI SETUP ROUTINES ///////////////
@@ -4399,6 +4408,7 @@
QgsProject::instance()->dirty( true );
} //remove all layers
+#ifdef HAVE_QWT
void QgisApp::showGpsTool()
{
if ( !mpGpsWidget )
@@ -4420,6 +4430,7 @@
mpGpsDock->toggleViewAction();
}
}
+#endif
void QgisApp::zoomToLayerExtent()
{
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/src/app/qgisapp.h 2010-01-08 12:36:47 UTC (rev 12705)
@@ -422,8 +422,10 @@
void userCenter();
//! Remove a layer from the map and legend
void removeLayer();
+#ifdef HAVE_QWT
//! Show GPS tool
void showGpsTool();
+#endif
//! zoom to extent of layer
void zoomToLayerExtent();
//! zoom to actual size of raster layer
Modified: trunk/qgis/src/core/gps/qgsnmeaconnection.cpp
===================================================================
--- trunk/qgis/src/core/gps/qgsnmeaconnection.cpp 2010-01-07 23:00:12 UTC (rev 12704)
+++ trunk/qgis/src/core/gps/qgsnmeaconnection.cpp 2010-01-08 12:36:47 UTC (rev 12705)
@@ -83,7 +83,7 @@
int endSentenceIndex = 0;
int dollarIndex;
- while ( endSentenceIndex = mStringBuffer.indexOf( "\r\n" ) && endSentenceIndex != -1 )
+ while ( ( endSentenceIndex = mStringBuffer.indexOf( "\r\n" ) ) && endSentenceIndex != -1 )
{
endSentenceIndex = mStringBuffer.indexOf( "\r\n" );
More information about the QGIS-commit
mailing list