Finished making changes to use new GoogleEarth and OSG views. None of them yet working

lib/QMapControl/src/mapnetwork.cpp

@@ -95,7 +95,7 @@ namespace qmapcontrol
                     }
                     else
                     {
-                        qDebug() << "NETWORK_PIXMAP_ERROR: " << ax;
+                        //qDebug() << "NETWORK_PIXMAP_ERROR: " << ax;
                     }
                 }
 

qgroundcontrol.pri

@@ -123,10 +123,11 @@ macx {
             -framework GEOS \
             -framework SQLite3 \
             -framework osgFX \
-            -framework osgTerrain \
+            -framework osgTerrain
     DEFINES += QGC_OSGEARTH_ENABLED
     }
 
+
     exists(/opt/local/include/libfreenect) {
     message("Building support for libfreenect")
     DEPENDENCIES_PRESENT += libfreenect

src/ui/MainWindow.cc

@@ -235,7 +235,7 @@ void MainWindow::connectWidgets()
         connect(waypointsDockWidget->widget(), SIGNAL(createWaypointAtMap(QPointF)), mapWidget, SLOT(createWaypointGraphAtMap(QPointF)));
         // it notifies that a waypoint global change it¥s position by spinBox on Widget WaypointView
         //connect(waypointsDockWidget->widget(), SIGNAL(changePositionWPGlobalBySpinBox(int,float,float)), mapWidget, SLOT(changeGlobalWaypointPositionBySpinBox(int,float,float)));
-        connect(waypointsDockWidget->widget(), SIGNAL(changePositionWPGlobalBySpinBox(int,float,float)), mapWidget, SLOT(changeGlobalWaypointPositionBySpinBox(int,float,float)));
+       // connect(waypointsDockWidget->widget(), SIGNAL(changePositionWPGlobalBySpinBox(int,float,float)), mapWidget, SLOT(changeGlobalWaypointPositionBySpinBox(int,float,float)));
 
         connect(slugsCamControlWidget->widget(),SIGNAL(viewCamBorderAtMap(bool)),mapWidget,SLOT(drawBorderCamAtMap(bool)));
          connect(slugsCamControlWidget->widget(),SIGNAL(changeCamPosition(double,double,QString)),mapWidget,SLOT(updateCameraPosition(double,double, QString)));

src/ui/SlugsVideoCamControl.cpp

@@ -19,13 +19,13 @@
 
 SlugsVideoCamControl::SlugsVideoCamControl(QWidget *parent) :
     QWidget(parent),
-    ui(new Ui::SlugsVideoCamControl),
-    dragging(0)
+    ui(new Ui::SlugsVideoCamControl)
+    //dragging(0)
 
 {
     ui->setupUi(this);
-   x1= 0;
-   y1 = 0;
+//   x1= 0;
+//   y1 = 0;
     connect(ui->viewCamBordeatMap_checkBox,SIGNAL(clicked(bool)),this,SLOT(changeViewCamBorderAtMapStatus(bool)));
 //    tL = ui->padCamContro_frame->frameGeometry().topLeft();
 //    bR = ui->padCamContro_frame->frameGeometry().bottomRight();

src/ui/WaypointList.cc

@@ -487,10 +487,10 @@ void WaypointList::on_clearWPListButton_clicked()
         }
     else
     {
-        if(isGlobalWP)
-        {
-           emit clearPathclicked();
-        }
+//        if(isGlobalWP)
+//        {
+//           emit clearPathclicked();
+//        }
     }
 }
 
@@ -573,5 +573,5 @@ void WaypointList::setIsLoadFileWP()
 
 void WaypointList::setIsReadGlobalWP(bool value)
 {
-    readGlobalWP = value;
+   // readGlobalWP = value;
 }