Rev 338 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 338 | Rev 358 | ||
---|---|---|---|
Line 25... | Line 25... | ||
25 | cb_Maps->removeItem(5); |
25 | cb_Maps->removeItem(5); |
26 | cb_Maps->removeItem(4); |
26 | cb_Maps->removeItem(4); |
27 | cb_Maps->removeItem(3); |
27 | cb_Maps->removeItem(3); |
28 | cb_Maps->removeItem(2); |
28 | cb_Maps->removeItem(2); |
Line 29... | Line -... | ||
29 | - | ||
30 | // Noch nicht eingebaut also Button weg. |
- | |
31 | pb_SendWaypoints->setVisible(false); |
- | |
32 | 29 | ||
33 | pb_Add->setEnabled(false); |
30 | pb_Add->setEnabled(false); |
34 | pb_Goto->setEnabled(false); |
31 | pb_Goto->setEnabled(false); |
Line 35... | Line 32... | ||
35 | } |
32 | } |
Line 44... | Line 41... | ||
44 | 41 | ||
45 | connect(sl_Zoom, SIGNAL(valueChanged(int)), this, SLOT(slot_Zoom(int))); |
42 | connect(sl_Zoom, SIGNAL(valueChanged(int)), this, SLOT(slot_Zoom(int))); |
46 | connect(pb_Add, SIGNAL(clicked()), this, SLOT(slot_AddWayPoint())); |
43 | connect(pb_Add, SIGNAL(clicked()), this, SLOT(slot_AddWayPoint())); |
47 | connect(pb_Delete, SIGNAL(clicked()), this, SLOT(slot_DeleteWayPoints())); |
44 | connect(pb_Delete, SIGNAL(clicked()), this, SLOT(slot_DeleteWayPoints())); |
- | 45 | connect(pb_Goto, SIGNAL(clicked()), this, SLOT(slot_GotoTarget())); |
|
48 | connect(pb_Goto, SIGNAL(clicked()), this, SLOT(slot_GotoTarget())); |
46 | connect(pb_SendWaypoints, SIGNAL(clicked()), this, SLOT(slot_SendWayPoints())); |
49 | connect(cb_Maps, SIGNAL(currentIndexChanged(int)), this, SLOT(slot_ChangeMap(int))); |
47 | connect(cb_Maps, SIGNAL(currentIndexChanged(int)), this, SLOT(slot_ChangeMap(int))); |
Line 50... | Line 48... | ||
50 | connect(this, SIGNAL(rejected()), this, SLOT(slot_Close())); |
48 | connect(this, SIGNAL(rejected()), this, SLOT(slot_Close())); |
51 | 49 | ||
Line 83... | Line 81... | ||
83 | { |
81 | { |
84 | sWayPoint WayPoint; |
82 | sWayPoint WayPoint; |
Line 85... | Line 83... | ||
85 | 83 | ||
86 | WayPoint.Longitude = x; |
84 | WayPoint.Longitude = x; |
87 | WayPoint.Latitude = y; |
85 | WayPoint.Latitude = y; |
Line 88... | Line 86... | ||
88 | WayPoint.Time = sb_Time->value(); |
86 | // WayPoint.Time = sb_Time->value(); |
Line 89... | Line 87... | ||
89 | 87 | ||
90 | l_WayPoint.append(WayPoint); |
88 | l_Track.append(WayPoint); |
Line 91... | Line 89... | ||
91 | 89 | ||
Line 120... | Line 118... | ||
120 | } |
118 | } |
Line 121... | Line 119... | ||
121 | 119 | ||
122 | // Waypoint zur Liste hinzufügen |
120 | // Waypoint zur Liste hinzufügen |
123 | void dlg_Map::slot_AddWayPoint() |
121 | void dlg_Map::slot_AddWayPoint() |
- | 122 | { |
|
- | 123 | sWayPoint WayPoint; |
|
- | 124 | ||
- | 125 | WayPoint.Longitude = LastClick->longitude(); |
|
- | 126 | WayPoint.Latitude = LastClick->latitude(); |
|
- | 127 | WayPoint.Time = sb_Time->value(); |
|
- | 128 | ||
- | 129 | l_WayPoints.append(WayPoint); |
|
124 | { |
130 | |
Line 125... | Line 131... | ||
125 | o_Route->removeGeometry(l_RouteWP); |
131 | o_Route->removeGeometry(l_RouteWP); |
126 | 132 | ||
Line 127... | Line 133... | ||
127 | p_RouteWP.append(LastClick); |
133 | p_RouteWP.append(LastClick); |
128 | l_RouteWP = new LineString(p_RouteWP, "", Pen[0]); |
134 | l_RouteWP = new LineString(p_RouteWP, "", Pen[0]); |
- | 135 | ||
- | 136 | o_Route->addGeometry(l_RouteWP); |
|
129 | 137 | o_Map->updateRequestNew(); |
|
Line 130... | Line 138... | ||
130 | o_Route->addGeometry(l_RouteWP); |
138 | |
131 | o_Map->updateRequestNew(); |
139 | pb_SendWaypoints->setEnabled(true); |
132 | } |
140 | } |
133 | 141 | ||
134 | // Waypoint-Liste löschen |
142 | // Waypoint-Liste löschen |
135 | void dlg_Map::slot_DeleteWayPoints() |
143 | void dlg_Map::slot_DeleteWayPoints() |
136 | { |
144 | { |
137 | o_Route->removeGeometry(l_RouteWP); |
145 | o_Route->removeGeometry(l_RouteWP); |
Line -... | Line 146... | ||
- | 146 | p_RouteWP.clear(); |
|
- | 147 | l_WayPoints.clear(); |
|
- | 148 | o_Map->updateRequestNew(); |
|
- | 149 | } |
|
- | 150 | ||
138 | p_RouteWP.clear(); |
151 | void dlg_Map::slot_SendWayPoints() |
139 | l_WayPoint.clear(); |
152 | { |
140 | o_Map->updateRequestNew(); |
153 | emit(set_WayPoints(l_WayPoints)); |
141 | } |
154 | } |
Line 213... | Line 226... | ||
213 | o_Adapter = new OSMMapAdapter(); |
226 | o_Adapter = new OSMMapAdapter(); |
214 | } |
227 | } |
215 | break; |
228 | break; |
216 | case 1 : // Yahoo Sat |
229 | case 1 : // Yahoo Sat |
217 | { |
230 | { |
218 | // 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); |
- | |
219 | o_Adapter = new TileMapAdapter("tile.openaerialmap.org", "/tiles/1.0.0/openaerialmap-900913/%1/%2/%3.png", 256, 0, 17); |
231 | o_Adapter = new TileMapAdapter("tile.openaerialmap.org", "/tiles/1.0.0/openaerialmap-900913/%1/%2/%3.png", 256, 0, 17); |
220 | } |
232 | } |
221 | break; |
233 | break; |
222 | case 2 : // Google Maps |
234 | case 2 : // Google Maps |
223 | { |
235 | { |