From f8b4caf4ef7eed3cd42f596dbcc22b8a051dd29b Mon Sep 17 00:00:00 2001
From: tecnosapiens <jfroblesc@gmail.com>
Date: Fri, 19 Nov 2010 18:46:34 -0600
Subject: [PATCH] working on camera interface

---
 qgroundcontrol.pro   | 9 ++++++---
 src/uas/SlugsMAV.cc  | 1 +
 src/ui/MainWindow.cc | 9 +++++++++
 src/ui/MainWindow.h  | 3 +++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 200bf0a4b..3d9468c1f 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -140,7 +140,8 @@ FORMS += src/ui/MainWindow.ui \
     src/ui/SlugsDataSensorView.ui \
     src/ui/SlugsHilSim.ui \
     src/ui/SlugsDataSensorView.ui \
-    src/ui/SlugsPIDControl.ui
+    src/ui/SlugsPIDControl.ui \
+    src/ui/SlugsVideoCamControl.ui
 INCLUDEPATH += src \
     src/ui \
     src/ui/linechart \
@@ -242,7 +243,8 @@ HEADERS += src/MG.h \
     src/comm/QGCMAVLink.h\
     src/ui/SlugsDataSensorView.h \
     src/ui/SlugsHilSim.h \
-    src/ui/SlugsPIDControl.h
+    src/ui/SlugsPIDControl.h \
+    src/ui/SlugsVideoCamControl.h
 SOURCES += src/main.cc \
     src/Core.cc \
     src/uas/UASManager.cc \
@@ -324,7 +326,8 @@ SOURCES += src/main.cc \
     src/ui/map3D/Imagery.cc \
     src/ui/SlugsDataSensorView.cc \
     src/ui/SlugsHilSim.cc \
-    src/ui/SlugsPIDControl.cpp
+    src/ui/SlugsPIDControl.cpp \
+    src/ui/SlugsVideoCamControl.cpp
 
 RESOURCES = mavground.qrc
 
diff --git a/src/uas/SlugsMAV.cc b/src/uas/SlugsMAV.cc
index 24355ce69..877d1beb4 100644
--- a/src/uas/SlugsMAV.cc
+++ b/src/uas/SlugsMAV.cc
@@ -6,6 +6,7 @@ SlugsMAV::SlugsMAV(MAVLinkProtocol* mavlink, int id) :
         UAS(mavlink, id)//,
         // Place other initializers here
 {
+
 }
 
 /**
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 198cbecb6..3481f7675 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -187,6 +187,9 @@ void MainWindow::buildWidgets()
     slugsHilSimWidget = new QDockWidget(tr("Slugs Hil Sim"), this);
     slugsHilSimWidget->setWidget( new SlugsHilSim(this));
 
+    slugsCamControlWidget = new QDockWidget(tr("Video Camera Control"), this);
+    slugsCamControlWidget->setWidget(new SlugsVideoCamControl(this));
+
 }
 
 /**
@@ -932,6 +935,12 @@ void MainWindow::loadGlobalOperatorView()
         slugsPIDControlWidget->show();
     }
 
+    if (slugsCamControlWidget)
+    {
+        addDockWidget(Qt::RightDockWidgetArea, slugsCamControlWidget);
+        slugsCamControlWidget->show();
+    }
+
 
 
 //    // UAS CONTROL
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 15371a0bc..1879b178b 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -71,6 +71,8 @@ This file is part of the QGROUNDCONTROL project
 
 #include "slugshilsim.h"
 
+#include "SlugsVideoCamControl.h"
+
 
 
 /**
@@ -187,6 +189,7 @@ protected:
     QPointer<QDockWidget> slugsDataWidget;
     QPointer<QDockWidget> slugsPIDControlWidget;
     QPointer<QDockWidget> slugsHilSimWidget;
+    QPointer<QDockWidget> slugsCamControlWidget;
 
 
     // Popup widgets
-- 
2.22.0