Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 357 → Rev 358

/QMK-Groundstation/trunk/Forms/dlg_Map.cpp
27,9 → 27,6
cb_Maps->removeItem(3);
cb_Maps->removeItem(2);
 
// Noch nicht eingebaut also Button weg.
pb_SendWaypoints->setVisible(false);
 
pb_Add->setEnabled(false);
pb_Goto->setEnabled(false);
}
46,6 → 43,7
connect(pb_Add, SIGNAL(clicked()), this, SLOT(slot_AddWayPoint()));
connect(pb_Delete, SIGNAL(clicked()), this, SLOT(slot_DeleteWayPoints()));
connect(pb_Goto, SIGNAL(clicked()), this, SLOT(slot_GotoTarget()));
connect(pb_SendWaypoints, SIGNAL(clicked()), this, SLOT(slot_SendWayPoints()));
connect(cb_Maps, SIGNAL(currentIndexChanged(int)), this, SLOT(slot_ChangeMap(int)));
connect(this, SIGNAL(rejected()), this, SLOT(slot_Close()));
 
85,9 → 83,9
 
WayPoint.Longitude = x;
WayPoint.Latitude = y;
WayPoint.Time = sb_Time->value();
// WayPoint.Time = sb_Time->value();
 
l_WayPoint.append(WayPoint);
l_Track.append(WayPoint);
 
o_Route->removeGeometry(l_RouteFL);
p_RouteFL.append(new Point(x,y));
122,6 → 120,14
// Waypoint zur Liste hinzufügen
void dlg_Map::slot_AddWayPoint()
{
sWayPoint WayPoint;
 
WayPoint.Longitude = LastClick->longitude();
WayPoint.Latitude = LastClick->latitude();
WayPoint.Time = sb_Time->value();
 
l_WayPoints.append(WayPoint);
 
o_Route->removeGeometry(l_RouteWP);
 
p_RouteWP.append(LastClick);
129,6 → 135,8
 
o_Route->addGeometry(l_RouteWP);
o_Map->updateRequestNew();
 
pb_SendWaypoints->setEnabled(true);
}
 
// Waypoint-Liste löschen
136,10 → 144,15
{
o_Route->removeGeometry(l_RouteWP);
p_RouteWP.clear();
l_WayPoint.clear();
l_WayPoints.clear();
o_Map->updateRequestNew();
}
 
void dlg_Map::slot_SendWayPoints()
{
emit(set_WayPoints(l_WayPoints));
}
 
// Zum Zielpunkt fliegen
void dlg_Map::slot_GotoTarget()
{
215,7 → 228,6
break;
case 1 : // Yahoo Sat
{
// o_Adapter = new WMSMapAdapter("openaerialmap.org", "/wms/wms.asp?wms=WorldMap&LAYERS=world&FORMAT=image/png&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&STYLES=&EXCEPTIONS=application/vnd.ogc.se_inimage&SRS=EPSG:4326&TRANSPARENT=FALSE", 256);
o_Adapter = new TileMapAdapter("tile.openaerialmap.org", "/tiles/1.0.0/openaerialmap-900913/%1/%2/%3.png", 256, 0, 17);
}
break;