WebSVN - Projects - Diff - Rev 305 and 306 - /QMK-Groundstation/trunk/Forms/dlg

 dlg_Map::dlg_Map(QWidget *parent) : QDialog(parent)
+{
+    setupUi(this);
+    // Kartenwahl ausschalten
+    lb_Maps->setVisible(false);
+    cb_Maps->setVisible(false);
+    // Noch nicht eingebaut also Button weg.
+    pb_SendWaypoints->setVisible(false);
+    pb_Add->setEnabled(false);
+    pb_Goto->setEnabled(false);
+}
+// Karte erstellen und anzeigen
+void dlg_Map::create_Map(cSettings *t_Settings)
+{
+    o_Settings = t_Settings;
+    cb_CenterPos->setChecked(o_Settings->Map.GotoPosition);
-    setupUi(this);
+    cb_ShowRoute->setChecked(o_Settings->Map.ShowTrack);
     connect(sl_Zoom,   SIGNAL(valueChanged(int)), this, SLOT(slot_Zoom(int)));
+    connect(pb_Add,    SIGNAL(clicked()), this, SLOT(slot_AddWayPoint()));
-    connect(pb_Add,    SIGNAL(clicked()), this, SLOT(slot_AddWP()));
+    connect(pb_Delete, SIGNAL(clicked()), this, SLOT(slot_DeleteWayPoints()));
+    connect(pb_Goto,   SIGNAL(clicked()), this, SLOT(slot_GotoTarget()));
-    connect(pb_Delete, SIGNAL(clicked()), this, SLOT(slot_DeleteWP()));
     connect(cb_Maps,   SIGNAL(currentIndexChanged(int)), this, SLOT(slot_ChangeMap(int)));
+    connect(this,      SIGNAL(rejected()), this, SLOT(slot_Close()));
     o_Map = new MapControl(w_Map->size());
-//    o_Map = new MapControl(QSize(500,300));
-    o_Map = new MapControl(w_Map->size());
+    o_Map->enablePersistentCache(o_Settings->DIR.Cache);
     o_Map->showScale(true);
     o_Adapter = new OSMMapAdapter();
     l_Map->addWidget(o_Map);
-    sl_Zoom->setValue(17);
     QDir path = QDir::homePath() + "/.QMK-Cache";
-    o_Map->enablePersistentCache(path);
+    sl_Zoom->setValue(17);
     Pen[0] = new QPen(QColor(0,0,255,255));
-    Pen[0]->setWidth(2);
-    Pen[1] = new QPen(QColor(255,0,0,255));
+    Pen[0]->setWidth(2);
+    Pen[1] = new QPen(QColor(255,0,0,255));
     Pen[1]->setWidth(2);
+}
+// Position zum Flug-Track hinzufügen
+void dlg_Map::add_Position(double x, double y)
+{
+    sWayPoint WayPoint;
+    WayPoint.Longitude = x;
+    WayPoint.Latitude = y;
     WayPoint.Time = sb_Time->value();
-void dlg_Map::add_Position(double x, double y)
+    l_WayPoint.append(WayPoint);
         o_Route->addGeometry(l_RouteFL);
+    }
     o_Map->updateRequestNew();
+}
+// Zoom der Karte ändern
-void dlg_Map::slot_Zoom(int i_Zoom)
+void dlg_Map::slot_Zoom(int t_Zoom)
 {
-    o_Map->setZoom(i_Zoom);
+    o_Map->setZoom(t_Zoom);
+}
-}
 // Waypoint zur Liste hinzufügen
