mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
OP37/GCS Fix to WP number in tooltip, added compass to map
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@941 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota
zedamota
parent
0ea6731a1e
commit
5a8639b5b6
248
ground/src/libs/opmapcontrol/src/mapwidget/images/compas.svg
Normal file
248
ground/src/libs/opmapcontrol/src/mapwidget/images/compas.svg
Normal file
@ -0,0 +1,248 @@
|
||||
<?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://web.resource.org/cc/"
|
||||
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="604.86926"
|
||||
height="604.86926"
|
||||
id="svg2"
|
||||
sodipodi:version="0.32"
|
||||
inkscape:version="0.45.1"
|
||||
sodipodi:docbase="C:\Documents and Settings\Administrator.NETCOMP\Desktop"
|
||||
sodipodi:docname="mozart_ar_wind_rose_compas.svg"
|
||||
inkscape:output_extension="org.inkscape.output.svg.inkscape"
|
||||
version="1.0">
|
||||
<defs
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
id="linearGradient4148">
|
||||
<stop
|
||||
style="stop-color:#2a4fd4;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4150" />
|
||||
<stop
|
||||
style="stop-color:#8296e0;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop4152" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="linearGradient4130">
|
||||
<stop
|
||||
style="stop-color:#405c9c;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4132" />
|
||||
<stop
|
||||
style="stop-color:#4c7ff4;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop4134" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient4122">
|
||||
<stop
|
||||
style="stop-color:#4c7ff4;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop4124" />
|
||||
<stop
|
||||
style="stop-color:#4c7ff4;stop-opacity:0;"
|
||||
offset="1"
|
||||
id="stop4126" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4130"
|
||||
id="linearGradient4166"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-302.00003,-83.997175)"
|
||||
x1="-820.5625"
|
||||
y1="99.78125"
|
||||
x2="-441.4375"
|
||||
y2="456.35938" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4122"
|
||||
id="linearGradient4168"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-810.48193"
|
||||
y1="326.5834"
|
||||
x2="-408.28253"
|
||||
y2="-52.910587" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4148"
|
||||
id="radialGradient5169"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
cx="194.28571"
|
||||
cy="355.21933"
|
||||
fx="194.28571"
|
||||
fy="355.21933"
|
||||
r="302.43463" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4130"
|
||||
id="linearGradient3502"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="translate(-211.62639,-82.751427)"
|
||||
x1="-820.5625"
|
||||
y1="99.78125"
|
||||
x2="-441.4375"
|
||||
y2="456.35938" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4122"
|
||||
id="linearGradient3504"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="-810.48193"
|
||||
y1="326.5834"
|
||||
x2="-408.28253"
|
||||
y2="-52.910587"
|
||||
gradientTransform="translate(90.375143,-1.1310115)" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient4148"
|
||||
id="radialGradient3506"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
cx="194.28571"
|
||||
cy="355.21933"
|
||||
fx="194.28571"
|
||||
fy="355.21933"
|
||||
r="302.43463"
|
||||
gradientTransform="translate(63.022938,64.784692)" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.0762656"
|
||||
inkscape:cx="302.43463"
|
||||
inkscape:cy="302.43463"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showguides="true"
|
||||
inkscape:guide-bbox="true"
|
||||
inkscape:window-width="1152"
|
||||
inkscape:window-height="845"
|
||||
inkscape:window-x="-4"
|
||||
inkscape:window-y="-4"
|
||||
inkscape:showpageshadow="false" />
|
||||
<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" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Capa 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(-63.022938,-64.784692)">
|
||||
<g
|
||||
id="g3488">
|
||||
<g
|
||||
inkscape:export-ydpi="149.98282"
|
||||
inkscape:export-xdpi="149.98282"
|
||||
transform="translate(167.28571,19.857165)"
|
||||
id="g4160">
|
||||
<g
|
||||
id="g4140"
|
||||
transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,1003.9437,904.89201)">
|
||||
<path
|
||||
id="path3141"
|
||||
d="M -961.87503,15.784075 C -961.90089,15.784054 -1003.638,134.60957 -1003.6563,134.62783 C -1003.6746,134.6461 -1122.5625,176.22697 -1122.5625,176.25283 C -1122.5625,176.25399 -1117.6774,177.96566 -1117.2188,178.12783 L -962.93753,178.12783 L -962.93753,334.62783 C -962.9062,334.7161 -962.12553,336.94033 -962.12503,336.94033 C -962.09917,336.94035 -920.36206,218.11486 -920.34378,218.09658 C -920.32548,218.07831 -801.43754,176.52868 -801.43753,176.50283 C -801.43753,176.50144 -807.19055,174.48352 -807.84378,174.25283 L -960.68753,174.25283 L -960.68753,19.190325 C -960.75439,19.000995 -961.87429,15.784076 -961.87503,15.784075 z "
|
||||
style="opacity:1;fill:url(#linearGradient3502);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="opacity:1;fill:url(#linearGradient3504);fill-opacity:1;fill-rule:nonzero;stroke:#121217;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path3147"
|
||||
sodipodi:sides="4"
|
||||
sodipodi:cx="-542"
|
||||
sodipodi:cy="72.362183"
|
||||
sodipodi:r1="160.57379"
|
||||
sodipodi:r2="58.957184"
|
||||
sodipodi:arg1="1.5452947"
|
||||
sodipodi:arg2="2.3306929"
|
||||
inkscape:flatsided="false"
|
||||
inkscape:rounded="0.00020522979"
|
||||
inkscape:randomized="0"
|
||||
d="M -537.90555,232.88376 C -537.9314,232.88442 -582.59371,115.11848 -582.61245,115.10067 C -582.63119,115.08286 -702.52092,76.482479 -702.52158,76.456632 C -702.52224,76.430785 -584.7563,31.768477 -584.73849,31.749734 C -584.72068,31.730992 -546.1203,-88.158739 -546.09445,-88.159399 C -546.0686,-88.160058 -501.40629,29.605882 -501.38755,29.623692 C -501.36881,29.641502 -381.47908,68.241887 -381.47842,68.267734 C -381.47776,68.29358 -499.2437,112.95589 -499.26151,112.97463 C -499.27932,112.99337 -537.8797,232.8831 -537.90555,232.88376 z "
|
||||
transform="matrix(0.9996543,2.6294496e-2,-2.6294496e-2,0.9996543,-418.28467,118.27665)" />
|
||||
</g>
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#121217;stroke-width:5.86233473;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path2167"
|
||||
sodipodi:cx="71"
|
||||
sodipodi:cy="339.36218"
|
||||
sodipodi:rx="189"
|
||||
sodipodi:ry="189"
|
||||
d="M 260 339.36218 A 189 189 0 1 1 -118,339.36218 A 189 189 0 1 1 260 339.36218 z"
|
||||
transform="matrix(0.8633229,0,0,0.8633229,137.70407,56.383021)" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:export-ydpi="149.98282"
|
||||
inkscape:export-xdpi="149.98282"
|
||||
inkscape:export-filename="C:\Users\Walter\Pictures\g4160.png"
|
||||
transform="translate(171.17187,12)"
|
||||
id="g5165">
|
||||
<path
|
||||
sodipodi:type="star"
|
||||
style="opacity:1;fill:url(#radialGradient3506);fill-opacity:1;fill-rule:nonzero;stroke:#121217;stroke-width:2.70000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path2160"
|
||||
sodipodi:sides="4"
|
||||
sodipodi:cx="194.28571"
|
||||
sodipodi:cy="355.21933"
|
||||
sodipodi:r1="301.08649"
|
||||
sodipodi:r2="63.384228"
|
||||
sodipodi:arg1="1.5743009"
|
||||
sodipodi:arg2="2.3596991"
|
||||
inkscape:flatsided="false"
|
||||
inkscape:rounded="0.00020522979"
|
||||
inkscape:randomized="0"
|
||||
d="M 193.23053,656.30397 C 193.17714,656.30378 149.34711,399.91928 149.30949,399.8814 C 149.27187,399.84351 -106.79912,354.21754 -106.79893,354.16415 C -106.79875,354.11076 149.58575,310.28073 149.62364,310.24311 C 149.66152,310.20549 195.28749,54.134505 195.34088,54.134692 C 195.39427,54.134879 239.2243,310.51938 239.26192,310.55726 C 239.29954,310.59515 495.37053,356.22112 495.37034,356.27451 C 495.37016,356.3279 238.98566,400.15792 238.94777,400.19555 C 238.90989,400.23317 193.28392,656.30415 193.23053,656.30397 z " />
|
||||
<path
|
||||
sodipodi:type="arc"
|
||||
style="opacity:1;fill:#ffffff;fill-opacity:0.65263157;fill-rule:nonzero;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
id="path4176"
|
||||
sodipodi:cx="-1055"
|
||||
sodipodi:cy="97.362183"
|
||||
sodipodi:rx="47"
|
||||
sodipodi:ry="47"
|
||||
d="M -1096.4478,119.52242 A 47,47 0 1 1 -1095.9308,120.46356"
|
||||
sodipodi:start="2.6506081"
|
||||
sodipodi:end="8.9109453"
|
||||
sodipodi:open="true"
|
||||
transform="matrix(1.2552968,0,0,1.2552968,1517.3381,229.14375)" />
|
||||
</g>
|
||||
<path
|
||||
id="text4170"
|
||||
d="M 316.16852,98.784698 L 345.91071,98.784698 L 384.72321,155.80814 L 384.72321,98.784698 L 414.74664,98.784698 L 414.74664,201.86282 L 384.72321,201.86282 L 346.12164,145.26126 L 346.12164,201.86282 L 316.16852,201.86282 L 316.16852,98.784698 z "
|
||||
style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black" />
|
||||
<path
|
||||
id="text5147"
|
||||
d="M 85.022934,315.68027 L 115.25731,315.68027 L 126.15575,373.2662 L 142.04637,315.68027 L 172.21043,315.68027 L 188.17137,373.2662 L 199.06981,315.68027 L 229.16356,315.68027 L 206.45262,418.75839 L 175.23387,418.75839 L 157.16356,353.85995 L 139.16356,418.75839 L 107.94481,418.75839 L 85.022934,315.68027 z "
|
||||
style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black" />
|
||||
<path
|
||||
id="text5151"
|
||||
d="M 316.99219,599.55243 L 347.29688,597.65399 C 347.95309,602.5759 349.28903,606.32589 351.30469,608.90399 C 354.58589,613.07589 359.27339,615.16182 365.36719,615.1618 C 369.914,615.16182 373.41791,614.09542 375.87891,611.96259 C 378.33978,609.8298 379.57024,607.35714 379.57031,604.54462 C 379.57024,601.87277 378.39837,599.48215 376.05469,597.37274 C 373.71088,595.26341 368.27338,593.27122 359.74219,591.39618 C 345.7734,588.2556 335.81248,584.08373 329.85938,578.88055 C 323.85936,573.67749 320.85937,567.04468 320.85938,558.98212 C 320.85937,553.68532 322.39452,548.68142 325.46484,543.9704 C 328.53514,539.25955 333.15232,535.55643 339.31641,532.86102 C 345.48044,530.16581 353.92965,528.81816 364.66406,528.81805 C 377.83587,528.81816 387.87883,531.26738 394.79297,536.16571 C 401.70694,541.06424 405.82022,548.8572 407.13281,559.54462 L 377.10938,561.30243 C 376.31244,556.66188 374.63666,553.28688 372.08203,551.17743 C 369.52729,549.06814 365.99995,548.01345 361.5,548.01337 C 357.79683,548.01345 355.00777,548.79861 353.13281,550.36884 C 351.25777,551.93923 350.32027,553.84938 350.32031,556.0993 C 350.32027,557.74001 351.09371,559.21657 352.64063,560.52899 C 354.14058,561.88844 357.70308,563.15406 363.32813,564.32587 C 377.24993,567.32593 387.22258,570.36109 393.24609,573.43134 C 399.26944,576.50171 403.65225,580.3103 406.39453,584.85712 C 409.13662,589.40404 410.50771,594.48997 410.50781,600.11493 C 410.50771,606.72433 408.67959,612.81808 405.02344,618.39618 C 401.3671,623.97431 396.25773,628.20478 389.69531,631.08759 C 383.13274,633.9704 374.85931,635.4118 364.875,635.4118 C 347.34371,635.4118 335.2031,632.03681 328.45313,625.2868 C 321.70312,618.53682 317.88281,609.9587 316.99219,599.55243 L 316.99219,599.55243 z "
|
||||
style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#0c0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black" />
|
||||
<path
|
||||
id="text5155"
|
||||
d="M 544.98596,315.68027 L 630.34534,315.68027 L 630.34534,337.68808 L 576.90784,337.68808 L 576.90784,354.07089 L 626.47815,354.07089 L 626.47815,375.09433 L 576.90784,375.09433 L 576.90784,395.41464 L 631.89221,395.41464 L 631.89221,418.75839 L 544.98596,418.75839 L 544.98596,315.68027 z "
|
||||
style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;font-family:Arial Black" />
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 14 KiB |
@ -2,5 +2,6 @@
|
||||
<qresource prefix="/markers">
|
||||
<file>images/bigMarkerGreen.png</file>
|
||||
<file>images/marker.png</file>
|
||||
<file>images/compas.svg</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
||||
@ -19,4 +19,5 @@ HEADERS += mapgraphicitem.h \
|
||||
QT += opengl
|
||||
QT += network
|
||||
QT += sql
|
||||
QT += svg
|
||||
RESOURCES += mapresources.qrc
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
namespace mapcontrol
|
||||
{
|
||||
|
||||
OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config):QGraphicsView(parent),configuration(config),followmouse(true)
|
||||
OPMapWidget::OPMapWidget(QWidget *parent, Configuration *config):QGraphicsView(parent),configuration(config),followmouse(true),compass(0)
|
||||
{
|
||||
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
|
||||
core=new internals::Core;
|
||||
@ -52,6 +52,7 @@ namespace mapcontrol
|
||||
connect(map->core,SIGNAL(OnTileLoadStart()),this,SIGNAL(OnTileLoadStart()));
|
||||
connect(map->core,SIGNAL(OnTilesStillToLoad(int)),this,SIGNAL(OnTilesStillToLoad(int)));
|
||||
this->setMouseTracking(followmouse);
|
||||
SetShowCompass(true);
|
||||
}
|
||||
|
||||
void OPMapWidget::resizeEvent(QResizeEvent *event)
|
||||
@ -60,6 +61,9 @@ namespace mapcontrol
|
||||
scene()->setSceneRect(
|
||||
QRect(QPoint(0, 0), event->size()));
|
||||
QGraphicsView::resizeEvent(event);
|
||||
if(compass)
|
||||
compass->setScale(0.1+0.05*(qreal)(event->size().width())/1000*(qreal)(event->size().height())/600);
|
||||
|
||||
}
|
||||
QSize OPMapWidget::sizeHint() const
|
||||
{
|
||||
@ -204,8 +208,33 @@ namespace mapcontrol
|
||||
connect(this,SIGNAL(WPInserted(int,WayPointItem*)),item,SLOT(WPInserted(int,WayPointItem*)));
|
||||
connect(this,SIGNAL(WPNumberChanged(int,int,WayPointItem*)),item,SLOT(WPRenumbered(int,int,WayPointItem*)));
|
||||
connect(this,SIGNAL(WPDeleted(int)),item,SLOT(WPDeleted(int)));
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////
|
||||
|
||||
void OPMapWidget::SetShowCompass(const bool &value)
|
||||
{
|
||||
if(value)
|
||||
{
|
||||
compass=new QGraphicsSvgItem(QString::fromUtf8(":/markers/images/compas.svg"));
|
||||
compass->setScale(0.1+0.05*(qreal)(this->size().width())/1000*(qreal)(this->size().height())/600);
|
||||
// compass->setTransformOriginPoint(compass->boundingRect().width(),compass->boundingRect().height());
|
||||
compass->setFlag(QGraphicsItem::ItemIsMovable,true);
|
||||
mscene.addItem(compass);
|
||||
compass->setTransformOriginPoint(compass->boundingRect().width()/2,compass->boundingRect().height()/2);
|
||||
compass->setPos(55-compass->boundingRect().width()/2,55-compass->boundingRect().height()/2);
|
||||
compass->setZValue(3);
|
||||
compass->setOpacity(0.7);
|
||||
|
||||
}
|
||||
if(!value && compass)
|
||||
{
|
||||
delete compass;
|
||||
}
|
||||
}
|
||||
void OPMapWidget::SetRotate(qreal const& value)
|
||||
{
|
||||
map->mapRotate(value);
|
||||
if(compass)
|
||||
compass->setRotation(value);
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
#include <QObject>
|
||||
#include <QtOpenGL/QGLWidget>
|
||||
#include "waypointitem.h"
|
||||
#include "QtSvg/QGraphicsSvgItem"
|
||||
namespace mapcontrol
|
||||
{
|
||||
/**
|
||||
@ -191,7 +192,7 @@ namespace mapcontrol
|
||||
void SetZoom(double const& value){map->SetZoom(value);}
|
||||
|
||||
qreal Rotate(){return map->rotation;}
|
||||
void SetRotate(qreal const& value){map->mapRotate(value);}
|
||||
void SetRotate(qreal const& value);
|
||||
|
||||
void ReloadMap(){map->ReloadMap(); map->resize();}
|
||||
|
||||
@ -301,6 +302,8 @@ namespace mapcontrol
|
||||
*/
|
||||
void WPRenumber(WayPointItem* item,int const& newnumber);
|
||||
|
||||
void SetShowCompass(bool const& value);
|
||||
|
||||
private:
|
||||
internals::Core *core;
|
||||
MapGraphicItem *map;
|
||||
@ -312,8 +315,8 @@ namespace mapcontrol
|
||||
internals::PointLatLng currentmouseposition;
|
||||
bool followmouse;
|
||||
void ConnectWP(WayPointItem* item);
|
||||
|
||||
WayPointItem* item;//apagar
|
||||
QGraphicsSvgItem *compass;
|
||||
// WayPointItem* item;//apagar
|
||||
protected:
|
||||
void resizeEvent(QResizeEvent *event);
|
||||
void showEvent ( QShowEvent * event );
|
||||
|
||||
@ -33,7 +33,6 @@ namespace mapcontrol
|
||||
text=0;
|
||||
numberI=0;
|
||||
picture.load(QString::fromUtf8(":/markers/images/marker.png"));
|
||||
RefreshToolTip();
|
||||
number=WayPointItem::snumber;
|
||||
++WayPointItem::snumber;
|
||||
this->setFlag(QGraphicsItem::ItemIsMovable,true);
|
||||
@ -42,6 +41,7 @@ namespace mapcontrol
|
||||
// transf.translate(picture.width()/2,picture.height());
|
||||
// this->setTransform(transf);
|
||||
SetShowNumber(shownumber);
|
||||
RefreshToolTip();
|
||||
RefreshPos();
|
||||
}
|
||||
WayPointItem::WayPointItem(const internals::PointLatLng &coord,int const& altitude, const QString &description, MapGraphicItem *map):coord(coord),reached(false),description(description),shownumber(true),isDragging(false),altitude(altitude),map(map)
|
||||
@ -49,7 +49,6 @@ namespace mapcontrol
|
||||
text=0;
|
||||
numberI=0;
|
||||
picture.load(QString::fromUtf8(":/markers/images/marker.png"));
|
||||
RefreshToolTip();
|
||||
number=WayPointItem::snumber;
|
||||
++WayPointItem::snumber;
|
||||
this->setFlag(QGraphicsItem::ItemIsMovable,true);
|
||||
@ -58,6 +57,7 @@ namespace mapcontrol
|
||||
//transf.translate(picture.width()/2,picture.height());
|
||||
// this->setTransform(transf);
|
||||
SetShowNumber(shownumber);
|
||||
RefreshToolTip();
|
||||
RefreshPos();
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user