Permalink
Browse files

General work on AR.Drone

  • Loading branch information...
1 parent 6396175 commit 7dd22f4b591215c297bdfe2c2c45c77e1afc552b @bmcdorman bmcdorman committed Mar 20, 2013
@@ -0,0 +1,26 @@
+#ifndef _ACCESSORIESWIDGET_H_
+#define _ACCESSORIESWIDGET_H_
+
+#include "StandardWidget.h"
+
+namespace Ui
+{
+ class AccessoriesWidget;
+}
+
+class AccessoriesWidget : public StandardWidget
+{
+Q_OBJECT
+public:
+ AccessoriesWidget(Device *device, QWidget *parent = 0);
+ ~AccessoriesWidget();
+
+private slots:
+ void create();
+ void ardrone();
+
+private:
+ Ui::AccessoriesWidget *ui;
+};
+
+#endif
View
@@ -0,0 +1,13 @@
+#ifndef _CAMERAINPUTMODEL_H_
+#define _CAMERAINPUTMODEL_H_
+
+#include <QStandardItemModel>
+
+class CameraInputModel : public QStandardItemModel
+{
+public:
+ CameraInputModel(QObject *parent = 0);
+ ~CameraInputModel();
+};
+
+#endif
@@ -0,0 +1,18 @@
+#ifndef _CAMERAINPUTSELECTORWIDGET_H_
+#define _CAMERAINPUTSELECTORWIDGET_H_
+
+#include "StandardWidge.h"
+
+class CameraInputSelectorWidget
+{
+public:
+ CameraInputSelectorWidget(Device *device, QWidget *parent = 0);
+ ~CameraInputSelectorWidget();
+
+
+
+private slots:
+
+};
+
+#endif
View
@@ -0,0 +1,19 @@
+#ifndef _CREATEWIDGET_H_
+#define _CREATEWIDGET_H_
+
+#include "StandardWidget.h"
+
+class CreateWidget : public StandardWidget
+{
+ Q_OBJECT
+public:
+ CreateWidget();
+ ~CreateWidget();
+
+private slots:
+ void drive();
+
+private:
+};
+
+#endif
View
@@ -0,0 +1,28 @@
+#include "AccessoriesWidget.h"
+#include "ui_AccessoriesWidget.h"
+
+#include "RootController.h"
+#include "CreateWidget.h"
+
+AccessoriesWidget::AccessoriesWidget(Device *device, QWidget *parent)
+ : StandardWidget(device, parent),
+ ui(new Ui::AccessoriesWidget)
+{
+ ui->setupUi(this);
+ performStandardSetup(tr("Accessories"));
+}
+
+AccessoriesWidget::~AccessoriesWidget()
+{
+ delete ui;
+}
+
+void AccessoriesWidget::create()
+{
+ RootController::ref().presentWidget(new CreateWidget());
+}
+
+void AccessoriesWidget::ardrone()
+{
+
+}
View
@@ -325,6 +325,8 @@ Network NetworkManager::networkFromConnection(const Connection &connection) cons
Network network;
network.setSsid(connection["802-11-wireless"]["ssid"].toString());
network.setMode(modeMap[connection["802-11-wireless"]["mode"].toString()]);
+ qDebug() << "Connection" << connection["802-11-wireless"]["ssid"].toString()
+ << connection["802-11-wireless-security"]["security"].toString();
network.setSecurity(securityMap[connection["802-11-wireless-security"]["security"].toString()]);
// Technically, password only applies to WEP connections. We always store both password
// and psk, however, so it is a somewhat safe assumption to only try the password
View
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AccessoriesWidget</class>
+ <widget class="QWidget" name="AccessoriesWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>320</width>
+ <height>240</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Accessories</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>6</number>
+ </property>
+ <property name="rightMargin">
+ <number>6</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_2">
+ <property name="text">
+ <string>iRobot® Create™</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton">
+ <property name="text">
+ <string>Parrot® AR.Drone™</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CameraInputSelectorWidget</class>
+ <widget class="QWidget" name="CameraInputSelectorWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>320</width>
+ <height>240</height>
+ </rect>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>320</width>
+ <height>240</height>
+ </size>
+ </property>
+ <property name="windowTitle">
+ <string>Camera Input Selector</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
+ <property name="margin">
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QWidget" name="camera" native="true"/>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Source:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="source">
+ <item>
+ <property name="text">
+ <string>USB Camera</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Parrot® AR.Drone™ Front Camera</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Parrot® AR.Drone™ Bottom Camera</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
View
@@ -63,6 +63,34 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="mouse">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Mouse</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../rc/icons.qrc">
+ <normaloff>:/icons/mouse.png</normaloff>:/icons/mouse.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="keyboard">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Keyboard</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../rc/icons.qrc">
+ <normaloff>:/icons/keyboard.png</normaloff>:/icons/keyboard.png</iconset>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">

0 comments on commit 7dd22f4

Please sign in to comment.