-void dlg_Map::slot_AddWP()
+void dlg_Map::slot_AddWayPoint()
+{
     o_Route->removeGeometry(l_RouteWP);
     p_RouteWP.append(LastClick);
     l_RouteWP = new LineString(p_RouteWP, "", Pen[0]);
+    o_Route->addGeometry(l_RouteWP);
-    o_Route->addGeometry(l_RouteWP);
+    o_Map->updateRequestNew();
     o_Map->updateRequestNew();
+// Waypoint-Liste löschen
 void dlg_Map::slot_DeleteWayPoints()
 void dlg_Map::slot_DeleteWP()
+    o_Route->removeGeometry(l_RouteWP);
+    p_RouteWP.clear();
+    l_WayPoint.clear();
+    o_Map->updateRequestNew();
+}
+// Zum Zielpunkt fliegen
+void dlg_Map::slot_GotoTarget()
+{
+    sWayPoint Target;
+    Target.Longitude = LastClick->longitude();
+    Target.Latitude = LastClick->latitude();
     Target.Time = sb_Time->value();
     o_Route->removeGeometry(l_RouteWP);
-    p_RouteWP.clear();
+    emit(set_Target(Target));
     o_Map->updateRequestNew();
 // Click in der Karte
+void dlg_Map::slot_Click(const QMouseEvent* Event, const QPointF Coord)
 void dlg_Map::slot_Click(const QMouseEvent* Event, const QPointF Coord)
     if ((Event->type() == QEvent::MouseButtonPress) && ((Event->button() == Qt::RightButton) || (Event->button() == Qt::MidButton)))
-    if ((Event->type() == QEvent::MouseButtonPress) && ((Event->button() == Qt::RightButton) || (Event->button() == Qt::MidButton)))
+    {
+        sl_Zoom->setValue(o_Adapter->adaptedZoom());
+    }
-    {
+    // Überwachen ob Karte verschoben wird
+    if ((Event->type() == QEvent::MouseButtonPress) && (Event->button() == Qt::LeftButton))
+    {
-        sl_Zoom->setValue(o_Adapter->adaptedZoom());
+        MapCenter = o_Map->currentCoordinate();
+    }
-    }
+    // Nur wenn nicht Verschoben dann einen Punkt setzen
+    if ((Event->type() == QEvent::MouseButtonRelease) && (Event->button() == Qt::LeftButton))
+    {
+        if (o_Map->currentCoordinate() == MapCenter)
+        {
+            pb_Add->setEnabled(true);
-    if ((Event->type() == QEvent::MouseButtonPress) && (Event->button() == Qt::LeftButton))
+            pb_Goto->setEnabled(true);
             o_Click->removeGeometry(ClickPoint);
-        o_Click->removeGeometry(LastPoint);
+            ClickPoint = new CirclePoint(Coord.x(), Coord.y(), 6, "P1", Point::Middle, Pen[1]);
+//            LastPoint = P;
             LastClick = new Point(Coord.x(), Coord.y());
-        Point* P = new CirclePoint(Coord.x(), Coord.y(), 3, "P1", Point::Middle, Pen[1]);
+            ClickPoint->setBaselevel(o_Adapter->adaptedZoom());
-        LastPoint = P;
+            o_Click->addGeometry(ClickPoint);
+        }
         LastClick = new Point(Coord.x(), Coord.y());
+    o_Map->updateRequestNew();
-        P->setBaselevel(o_Adapter->adaptedZoom());
+//    qDebug(QString("%1").arg(Coord.x()).toLatin1().data());
-        o_Click->addGeometry(P);
+//    qDebug(QString("%1").arg(Coord.y()).toLatin1().data());
-    }
-    o_Map->updateRequestNew();
-}
-void dlg_Map::resizeEvent ( QResizeEvent * event )
+}
-{
-//    o_Map->resize(event->size());
-    o_Map->resize(w_Map->size() - QSize(20,20));
-}
-void dlg_Map::slot_ChangeMap(int Set)
-{
-   switch(Set)
-   {
-       case 0 :
-       {
-            int zoom = o_Adapter->adaptedZoom();
+// auf Veränderung der Fenstergröße reagieren
+void dlg_Map::resizeEvent ( QResizeEvent * event )
+{
+    event = event;
+    o_Map->resize(w_Map->size() - QSize(20,20));
+}
+// Karte wechseln
+void dlg_Map::slot_ChangeMap(int t_Set)
+{
+    int zoom = o_Adapter->adaptedZoom();
+    QPointF a = o_Map->currentCoordinate();
+    o_Map->setZoom(0);
+    switch(t_Set)
+    {
+        case 0 : // OpenStreetMap
+        {
+            o_Adapter = new OSMMapAdapter();
             o_Map->setZoom(0);
-            o_Adapter = new OSMMapAdapter();
-            o_Layer->setMapAdapter(o_Adapter);
-            o_Map->updateRequestNew();
+        break;
-            o_Map->setZoom(zoom);
+        case 1 : // Google Maps
-       }
+        {
-       break;
+            o_Adapter = new GoogleMapAdapter();
-       case 1 :
-       {
-            int zoom = o_Adapter->adaptedZoom();
-            o_Map->setZoom(0);
             o_Adapter = new YahooMapAdapter();
-            o_Layer->setMapAdapter(o_Adapter);
-            o_Map->updateRequestNew();
-            o_Map->setZoom(zoom);
-       }
+        break;
-       break;
+        case 2 : // Google Sat
-       case 2 :
-       {
+        {
-            int zoom = o_Adapter->adaptedZoom();
-            QPointF a = o_Map->currentCoordinate();
+            o_Adapter = new GoogleSatMapAdapter();
+        }
+        break;
-            o_Map->setZoom(0);
+        case 3 : // Yahoo Maps
+        {
+            o_Adapter = new YahooMapAdapter();
-            o_Adapter = new YahooMapAdapter("us.maps3.yimg.com", "/aerial.maps.yimg.com/png?v=1.7&t=a&s=256&x=%2&y=%3&z=%1");
+        }
-            o_Layer->setMapAdapter(o_Adapter);
+        break;
+        case 4 : // Yahoo Sat
+        {
+            o_Adapter = new YahooMapAdapter("us.maps3.yimg.com", "/aerial.maps.yimg.com/png?v=1.7&t=a&s=256&x=%2&y=%3&z=%1");
-            o_Map->updateRequestNew();
+        }
-            o_Map->setZoom(zoom);
         break;
+    }

Subversion Repositories Projects

(root)/QMK-Groundstation/trunk/Forms/dlg_Map.cpp - Rev 305 → 306