Merge branch 'master' of git://github.com/tecnosapiens/qgroundcontrol

lib/QMapControl/src/geometry.cpp

@@ -29,9 +29,9 @@ namespace qmapcontrol
     Geometry::Geometry(QString name)
         : GeometryType("Geometry"), myparentGeometry(0), mypen(0), visible(true), myname(name)
     {
+        myIndex = name.toInt(0,10);
     }
 
-
     Geometry::~Geometry()
     {
     }
@@ -40,6 +40,11 @@ namespace qmapcontrol
     {
         return myname;
     }
+    int Geometry::get_myIndex() const
+    {
+        return myIndex;
+    }
+
     Geometry* Geometry::parentGeometry() const
     {
         return myparentGeometry;
@@ -85,4 +90,5 @@ namespace qmapcontrol
     {
         return mypen;
     }
+
 }

lib/QMapControl/src/geometry.h

@@ -49,6 +49,7 @@ namespace qmapcontrol
         Q_OBJECT
     public:
         explicit Geometry(QString name = QString());
+
         virtual ~Geometry();
 
         QString GeometryType;
@@ -74,6 +75,12 @@ namespace qmapcontrol
          */
         QString name() const;
 
+        //! returns the index of this Geometry
+        /*!
+         * @return the index of this Geometry
+         */
+        int get_myIndex() const;
+
         //! returns the parent Geometry of this Geometry
         /*!
          * A LineString is a composition of many Points. This methods returns the parent (the LineString) of a Point
@@ -123,6 +130,7 @@ namespace qmapcontrol
         QPen* mypen;
         bool visible;
         QString myname;
+        int myIndex;
         void setParentGeometry(Geometry* geom);
 
     signals:
@@ -149,6 +157,8 @@ namespace qmapcontrol
          * @param  visible if the layer should be visible
          */
         virtual void setVisible(bool visible);
+
+
     };
 }
 #endif

qgroundcontrol.pro

@@ -74,7 +74,8 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/watchdog/WatchdogView.ui \
     src/ui/QGCFirmwareUpdate.ui \
     src/ui/QGCPxImuFirmwareUpdate.ui \
-    src/ui/QGCDataPlot2D.ui
+    src/ui/QGCDataPlot2D.ui \
+    src/ui/WaypointGlobalView.ui
 INCLUDEPATH += src \
     src/ui \
     src/ui/linechart \
@@ -156,7 +157,8 @@ HEADERS += src/MG.h \
     src/ui/map/Waypoint2DIcon.h \
     src/ui/map/MAV2DIcon.h \
     src/ui/map/QGC2DIcon.h \
-    src/WaypointGlobal.h
+    src/WaypointGlobal.h \
+    src/ui/WaypointGlobalView.h
 SOURCES += src/main.cc \
     src/Core.cc \
     src/uas/UASManager.cc \
@@ -220,7 +222,8 @@ SOURCES += src/main.cc \
     src/ui/map/Waypoint2DIcon.cc \
     src/ui/map/MAV2DIcon.cc \
     src/ui/map/QGC2DIcon.cc \
-    src/WaypointGlobal.cpp
+    src/WaypointGlobal.cpp \
+    src/ui/WaypointGlobalView.cpp
 RESOURCES = mavground.qrc
 
 # Include RT-LAB Library

src/ui/MainWindow.cc

@@ -102,6 +102,10 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(waypoints, SIGNAL(clearPathclicked()), map, SLOT(clearPath()));
     // add Waypoint widget in the WaypointList widget when mouse clicked
     connect(map, SIGNAL(captureMapCoordinateClick(QPointF)), waypoints, SLOT(addWaypointMouse(QPointF)));
+    // it notifies that a waypoint global goes to do create
+    connect(map, SIGNAL(createGlobalWP(bool)), waypoints, SLOT(setIsWPGlobal(bool)));
+    connect(map, SIGNAL(sendGeometryEndDrag(QPointF,int)), waypoints, SLOT(waypointGlobalChanged(QPointF,int)) );
+
 }
 
 MainWindow::~MainWindow()

src/ui/MapWidget.cc

@@ -87,7 +87,10 @@ MapWidget::MapWidget(QWidget *parent) :
     // Set default zoom level
     mc->setZoom(16);
     // Zurich, ETH
-    mc->setView(QPointF(8.548056,47.376389));
+    //mc->setView(QPointF(8.548056,47.376389));
+
+    // Veracruz Mexico, ETH
+    mc->setView(QPointF(-96.105208,19.138955));
 
     // Add controls to select map provider
     /////////////////////////////////////////////////
@@ -299,12 +302,17 @@ void MapWidget::createPathButtonClicked(bool checked)
 {
   Q_UNUSED(checked);
 
+
+
     if (createPath->isChecked())
     {
         // change the cursor shape
         this->setCursor(Qt::PointingHandCursor);
         mc->setMouseMode(qmapcontrol::MapControl::None);
 
+        // emit signal start to create a Waypoint global
+        emit createGlobalWP(true);
+
 //        // Clear the previous WP track
 //        // TODO: Move this to an actual clear track button and add a warning dialog
 //        mc->layer("Waypoints")->clearGeometries();
@@ -315,8 +323,11 @@ void MapWidget::createPathButtonClicked(bool checked)
 
 
     } else {
+
         this->setCursor(Qt::ArrowCursor);
         mc->setMouseMode(qmapcontrol::MapControl::Panning);
+
+
     }
 
 }
