diff --git a/lib/QMapControl/src/mapnetwork.cpp b/lib/QMapControl/src/mapnetwork.cpp index f1430d05ab8bc143b4d58a4295c7b9eb5debb27f..872529f4e27c4862ccb982264664b3b0c8f728de 100644 --- a/lib/QMapControl/src/mapnetwork.cpp +++ b/lib/QMapControl/src/mapnetwork.cpp @@ -95,7 +95,7 @@ namespace qmapcontrol } else { - qDebug() << "NETWORK_PIXMAP_ERROR: " << ax; + //qDebug() << "NETWORK_PIXMAP_ERROR: " << ax; } } diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri index 970583dad22ac85902f1c8a78e31df6f2232aa56..cfff3f5eee00acd427e10765c09263069f7f9856 100644 --- a/qgroundcontrol.pri +++ b/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 diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 24eec4e0b881710056e1034135fd2b27584c1778..adcf845df69e41de30a3962706a2ebb4288adc02 100644 --- a/src/ui/MainWindow.cc +++ b/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))); diff --git a/src/ui/SlugsVideoCamControl.cpp b/src/ui/SlugsVideoCamControl.cpp index 30ea6cb47dc0be103ae1ac4bb6f580b88c8a3098..1eb0b5264e29a990e0e11e6a56933242f4ae0f46 100644 --- a/src/ui/SlugsVideoCamControl.cpp +++ b/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(); diff --git a/src/ui/WaypointList.cc b/src/ui/WaypointList.cc index 35d0d876ad36f1ec5b74f72db82d2d3350dca314..700bde5f5f784feef3c3ea1b6b95140c04871978 100644 --- a/src/ui/WaypointList.cc +++ b/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; }