@@ -345,6 +356,7 @@ void MapWidget::captureMapClick(const QMouseEvent* event, const QPointF coordina
 
     // emit signal mouse was clicked
     emit captureMapCoordinateClick(coordinate);
+
   }
 }
 
@@ -360,6 +372,10 @@ void MapWidget::captureGeometryClick(Geometry* geom, QPoint point){
 void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate){
   Q_UNUSED(coordinate);
 
+  // Refresh the screen
+  mc->updateRequestNew();
+
+  int temp = 0;
   Point* point2Find;
   point2Find = wpIndex[geom->name()];
   point2Find->setCoordinate(coordinate);
@@ -367,12 +383,18 @@ void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate){
   point2Find = dynamic_cast <Point*> (geom);
   point2Find->setCoordinate(coordinate);
 
-  // Refresh the screen
-  mc->updateRequestNew();
+ // qDebug() << geom->name();
+  temp = geom->get_myIndex();
+  //qDebug() << temp;
+  emit sendGeometryEndDrag(coordinate,temp);
+
+
 }
 
-void MapWidget::captureGeometryEndDrag(Geometry* geom, QPointF coordinate){
-  mc->setMouseMode(qmapcontrol::MapControl::Panning);
+void MapWidget::captureGeometryEndDrag(Geometry* geom, QPointF coordinate)
+{
+
+    mc->setMouseMode(qmapcontrol::MapControl::Panning);
 
 //  qDebug() << geom->name();
 //  qDebug() << geom->GeometryType;
@@ -549,4 +571,11 @@ void MapWidget::clearPath()
     mc->layer("Waypoints")->addGeometry(path);
     wpIndex.clear();
     mc->updateRequestNew();
+
+    // si el boton de crear wp globales esta activo desactivarlo llamando a su evento clicket
+    if(createPath->isChecked())
+    {
+        createPath->click();
+    }
+
 }

src/ui/MapWidget.h

@@ -116,6 +116,8 @@ protected:
   signals:
     //void movePoint(QPointF newCoord);
     void captureMapCoordinateClick(const QPointF coordinate); //ROCA
+    void createGlobalWP(bool value);
+    void sendGeometryEndDrag(const QPointF coordinate, const int index);
 
 
 private:

src/ui/WaypointList.h

@@ -41,6 +41,7 @@ This file is part of the QGROUNDCONTROL project
 #include "Waypoint.h"
 #include "UASInterface.h"
 #include "WaypointView.h"
+#include "WaypointGlobalView.h"
 
 
 namespace Ui {
@@ -75,7 +76,8 @@ public slots:
     void addCurrentPositonWaypoint();
     /** @brief Add a waypoint by mouse click over the map */
     void addWaypointMouse(QPointF coordinate);
-
+    /** @brief it notifies that a global waypoint goes to do created */
+    void setIsWPGlobal(bool value);
 
 
     //Update events
@@ -88,12 +90,19 @@ public slots:
     /** @brief The waypoint manager informs that the waypoint list was changed */
     void waypointListChanged(void);
 
+    /** @brief The MapWidget informs that a waypoint global was changed on the map */
+    void waypointGlobalChanged(const QPointF coordinate, const int indexWP);
+
+    void clearLocalWPWidget();
+
     // Waypoint operations
     void moveUp(Waypoint* wp);
     void moveDown(Waypoint* wp);
     void removeWaypoint(Waypoint* wp);
 
 
+
+
 signals:
   void clearPathclicked();
 
@@ -104,12 +113,15 @@ protected:
 
 protected:
     QMap<Waypoint*, WaypointView*> wpViews;
+    QMap<Waypoint*, WaypointGlobalView*> wpGlobalViews;
     QVBoxLayout* listLayout;
     UASInterface* uas;
     double mavX;
     double mavY;
     double mavZ;
     double mavYaw;
+    bool isGlobalWP;
+    bool isLocalWP;
 
 private:
     Ui::WaypointList *m_ui;
@@ -120,6 +132,7 @@ private:
 
 private slots:
     void on_clearWPListButton_clicked();
+
 };
 
 #endif // WAYPOINTLIST_H

src/ui/WaypointView.ui

@@ -355,7 +355,7 @@ QProgressBar::chunk#thrustBar {
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../mavground.qrc">
+         <iconset>
           <normaloff>:/images/actions/go-up.svg</normaloff>:/images/actions/go-up.svg</iconset>
         </property>
        </widget>
@@ -375,7 +375,7 @@ QProgressBar::chunk#thrustBar {
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../mavground.qrc">
+         <iconset>
           <normaloff>:/images/actions/go-down.svg</normaloff>:/images/actions/go-down.svg</iconset>
         </property>
        </widget>
@@ -395,7 +395,7 @@ QProgressBar::chunk#thrustBar {
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="../../mavground.qrc">
+         <iconset>
           <normaloff>:/images/actions/list-remove.svg</normaloff>:/images/actions/list-remove.svg</iconset>
         </property>
        </widget>
@@ -405,8 +405,6 @@ QProgressBar::chunk#thrustBar {
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../../mavground.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>