Skip to content

Q
qgroundcontrol
Commit 22aacd61 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Remove PIXHAWK specific board support 

This is the Pixhawk research board, not the PX4 production board.
parent 1a182ddd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5205 deletions
QGCExternalLibs.pri
View file @ 22aacd61
......@@ -31,12 +31,6 @@ else:exists(user_config.pri):infile(user_config.pri, MAVLINK_CONF) {
message($$sprintf("Using MAVLink dialect '%1' specified in user_config.pri", $$MAVLINK_CONF))
}
}
# If no valid user selection is found, default to the pixhawk if it's available.
# Note: This can be a list of several dialects.
else {
MAVLINK_CONF=pixhawk
message($$sprintf("Using default MAVLink dialect '%1'.", $$MAVLINK_CONF))
}
# Then we add the proper include paths dependent on the dialect.
INCLUDEPATH += $$MAVLINKPATH
......
qgroundcontrol.pro
View file @ 22aacd61
......@@ -243,7 +243,6 @@ INCLUDEPATH += \
src/lib/qmapcontrol \
src/ui/mavlink \
src/ui/param \
src/ui/watchdog \
src/ui/map3D \
src/ui/mission \
src/ui/designer \
......@@ -262,16 +261,12 @@ FORMS += \
src/ui/UASView.ui \
src/ui/ParameterInterface.ui \
src/ui/WaypointList.ui \
src/ui/ObjectDetectionView.ui \
src/ui/JoystickWidget.ui \
src/ui/DebugConsole.ui \
src/ui/HDDisplay.ui \
src/ui/MAVLinkSettingsWidget.ui \
src/ui/AudioOutputWidget.ui \
src/ui/QGCSensorSettingsWidget.ui \
src/ui/watchdog/WatchdogControl.ui \
src/ui/watchdog/WatchdogProcessView.ui \
src/ui/watchdog/WatchdogView.ui \
src/ui/QGCDataPlot2D.ui \
src/ui/QGCRemoteControlView.ui \
src/ui/QMap3D.ui \
......@@ -370,7 +365,6 @@ HEADERS += \
src/ui/ParameterInterface.h \
src/ui/WaypointList.h \
src/Waypoint.h \
src/ui/ObjectDetectionView.h \
src/input/JoystickInput.h \
src/ui/JoystickWidget.h \
src/ui/DebugConsole.h \
......@@ -382,10 +376,6 @@ HEADERS += \
src/ui/QGCParamWidget.h \
src/ui/QGCSensorSettingsWidget.h \
src/ui/linechart/Linecharts.h \
src/uas/PxQuadMAV.h \
src/ui/watchdog/WatchdogControl.h \
src/ui/watchdog/WatchdogProcessView.h \
src/ui/watchdog/WatchdogView.h \
src/uas/UASWaypointManager.h \
src/ui/HSIDisplay.h \
src/QGC.h \
......@@ -528,7 +518,6 @@ SOURCES += \
src/ui/ParameterInterface.cc \
src/ui/WaypointList.cc \
src/Waypoint.cc \
src/ui/ObjectDetectionView.cc \
src/input/JoystickInput.cc \
src/ui/JoystickWidget.cc \
src/ui/DebugConsole.cc \
......@@ -540,10 +529,6 @@ SOURCES += \
src/ui/QGCParamWidget.cc \
src/ui/QGCSensorSettingsWidget.cc \
src/ui/linechart/Linecharts.cc \
src/uas/PxQuadMAV.cc \
src/ui/watchdog/WatchdogControl.cc \
src/ui/watchdog/WatchdogProcessView.cc \
src/ui/watchdog/WatchdogView.cc \
src/uas/UASWaypointManager.cc \
src/ui/HSIDisplay.cc \
src/QGC.cc \
......
src/comm/MAVLinkProtocol.cc
View file @ 22aacd61
......@@ -24,7 +24,6 @@
#include "UASManager.h"
#include "UASInterface.h"
#include "UAS.h"
#include "PxQuadMAV.h"
#include "configuration.h"
#include "LinkManager.h"
#include "QGCMAVLink.h"
......
src/comm/MAVLinkSimulationLink.cc
View file @ 22aacd61
......@@ -197,10 +197,6 @@ void MAVLinkSimulationLink::mainloop()
mavlink_attitude_t attitude;
memset(&attitude, 0, sizeof(mavlink_attitude_t));
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_raw_aux_t rawAuxValues;
memset(&rawAuxValues, 0, sizeof(mavlink_raw_aux_t));
#endif
mavlink_raw_imu_t rawImuValues;
memset(&rawImuValues, 0, sizeof(mavlink_raw_imu_t));
......@@ -301,15 +297,6 @@ void MAVLinkSimulationLink::mainloop()
rawImuValues.zgyro = d;
attitude.yawspeed = ((d-29.000)/3000.0)*2.7-2.7-2.65;
}
#ifdef MAVLINK_ENABLED_PIXHAWK
if (keys.value(i, "") == "Pressure") {
rawAuxValues.baro = d;
}
if (keys.value(i, "") == "Battery") {
rawAuxValues.vbat = d;
}
#endif
if (keys.value(i, "") == "roll_IMU") {
attitude.roll = d;
}
......@@ -473,46 +460,6 @@ void MAVLinkSimulationLink::mainloop()
static int detectionCounter = 6;
if (detectionCounter % 10 == 0) {
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_pattern_detected_t detected;
detected.confidence = 5.0f;
detected.type = 0; // compiler confused into thinking type is used unitialized, bogus init to silence
if (detectionCounter == 10) {
char fileName[] = "patterns/face5.png";
memcpy(detected.file, fileName, sizeof(fileName));
detected.type = 0; // 0: Pattern, 1: Letter
} else if (detectionCounter == 20) {
char fileName[] = "7";
memcpy(detected.file, fileName, sizeof(fileName));
detected.type = 1; // 0: Pattern, 1: Letter
} else if (detectionCounter == 30) {
char fileName[] = "patterns/einstein.bmp";
memcpy(detected.file, fileName, sizeof(fileName));
detected.type = 0; // 0: Pattern, 1: Letter
} else if (detectionCounter == 40) {
char fileName[] = "F";
memcpy(detected.file, fileName, sizeof(fileName));
detected.type = 1; // 0: Pattern, 1: Letter
} else if (detectionCounter == 50) {
char fileName[] = "patterns/face2.png";
memcpy(detected.file, fileName, sizeof(fileName));
detected.type = 0; // 0: Pattern, 1: Letter
} else if (detectionCounter == 60) {
char fileName[] = "H";
memcpy(detected.file, fileName, sizeof(fileName));
detected.type = 1; // 0: Pattern, 1: Letter
detectionCounter = 0;
}
detected.detected = 1;
mavlink_msg_pattern_detected_encode(systemId, componentId, &msg, &detected);
// Allocate buffer with packet data
bufferlength = mavlink_msg_to_send_buffer(buffer, &msg);
//add data into datastream
memcpy(stream+streampointer,buffer, bufferlength);
streampointer += bufferlength;
//detectionCounter = 0;
#endif
}
detectionCounter++;
......@@ -701,14 +648,6 @@ void MAVLinkSimulationLink::writeBytes(const char* data, qint64 size)
// }
}
break;
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAVLINK_MSG_ID_MANUAL_CONTROL: {
mavlink_manual_control_t control;
mavlink_msg_manual_control_decode(&msg, &control);
// qDebug() << "\n" << "ROLL:" << control.x << "PITCH:" << control.y;
}
break;
#endif
case MAVLINK_MSG_ID_PARAM_REQUEST_LIST:
{
// qDebug() << "GCS REQUESTED PARAM LIST FROM SIMULATION";
......
src/comm/OpalLink.cc
View file @ 22aacd61
......@@ -199,47 +199,6 @@ void OpalLink::writeBytes(const char *bytes, qint64 length)
params->getParameter(OpalRT::SERVO_INPUTS, "PIT_SET4_IN").setValue(((radio.pitch[4]>900 /*in us?*/)?radio.pitch[4]/1000:radio.pitch[4]));
}
break;
#endif
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAVLINK_MSG_ID_REQUEST_DATA_STREAM: {
mavlink_request_data_stream_t stream;
mavlink_msg_request_data_stream_decode(&msg, &stream);
switch (stream.req_stream_id) {
case 0: // All data types
break;
case 1: // Raw Sensor Data
break;
case 2: // extended system status
break;
case 3: // rc channel data
sendRCValues = (stream.start_stop == 1?true:false);
break;
case 4: // raw controller
if (stream.start_stop == 1)
sendRawController = true;
else
sendRawController = false;
break;
case 5: // raw sensor fusion
break;
case 6: // position
sendPosition = (stream.start_stop == 1?true:false);
break;
case 7: // extra 1
break;
case 8: // extra 2
break;
case 9: // extra 3
break;
default:
qDebug() << __FILE__ << __LINE__ << "Received Unknown Data Strem Request with ID" << stream.req_stream_id;
}
}
break;
default: {
qDebug() << "OpalLink::writeBytes(): Unknown mavlink packet";
}
}
#endif
}
......
src/comm/QGCMAVLink.h
View file @ 22aacd61
......@@ -32,12 +32,5 @@ This file is part of the QGROUNDCONTROL project
#include <mavlink.h>
//#ifdef MAVLINK_CONF
//#define MY_MACRO(x) <x>
//#include MY_MACRO(MAVLINK_CONF)
//#include MAVLINK_CONF
//#endif
#endif // QGCMAVLINK_H
src/uas/PxQuadMAV.cc deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/uas/PxQuadMAV.h deleted 100644 → 0
View file @ 1a182ddd
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
#ifndef PXQUADMAV_H
#define PXQUADMAV_H
#include "UAS.h"
class PxQuadMAV : public UAS
{
Q_OBJECT
Q_INTERFACES(UASInterface)
public:
PxQuadMAV(MAVLinkProtocol* mavlink, QThread* thread, int id);
public slots:
/** @brief Receive a MAVLink message from this MAV */
void receiveMessage(LinkInterface* link, mavlink_message_t message);
/** @brief Send a command to an onboard process */
void sendProcessCommand(int watchdogId, int processId, unsigned int command);
signals:
void watchdogReceived(int systemId, int watchdogId, unsigned int processCount);
void processReceived(int systemId, int watchdogId, int processId, QString name, QString arguments, int timeout);
void processChanged(int systemId, int watchdogId, int processId, int state, bool muted, int crashed, int pid);
};
#endif // PXQUADMAV_H
src/uas/QGCMAVLinkUASFactory.cc
View file @ 22aacd61
......@@ -39,20 +39,6 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
uas = mav;
}
break;
case MAV_AUTOPILOT_PIXHAWK:
{
PxQuadMAV* mav = new PxQuadMAV(mavlink, worker, sysid);
// Set the system type
mav->setSystemType((int)heartbeat->type);
// Connect this robot to the UAS object
// it is IMPORTANT here to use the right object type,
// else the slot of the parent object is called (and thus the special
// packets never reach their goal)
connect(mavlink, SIGNAL(messageReceived(LinkInterface*, mavlink_message_t)), mav, SLOT(receiveMessage(LinkInterface*, mavlink_message_t)));
uas = mav;
}
break;
case MAV_AUTOPILOT_PX4:
{
QGXPX4UAS* px4 = new QGXPX4UAS(mavlink, worker, sysid);
......
src/uas/QGCMAVLinkUASFactory.h
View file @ 22aacd61
......@@ -10,7 +10,6 @@
// INCLUDE ALL MAV/UAS CLASSES USING MAVLINK
#include "UAS.h"
#include "PxQuadMAV.h"
class QGCMAVLinkUASFactory : public QObject
{
......
src/uas/UAS.h
View file @ 22aacd61
......@@ -334,65 +334,6 @@ public:
bool isRotaryWing();
bool isFixedWing();
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
px::GLOverlay getOverlay()
{
QMutexLocker locker(&overlayMutex);
return overlay;
}
px::GLOverlay getOverlay(qreal& receivedTimestamp)
{
receivedTimestamp = receivedOverlayTimestamp;
QMutexLocker locker(&overlayMutex);
return overlay;
}
px::ObstacleList getObstacleList() {
QMutexLocker locker(&obstacleListMutex);
return obstacleList;
}
px::ObstacleList getObstacleList(qreal& receivedTimestamp) {
receivedTimestamp = receivedObstacleListTimestamp;
QMutexLocker locker(&obstacleListMutex);
return obstacleList;
}
px::Path getPath() {
QMutexLocker locker(&pathMutex);
return path;
}
px::Path getPath(qreal& receivedTimestamp) {
receivedTimestamp = receivedPathTimestamp;
QMutexLocker locker(&pathMutex);
return path;
}
px::PointCloudXYZRGB getPointCloud() {
QMutexLocker locker(&pointCloudMutex);
return pointCloud;
}
px::PointCloudXYZRGB getPointCloud(qreal& receivedTimestamp) {
receivedTimestamp = receivedPointCloudTimestamp;
QMutexLocker locker(&pointCloudMutex);
return pointCloud;
}
px::RGBDImage getRGBDImage() {
QMutexLocker locker(&rgbdImageMutex);
return rgbdImage;
}
px::RGBDImage getRGBDImage(qreal& receivedTimestamp) {
receivedTimestamp = receivedRGBDImageTimestamp;
QMutexLocker locker(&rgbdImageMutex);
return rgbdImage;
}
#endif
friend class UASWaypointManager;
friend class QGCUASFileManager;
......@@ -525,28 +466,6 @@ protected: //COMMENTS FOR TEST UNIT
bool blockHomePositionChanges; ///< Block changes to the home position
bool receivedMode; ///< True if mode was retrieved from current conenction to UAS
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
px::GLOverlay overlay;
QMutex overlayMutex;
qreal receivedOverlayTimestamp;
px::ObstacleList obstacleList;
QMutex obstacleListMutex;
qreal receivedObstacleListTimestamp;
px::Path path;
QMutex pathMutex;
qreal receivedPathTimestamp;
px::PointCloudXYZRGB pointCloud;
QMutex pointCloudMutex;
qreal receivedPointCloudTimestamp;
px::RGBDImage rgbdImage;
QMutex rgbdImageMutex;
qreal receivedRGBDImageTimestamp;
#endif
/// PARAMETERS
QMap<int, QMap<QString, QVariant>* > parameters; ///< All parameters
bool paramsOnceRequested; ///< If the parameter list has been read at least once
......
src/ui/MainWindow.cc
View file @ 22aacd61
......@@ -75,9 +75,6 @@ This file is part of the QGROUNDCONTROL project
#include "Q3DWidgetFactory.h"
#endif
// FIXME Move
#include "PxQuadMAV.h"
#include "LogCompressor.h"
// Set up some constants
......@@ -1549,25 +1546,6 @@ void MainWindow::UASCreated(UASInterface* uas)
// Load default custom widgets for this autopilot type
loadCustomWidgetsFromDefaults(uas->getSystemTypeName(), uas->getAutopilotTypeName());
if (uas->getAutopilotType() == MAV_AUTOPILOT_PIXHAWK)
{
// Dock widgets
if (!detectionDockWidget)
{
detectionDockWidget = new QDockWidget(tr("Object Recognition"), this);
detectionDockWidget->setWidget( new ObjectDetectionView("files/images/patterns", this) );
detectionDockWidget->setObjectName("OBJECT_DETECTION_DOCK_WIDGET");
}
if (!watchdogControlDockWidget)
{
watchdogControlDockWidget = new QDockWidget(tr("Process Control"), this);
watchdogControlDockWidget->setWidget( new WatchdogControl(this) );
watchdogControlDockWidget->setObjectName("WATCHDOG_CONTROL_DOCKWIDGET");
}
}
// Reload view state in case new widgets were added
loadViewState();
}
......
src/ui/MainWindow.h
View file @ 22aacd61
......@@ -48,7 +48,6 @@ This file is part of the QGROUNDCONTROL project
#include "UASListWidget.h"
#include "MAVLinkProtocol.h"
#include "MAVLinkSimulationLink.h"
#include "ObjectDetectionView.h"
#include "submainwindow.h"
#include "input/JoystickInput.h"
#if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
......@@ -57,7 +56,6 @@ This file is part of the QGROUNDCONTROL project
#include "DebugConsole.h"
#include "ParameterInterface.h"
#include "HDDisplay.h"
#include "WatchdogControl.h"
#include "HSIDisplay.h"
#include "QGCRemoteControlView.h"
#include "opmapcontrol.h"
......
src/ui/ObjectDetectionView.cc deleted 100644 → 0
View file @ 1a182ddd
/*=====================================================================
PIXHAWK Micro Air Vehicle Flying Robotics Toolkit
(c) 2009, 2010 PIXHAWK PROJECT <http://pixhawk.ethz.ch>
This file is part of the PIXHAWK project
PIXHAWK is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
PIXHAWK is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with PIXHAWK. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
/**
* @file
* @brief List of detected objects
* @author Benjamin Knecht <mavteam@student.ethz.ch>
* @author Lorenz Meier <mavteam@student.ethz.ch>
* @author Fabian Landau <mavteam@student.ethz.ch>
*
*/
#include <QListView>
#include <QPixmap>
#include "ObjectDetectionView.h"
#include "ui_ObjectDetectionView.h"
#include "UASManager.h"
#include "GAudioOutput.h"
#include <QDebug>
#include <QMap>
ObjectDetectionView::ObjectDetectionView(QString folder, QWidget *parent) :
QWidget(parent),
patternList(),
letterList(),
letterTimer(),
uas(NULL),
patternFolder(folder),
separator(" "),
m_ui(new Ui::ObjectDetectionView)
{
m_ui->setupUi(this);
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setUAS(UASInterface*)));
letterTimer.start(1000);
connect(&letterTimer, SIGNAL(timeout()), this, SLOT(decreaseLetterTime()));
connect(m_ui->clearButton, SIGNAL(clicked()), this, SLOT(clearLists()));
this->setVisible(false);
}
ObjectDetectionView::~ObjectDetectionView()
{
delete m_ui;
}
void ObjectDetectionView::changeEvent(QEvent *e)
{
switch (e->type()) {
case QEvent::LanguageChange:
m_ui->retranslateUi(this);
break;
default:
break;
}
}
void ObjectDetectionView::setUAS(UASInterface* uas)
{
if (this->uas != NULL) {
disconnect(this->uas, SIGNAL(patternDetected(int, QString, float, bool)), this, SLOT(newPattern(int, QString, float, bool)));
disconnect(this->uas, SIGNAL(letterDetected(int, QString, float, bool)), this, SLOT(newLetter(int, QString, float, bool)));
}
this->uas = uas;
connect(uas, SIGNAL(patternDetected(int, QString, float, bool)), this, SLOT(newPattern(int, QString, float, bool)));
connect(uas, SIGNAL(letterDetected(int, QString, float, bool)), this, SLOT(newLetter(int, QString, float, bool)));
}
void ObjectDetectionView::newPattern(int uasId, QString patternPath, float confidence, bool detected)
{
if (detected) {
if (!patternList.contains(patternPath)) {
// Emit audio message on detection
if (detected) GAudioOutput::instance()->say("System " + QString::number(uasId) + " detected pattern " + QString(patternPath.split("/", QString::SkipEmptyParts).last()).split(".", QString::SkipEmptyParts).first());
patternList.insert(patternPath, Pattern(patternPath, confidence));
} else {
Pattern pattern = patternList.value(patternPath);
if (confidence > pattern.confidence)
pattern.confidence = confidence;
++pattern.count;
patternList.insert(patternPath, pattern);
}
// set list items
QList<Pattern> templist;
foreach (Pattern pattern, patternList)
templist.push_back(pattern);
qSort(templist);
m_ui->listWidget->clear();
foreach (Pattern pattern, templist)
m_ui->listWidget->addItem(pattern.name + separator + "(" + QString::number(pattern.count) + ")" + separator + QString::number(pattern.confidence));
// load image
QString filePath = patternFolder + "/" + patternPath.split("/", QString::SkipEmptyParts).last();
QPixmap image = QPixmap(filePath);
if (image.width() > image.height())
image = image.scaledToWidth(m_ui->imageLabel->width());
else
image = image.scaledToHeight(m_ui->imageLabel->height());
m_ui->imageLabel->setPixmap(image);
// set textlabel
QString patternName = patternPath.split("/", QString::SkipEmptyParts).last(); // Remove preceding folder names
patternName = patternName.split(".", QString::SkipEmptyParts).first(); // Remove file ending
m_ui->nameLabel->setText("Pattern: " + patternName);
}
}
void ObjectDetectionView::newLetter(int uasId, QString letter, float confidence, bool detected)
{
Q_UNUSED(confidence);
if (detected) {
if (!letterList.contains(letter)) {
// Emit audio message on detection
if (detected) GAudioOutput::instance()->say("System " + QString::number(uasId) + " detected letter " + letter);
letterList.insert(letter, Pattern(letter, 0));
} else {
Pattern pattern = letterList.value(letter);
pattern.confidence = 0;
++pattern.count;
letterList.insert(letter, pattern);
}
updateLetterList();
// display letter
m_ui->letterLabel->setText(letter);
// set textlabel
m_ui->nameLabel->setText("Letter: " + letter);
}
}
void ObjectDetectionView::decreaseLetterTime()
{
foreach (Pattern pattern, letterList) {
pattern.confidence -= 1;
letterList.insert(pattern.name, pattern);
}
updateLetterList();
}
void ObjectDetectionView::updateLetterList()
{
// set list items
QList<Pattern> templist;
foreach (Pattern pattern, letterList)
templist.push_back(pattern);
qSort(templist);
m_ui->letterListWidget->clear();
foreach (Pattern pattern, templist)
m_ui->letterListWidget->addItem(pattern.name + separator + "(" + QString::number(pattern.count) + ")" + separator + QString::number(pattern.confidence));
}
void ObjectDetectionView::clearLists()
{
patternList.clear();
letterList.clear();
m_ui->listWidget->clear();
m_ui->letterListWidget->clear();
m_ui->imageLabel->clear();;
m_ui->letterLabel->clear();
m_ui->nameLabel->clear();
}
void ObjectDetectionView::takeAction()
{
QAction* act = dynamic_cast<QAction*>(sender());
if (act) {
QString patternPath = act->text().trimmed().split(separator, QString::SkipEmptyParts).first(); // Remove additional information
QString patternName = patternPath.split("//", QString::SkipEmptyParts).last(); // Remove preceding folder names
patternName = patternName.split(".", QString::SkipEmptyParts).first(); // Remove file ending
// Set name and label
m_ui->nameLabel->setText(patternName);
m_ui->imageLabel->setPixmap(act->icon().pixmap(64, 64));
}
}
void ObjectDetectionView::resizeEvent(QResizeEvent * event )
{
if (event->isAccepted()) {
// Enforce square shape of image label
m_ui->imageLabel->resize(m_ui->imageLabel->width(), m_ui->imageLabel->width());
}
}
src/ui/ObjectDetectionView.h deleted 100644 → 0
View file @ 1a182ddd
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
/**
* @file
* @brief List of detected objects
* @author Benjamin Knecht <mavteam@student.ethz.ch>
* @author Lorenz Meier <mavteam@student.ethz.ch>
* @author Fabian Landau <mavteam@student.ethz.ch>
*
*/
#ifndef _OBJECTDETECTIONVIEW_H_
#define _OBJECTDETECTIONVIEW_H_
#include <QWidget>
#include <QResizeEvent>
#include <QMap>
#include "UASInterface.h"
namespace Ui
{
class ObjectDetectionView;
}
/**
* @brief Lists the detected objects and their confidence
*/
class ObjectDetectionView : public QWidget
{
Q_OBJECT
Q_DISABLE_COPY(ObjectDetectionView)
struct Pattern {
Pattern() : name(QString()), confidence(0.0f), count(0) {}
Pattern(QString name, float confidence) : name(name), confidence(confidence), count(1) {}
bool operator<(const Pattern& other) const {
return this->confidence > other.confidence; // this comparison is intentionally wrong to sort the QList from highest confidence to lowest
}
QString name;
float confidence;
unsigned int count;
};
public:
explicit ObjectDetectionView(QString folder="files/images/patterns", QWidget *parent = 0);
virtual ~ObjectDetectionView();
/** @brief Resize widget contents */
void resizeEvent(QResizeEvent * event );
public slots:
/** @brief Set the UAS this view is currently associated to */
void setUAS(UASInterface* uas);
/** @brief Report new detection */
void newPattern(int uasId, QString patternPath, float confidence, bool detected);
void newLetter(int uasId, QString letter, float confidence, bool detected);
void decreaseLetterTime();
void updateLetterList();
void clearLists();
/** @brief Accept an internal action, update name and preview image label */
void takeAction();
protected:
virtual void changeEvent(QEvent *e);
QMap<QString, Pattern> patternList; ///< The detected patterns with their confidence and detection count
QMap<QString, Pattern> letterList; ///< The detected letters with their confidence and detection count
QTimer letterTimer; ///< A timer to "forget" old letters
UASInterface* uas; ///< The monitored UAS
QString patternFolder; ///< The base folder where pattern images are stored in
const QString separator;
private:
Ui::ObjectDetectionView *m_ui;
};
#endif // _OBJECTDETECTIONVIEW_H_
src/ui/ObjectDetectionView.ui deleted 100644 → 0
View file @ 1a182ddd
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ObjectDetectionView</class>
<widget class="QWidget" name="ObjectDetectionView">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>246</width>
<height>403</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="3">
<widget class="QListWidget" name="listWidget"/>
</item>
<item row="1" column="0" colspan="3">
<widget class="QListWidget" name="letterListWidget"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="imageLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>10</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>110</width>
<height>110</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>2</width>
<height>2</height>
</size>
</property>
<property name="baseSize">
<size>
<width>10</width>
<height>10</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLabel" name="letterLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>10</horstretch>
<verstretch>10</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>110</width>
<height>110</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>2</width>
<height>2</height>
</size>
</property>
<property name="baseSize">
<size>
<width>10</width>
<height>10</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">font: 72pt;
color: white;</string>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="nameLabel">
<property name="text">
<string>No objects recognized</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="clearButton">
<property name="maximumSize">
<size>
<width>80</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Clear</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
src/ui/QGCRGBDView.cc
View file @ 22aacd61
......@@ -247,76 +247,5 @@ float colormapJet[128][3] = {
void QGCRGBDView::updateData(UASInterface *uas)
{
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
px::RGBDImage rgbdImage = uas->getRGBDImage();
if (rgbdImage.rows() == 0 || rgbdImage.cols() == 0 || (!rgbEnabled && !depthEnabled))
{
return;
}
QImage fill;
if (rgbEnabled)
{
// fill = QImage(reinterpret_cast<const unsigned char*>(rgbdImage.imagedata1().c_str()),
// rgbdImage.cols(), rgbdImage.rows(), QImage::Format_Mono);
// Construct PGM header
QString header("P5\n%1 %2\n%3\n");
int imgColors = 255;
header = header.arg(rgbdImage.cols()).arg(rgbdImage.rows()).arg(imgColors);
//QByteArray tmpImage(rgbdImage.imagedata1().c_str(), rgbdImage.cols()*rgbdImage.rows());
QByteArray tmpImage(header.toStdString().c_str(), header.toStdString().size());
tmpImage.append(rgbdImage.imagedata1().c_str(), rgbdImage.cols()*rgbdImage.rows());
//qDebug() << "IMAGE SIZE:" << tmpImage.size() << "HEADER SIZE: (15):" << header.size() << "HEADER: " << header;
// if (imageRecBuffer.isNull())
// {
// qDebug()<< "could not convertToPGM()";
// return QImage();
// }
if (!fill.loadFromData(tmpImage, "PGM"))
{
qDebug()<< "could not create extracted image";
// return QImage();
}
}
if (depthEnabled)
{
QByteArray coloredDepth(rgbdImage.cols() * rgbdImage.rows() * 3, 0);
for (uint32_t r = 0; r < rgbdImage.rows(); ++r)
{
const float* depth = reinterpret_cast<const float*>(rgbdImage.imagedata2().c_str() + r * rgbdImage.step2());
uint8_t* pixel = reinterpret_cast<uint8_t*>(coloredDepth.data()) + r * rgbdImage.cols() * 3;
for (uint32_t c = 0; c < rgbdImage.cols(); ++c)
{
if (depth[c] != 0)
{
int idx = fminf(depth[c], 10.0f) / 10.0f * 127.0f;
idx = 127 - idx;
pixel[0] = colormapJet[idx][2] * 255.0f;
pixel[1] = colormapJet[idx][1] * 255.0f;
pixel[2] = colormapJet[idx][0] * 255.0f;
}
pixel += 3;
}
}
fill = QImage(reinterpret_cast<const uchar*>(coloredDepth.constData()),
rgbdImage.cols(), rgbdImage.rows(), QImage::Format_RGB888);
}
glImage = QGLWidget::convertToGLFormat(fill);
#else
Q_UNUSED(uas);
#endif
}
src/ui/WaypointEditableView.cc
View file @ 22aacd61
......@@ -78,11 +78,6 @@ WaypointEditableView::WaypointEditableView(Waypoint* wp, QWidget* parent) :
m_ui->comboBox_action->addItem(tr("IF: Delay over"),MAV_CMD_CONDITION_DELAY);
//m_ui->comboBox_action->addItem(tr("IF: Yaw angle is"),MAV_CMD_CONDITION_YAW);
m_ui->comboBox_action->addItem(tr("DO: Jump to Index"),MAV_CMD_DO_JUMP);
#ifdef MAVLINK_ENABLED_PIXHAWK
m_ui->comboBox_action->addItem(tr("NAV: Sweep"),MAV_CMD_NAV_SWEEP);
m_ui->comboBox_action->addItem(tr("Do: Start Search"),MAV_CMD_DO_START_SEARCH);
m_ui->comboBox_action->addItem(tr("Do: Finish Search"),MAV_CMD_DO_FINISH_SEARCH);
#endif
m_ui->comboBox_action->addItem(tr("Other"), MAV_CMD_ENUM_END);
// add frames
......@@ -191,17 +186,6 @@ void WaypointEditableView::updateActionView(int action)
case MAV_CMD_DO_JUMP:
if(MissionDoJumpWidget) MissionDoJumpWidget->show();
break;
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAV_CMD_NAV_SWEEP:
if(MissionNavSweepWidget) MissionNavSweepWidget->show();
break;
case MAV_CMD_DO_START_SEARCH:
if(MissionDoStartSearchWidget) MissionDoStartSearchWidget->show();
break;
case MAV_CMD_DO_FINISH_SEARCH:
if(MissionDoFinishSearchWidget) MissionDoFinishSearchWidget->show();
break;
#endif
default:
if(MissionOtherWidget) MissionOtherWidget->show();
......@@ -305,29 +289,6 @@ void WaypointEditableView::initializeActionView(int actionID)
m_ui->customActionWidget->layout()->addWidget(MissionDoJumpWidget);
}
break;
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAV_CMD_NAV_SWEEP:
if (!MissionNavSweepWidget)
{
MissionNavSweepWidget = new QGCMissionNavSweep(this);
m_ui->customActionWidget->layout()->addWidget(MissionNavSweepWidget);
}
break;
case MAV_CMD_DO_START_SEARCH:
if (!MissionDoStartSearchWidget)
{
MissionDoStartSearchWidget = new QGCMissionDoStartSearch(this);
m_ui->customActionWidget->layout()->addWidget(MissionDoStartSearchWidget);
}
break;
case MAV_CMD_DO_FINISH_SEARCH:
if (!MissionDoFinishSearchWidget)
{
MissionDoFinishSearchWidget = new QGCMissionDoFinishSearch(this);
m_ui->customActionWidget->layout()->addWidget(MissionDoFinishSearchWidget);
}
break;
#endif
case MAV_CMD_ENUM_END:
default:
if (!MissionOtherWidget)
......
src/ui/WaypointViewOnlyView.cc
View file @ 22aacd61
......@@ -350,37 +350,6 @@ void WaypointViewOnlyView::updateValues()
m_ui->displayBar->setText(QString("Delay: %1 sec").arg(wp->getParam1()));
break;
}
#ifdef MAVLINK_ENABLED_PIXHAWK
case MAV_CMD_DO_START_SEARCH:
{
m_ui->displayBar->setText(QString("Start searching for pattern. Success when got more than %2 detections with confidence %1").arg(wp->getParam1()).arg(wp->getParam2()));
break;
}
case MAV_CMD_DO_FINISH_SEARCH:
{
m_ui->displayBar->setText(QString("Check if search was successful. yes -> jump to %1, no -> jump to %2. Jumps left: %3").arg(wp->getParam1()).arg(wp->getParam2()).arg(wp->getParam3()));
break;
}
case MAV_CMD_NAV_SWEEP:
{
switch (wp->getFrame())
{
case MAV_FRAME_GLOBAL_RELATIVE_ALT:
case MAV_FRAME_GLOBAL:
{
m_ui->displayBar->setText(QString("Sweep. Corners: <b>(</b>lat <b>%1<sup>o</sup></b>, lon <b>%2<sup>o</sup>)</b> and <b>(</b>lat <b>%3<sup>o</sup></b>, lon <b>%4<sup>o</sup>)</b>; alt: <b>%5</b>; scan radius: %6").arg(wp->getParam3(),0, 'f', 7).arg(wp->getParam4(),0, 'f', 7).arg(wp->getParam5(),0, 'f', 7).arg(wp->getParam6(),0, 'f', 7).arg(wp->getParam7(),0, 'f', 2).arg(wp->getParam1()));
break;
}
case MAV_FRAME_LOCAL_NED:
default:
{
m_ui->displayBar->setText(QString("Sweep. Corners: <b>(%1, %2)</b> and <b>(%3, %4)</b>; z: <b>%5</b>; scan radius: %6").arg(wp->getParam3()).arg(wp->getParam4()).arg(wp->getParam5()).arg(wp->getParam6()).arg(wp->getParam7()).arg(wp->getParam1()));
break;
}
} //end Frame switch
break;
}
#endif
default:
{
m_ui->displayBar->setText(QString("Unknown Command ID (%1) : %2, %3, %4, %5, %6, %7, %8").arg(wp->getAction()).arg(wp->getParam1()).arg(wp->getParam2()).arg(wp->getParam3()).arg(wp->getParam4()).arg(wp->getParam5()).arg(wp->getParam6()).arg(wp->getParam7()));
......
src/ui/generated/AudioOutputWidget.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'AudioOutputWidget.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef AUDIOOUTPUTWIDGET_H
#define AUDIOOUTPUTWIDGET_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGridLayout>
#include <QHeaderView>
#include <QPushButton>
#include <QSpacerItem>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_AudioOutputWidget
{
public:
QGridLayout *gridLayout;
QSpacerItem *horizontalSpacer;
QSpacerItem *verticalSpacer;
QPushButton *muteButton;
void setupUi(QWidget *AudioOutputWidget) {
if (AudioOutputWidget->objectName().isEmpty())
AudioOutputWidget->setObjectName(QString::fromUtf8("AudioOutputWidget"));
AudioOutputWidget->resize(195, 95);
gridLayout = new QGridLayout(AudioOutputWidget);
gridLayout->setContentsMargins(6, 6, 6, 6);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
horizontalSpacer = new QSpacerItem(53, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
gridLayout->addItem(horizontalSpacer, 0, 2, 1, 2);
verticalSpacer = new QSpacerItem(180, 43, QSizePolicy::Minimum, QSizePolicy::Expanding);
gridLayout->addItem(verticalSpacer, 1, 0, 1, 4);
muteButton = new QPushButton(AudioOutputWidget);
muteButton->setObjectName(QString::fromUtf8("muteButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/files/images/status/audio-volume-muted.svg"), QSize(), QIcon::Normal, QIcon::Off);
muteButton->setIcon(icon);
muteButton->setIconSize(QSize(16, 16));
gridLayout->addWidget(muteButton, 0, 0, 1, 1);
retranslateUi(AudioOutputWidget);
QMetaObject::connectSlotsByName(AudioOutputWidget);
} // setupUi
void retranslateUi(QWidget *AudioOutputWidget) {
AudioOutputWidget->setWindowTitle(QApplication::translate("AudioOutputWidget", "Form", 0, QApplication::UnicodeUTF8));
muteButton->setText(QApplication::translate("AudioOutputWidget", "Mute", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class AudioOutputWidget: public Ui_AudioOutputWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // AUDIOOUTPUTWIDGET_H
src/ui/generated/CommSettings.h deleted 100644 → 0
View file @ 1a182ddd
/****************************************************************************
** Form interface generated from reading ui file 'src/ui/CommSettings.ui'
**
** Created: Tue Jun 1 20:21:32 2010
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
src/ui/generated/DebugConsole.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'DebugConsole.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef DEBUGCONSOLE_H
#define DEBUGCONSOLE_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QCheckBox>
#include <QComboBox>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QLineEdit>
#include <QPlainTextEdit>
#include <QPushButton>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_DebugConsole
{
public:
QGridLayout *gridLayout;
QHBoxLayout *horizontalLayout_2;
QComboBox *linkComboBox;
QLabel *speedLabel;
QCheckBox *mavlinkCheckBox;
QCheckBox *hexCheckBox;
QCheckBox *holdCheckBox;
QPlainTextEdit *receiveText;
QLineEdit *sentText;
QLineEdit *sendText;
QHBoxLayout *horizontalLayout;
QPushButton *transmitButton;
QPushButton *holdButton;
QPushButton *clearButton;
void setupUi(QWidget *DebugConsole) {
if (DebugConsole->objectName().isEmpty())
DebugConsole->setObjectName(QString::fromUtf8("DebugConsole"));
DebugConsole->resize(435, 185);
gridLayout = new QGridLayout(DebugConsole);
gridLayout->setContentsMargins(6, 6, 6, 6);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setHorizontalSpacing(6);
gridLayout->setVerticalSpacing(4);
horizontalLayout_2 = new QHBoxLayout();
horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
linkComboBox = new QComboBox(DebugConsole);
linkComboBox->setObjectName(QString::fromUtf8("linkComboBox"));
linkComboBox->setMaximumSize(QSize(130, 16777215));
horizontalLayout_2->addWidget(linkComboBox);
speedLabel = new QLabel(DebugConsole);
speedLabel->setObjectName(QString::fromUtf8("speedLabel"));
horizontalLayout_2->addWidget(speedLabel);
mavlinkCheckBox = new QCheckBox(DebugConsole);
mavlinkCheckBox->setObjectName(QString::fromUtf8("mavlinkCheckBox"));
horizontalLayout_2->addWidget(mavlinkCheckBox);
hexCheckBox = new QCheckBox(DebugConsole);
hexCheckBox->setObjectName(QString::fromUtf8("hexCheckBox"));
horizontalLayout_2->addWidget(hexCheckBox);
holdCheckBox = new QCheckBox(DebugConsole);
holdCheckBox->setObjectName(QString::fromUtf8("holdCheckBox"));
horizontalLayout_2->addWidget(holdCheckBox);
horizontalLayout_2->setStretch(0, 10);
gridLayout->addLayout(horizontalLayout_2, 0, 0, 1, 2);
receiveText = new QPlainTextEdit(DebugConsole);
receiveText->setObjectName(QString::fromUtf8("receiveText"));
gridLayout->addWidget(receiveText, 1, 0, 1, 2);
sentText = new QLineEdit(DebugConsole);
sentText->setObjectName(QString::fromUtf8("sentText"));
sentText->setReadOnly(true);
gridLayout->addWidget(sentText, 2, 0, 1, 2);
sendText = new QLineEdit(DebugConsole);
sendText->setObjectName(QString::fromUtf8("sendText"));
gridLayout->addWidget(sendText, 3, 0, 1, 1);
horizontalLayout = new QHBoxLayout();
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
transmitButton = new QPushButton(DebugConsole);
transmitButton->setObjectName(QString::fromUtf8("transmitButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/files/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
transmitButton->setIcon(icon);
horizontalLayout->addWidget(transmitButton);
holdButton = new QPushButton(DebugConsole);
holdButton->setObjectName(QString::fromUtf8("holdButton"));
holdButton->setCheckable(true);
horizontalLayout->addWidget(holdButton);
clearButton = new QPushButton(DebugConsole);
clearButton->setObjectName(QString::fromUtf8("clearButton"));
horizontalLayout->addWidget(clearButton);
gridLayout->addLayout(horizontalLayout, 3, 1, 1, 1);
retranslateUi(DebugConsole);
QObject::connect(clearButton, SIGNAL(clicked()), receiveText, SLOT(clear()));
QMetaObject::connectSlotsByName(DebugConsole);
} // setupUi
void retranslateUi(QWidget *DebugConsole) {
DebugConsole->setWindowTitle(QApplication::translate("DebugConsole", "Form", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
linkComboBox->setToolTip(QApplication::translate("DebugConsole", "Select the link to monitor", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
speedLabel->setText(QApplication::translate("DebugConsole", "0.0 kB/s", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
mavlinkCheckBox->setToolTip(QApplication::translate("DebugConsole", "Ignore MAVLINK protocol messages in display", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
mavlinkCheckBox->setText(QApplication::translate("DebugConsole", "No MAVLINK", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
hexCheckBox->setToolTip(QApplication::translate("DebugConsole", "Display and send bytes in HEX representation", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
hexCheckBox->setText(QApplication::translate("DebugConsole", "HEX", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
holdCheckBox->setToolTip(QApplication::translate("DebugConsole", "Saves CPU ressources, automatically set view to hold if data rate is too high to prevent fast scrolling", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
#ifndef QT_NO_STATUSTIP
holdCheckBox->setStatusTip(QApplication::translate("DebugConsole", "Saves CPU ressources, automatically set view to hold if data rate is too high to prevent fast scrolling", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_STATUSTIP
#ifndef QT_NO_WHATSTHIS
holdCheckBox->setWhatsThis(QApplication::translate("DebugConsole", "Enable auto hold to lower the CPU consumption", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_WHATSTHIS
holdCheckBox->setText(QApplication::translate("DebugConsole", "Auto hold", 0, QApplication::UnicodeUTF8));
sentText->setText(QApplication::translate("DebugConsole", "Enter data/text below to send", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
sendText->setToolTip(QApplication::translate("DebugConsole", "Type the bytes to send here, use 0xAA format for HEX (Check HEX checkbox above)", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
#ifndef QT_NO_TOOLTIP
transmitButton->setToolTip(QApplication::translate("DebugConsole", "Send the ASCII text or HEX values over the link", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
transmitButton->setText(QApplication::translate("DebugConsole", "Send", 0, QApplication::UnicodeUTF8));
holdButton->setText(QApplication::translate("DebugConsole", "Hold", 0, QApplication::UnicodeUTF8));
clearButton->setText(QApplication::translate("DebugConsole", "Clear", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class DebugConsole: public Ui_DebugConsole {};
} // namespace Ui
QT_END_NAMESPACE
#endif // DEBUGCONSOLE_H
src/ui/generated/HDDisplay.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'HDDisplay.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef HDDISPLAY_H
#define HDDISPLAY_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGraphicsView>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_HDDisplay
{
public:
QHBoxLayout *horizontalLayout;
QGraphicsView *view;
void setupUi(QWidget *HDDisplay) {
if (HDDisplay->objectName().isEmpty())
HDDisplay->setObjectName(QString::fromUtf8("HDDisplay"));
HDDisplay->resize(400, 300);
horizontalLayout = new QHBoxLayout(HDDisplay);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
view = new QGraphicsView(HDDisplay);
view->setObjectName(QString::fromUtf8("view"));
horizontalLayout->addWidget(view);
retranslateUi(HDDisplay);
QMetaObject::connectSlotsByName(HDDisplay);
} // setupUi
void retranslateUi(QWidget *HDDisplay) {
HDDisplay->setWindowTitle(QApplication::translate("HDDisplay", "Form", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class HDDisplay: public Ui_HDDisplay {};
} // namespace Ui
QT_END_NAMESPACE
#endif // HDDISPLAY_H
src/ui/generated/JoystickWidget.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'JoystickWidget.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef JOYSTICKWIDGET_H
#define JOYSTICKWIDGET_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QDial>
#include <QDialog>
#include <QDialogButtonBox>
#include <QGroupBox>
#include <QHeaderView>
#include <QLCDNumber>
#include <QProgressBar>
#include <QSlider>
QT_BEGIN_NAMESPACE
class Ui_JoystickWidget
{
public:
QDialogButtonBox *buttonBox;
QProgressBar *thrust;
QSlider *ySlider;
QSlider *xSlider;
QLCDNumber *xValue;
QLCDNumber *yValue;
QDial *dial;
QGroupBox *button0Label;
void setupUi(QDialog *JoystickWidget) {
if (JoystickWidget->objectName().isEmpty())
JoystickWidget->setObjectName(QString::fromUtf8("JoystickWidget"));
JoystickWidget->resize(400, 300);
buttonBox = new QDialogButtonBox(JoystickWidget);
buttonBox->setObjectName(QString::fromUtf8("buttonBox"));
buttonBox->setGeometry(QRect(30, 240, 341, 32));
buttonBox->setOrientation(Qt::Horizontal);
buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
thrust = new QProgressBar(JoystickWidget);
thrust->setObjectName(QString::fromUtf8("thrust"));
thrust->setGeometry(QRect(350, 20, 31, 181));
thrust->setValue(0);
thrust->setOrientation(Qt::Vertical);
ySlider = new QSlider(JoystickWidget);
ySlider->setObjectName(QString::fromUtf8("ySlider"));
ySlider->setGeometry(QRect(160, 190, 160, 17));
ySlider->setMaximum(100);
ySlider->setOrientation(Qt::Horizontal);
xSlider = new QSlider(JoystickWidget);
xSlider->setObjectName(QString::fromUtf8("xSlider"));
xSlider->setGeometry(QRect(140, 40, 17, 160));
xSlider->setMaximum(100);
xSlider->setOrientation(Qt::Vertical);
xValue = new QLCDNumber(JoystickWidget);
xValue->setObjectName(QString::fromUtf8("xValue"));
xValue->setGeometry(QRect(160, 50, 41, 23));
xValue->setFrameShadow(QFrame::Plain);
xValue->setSmallDecimalPoint(true);
xValue->setNumDigits(3);
xValue->setSegmentStyle(QLCDNumber::Flat);
yValue = new QLCDNumber(JoystickWidget);
yValue->setObjectName(QString::fromUtf8("yValue"));
yValue->setGeometry(QRect(270, 160, 41, 23));
yValue->setFrameShadow(QFrame::Plain);
yValue->setSmallDecimalPoint(true);
yValue->setNumDigits(3);
yValue->setSegmentStyle(QLCDNumber::Flat);
dial = new QDial(JoystickWidget);
dial->setObjectName(QString::fromUtf8("dial"));
dial->setGeometry(QRect(210, 50, 101, 101));
button0Label = new QGroupBox(JoystickWidget);
button0Label->setObjectName(QString::fromUtf8("button0Label"));
button0Label->setGeometry(QRect(60, 20, 41, 16));
button0Label->setAutoFillBackground(false);
button0Label->setFlat(false);
retranslateUi(JoystickWidget);
QObject::connect(buttonBox, SIGNAL(accepted()), JoystickWidget, SLOT(accept()));
QObject::connect(buttonBox, SIGNAL(rejected()), JoystickWidget, SLOT(reject()));
QMetaObject::connectSlotsByName(JoystickWidget);
} // setupUi
void retranslateUi(QDialog *JoystickWidget) {
JoystickWidget->setWindowTitle(QApplication::translate("JoystickWidget", "Dialog", 0, QApplication::UnicodeUTF8));
button0Label->setStyleSheet(QApplication::translate("JoystickWidget", "QGroupBox { border: 1px solid #EEEEEE; border-radius: 4px; padding: 0px; margin: 0px; background-color: #FF2222;}", 0, QApplication::UnicodeUTF8));
button0Label->setTitle(QString());
} // retranslateUi
};
namespace Ui
{
class JoystickWidget: public Ui_JoystickWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // JOYSTICKWIDGET_H
src/ui/generated/LineChart.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'LineChart.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef LINECHART_H
#define LINECHART_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QScrollArea>
#include <QVBoxLayout>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_linechart
{
public:
QHBoxLayout *horizontalLayout_2;
QGroupBox *curveGroupBox;
QVBoxLayout *verticalLayout;
QScrollArea *curveListWidget;
QWidget *scrollAreaWidgetContents;
QGroupBox *diagramGroupBox;
void setupUi(QWidget *linechart) {
if (linechart->objectName().isEmpty())
linechart->setObjectName(QString::fromUtf8("linechart"));
linechart->resize(662, 381);
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
sizePolicy.setHorizontalStretch(3);
sizePolicy.setVerticalStretch(2);
sizePolicy.setHeightForWidth(linechart->sizePolicy().hasHeightForWidth());
linechart->setSizePolicy(sizePolicy);
linechart->setMinimumSize(QSize(300, 200));
horizontalLayout_2 = new QHBoxLayout(linechart);
horizontalLayout_2->setSpacing(3);
horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
horizontalLayout_2->setContentsMargins(2, 0, 2, 2);
curveGroupBox = new QGroupBox(linechart);
curveGroupBox->setObjectName(QString::fromUtf8("curveGroupBox"));
QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
sizePolicy1.setHorizontalStretch(1);
sizePolicy1.setVerticalStretch(0);
sizePolicy1.setHeightForWidth(curveGroupBox->sizePolicy().hasHeightForWidth());
curveGroupBox->setSizePolicy(sizePolicy1);
curveGroupBox->setMinimumSize(QSize(250, 300));
curveGroupBox->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
verticalLayout = new QVBoxLayout(curveGroupBox);
verticalLayout->setSpacing(2);
verticalLayout->setContentsMargins(0, 0, 0, 0);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
curveListWidget = new QScrollArea(curveGroupBox);
curveListWidget->setObjectName(QString::fromUtf8("curveListWidget"));
QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Expanding);
sizePolicy2.setHorizontalStretch(0);
sizePolicy2.setVerticalStretch(0);
sizePolicy2.setHeightForWidth(curveListWidget->sizePolicy().hasHeightForWidth());
curveListWidget->setSizePolicy(sizePolicy2);
curveListWidget->setMinimumSize(QSize(240, 250));
curveListWidget->setBaseSize(QSize(150, 200));
curveListWidget->setAutoFillBackground(false);
curveListWidget->setFrameShape(QFrame::NoFrame);
curveListWidget->setFrameShadow(QFrame::Sunken);
curveListWidget->setWidgetResizable(true);
curveListWidget->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
scrollAreaWidgetContents = new QWidget();
scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents"));
scrollAreaWidgetContents->setGeometry(QRect(0, 0, 242, 361));
curveListWidget->setWidget(scrollAreaWidgetContents);
verticalLayout->addWidget(curveListWidget);
horizontalLayout_2->addWidget(curveGroupBox);
diagramGroupBox = new QGroupBox(linechart);
diagramGroupBox->setObjectName(QString::fromUtf8("diagramGroupBox"));
QSizePolicy sizePolicy3(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
sizePolicy3.setHorizontalStretch(9);
sizePolicy3.setVerticalStretch(0);
sizePolicy3.setHeightForWidth(diagramGroupBox->sizePolicy().hasHeightForWidth());
diagramGroupBox->setSizePolicy(sizePolicy3);
diagramGroupBox->setMinimumSize(QSize(400, 300));
diagramGroupBox->setBaseSize(QSize(800, 300));
horizontalLayout_2->addWidget(diagramGroupBox);
retranslateUi(linechart);
QMetaObject::connectSlotsByName(linechart);
} // setupUi
void retranslateUi(QWidget *linechart) {
linechart->setWindowTitle(QApplication::translate("linechart", "Form", 0, QApplication::UnicodeUTF8));
curveGroupBox->setTitle(QApplication::translate("linechart", "Curve Selection", 0, QApplication::UnicodeUTF8));
diagramGroupBox->setTitle(QApplication::translate("linechart", "Diagram", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class linechart: public Ui_linechart {};
} // namespace Ui
QT_END_NAMESPACE
#endif // LINECHART_H
src/ui/generated/MAVLinkSettingsWidget.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'MAVLinkSettingsWidget.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef MAVLINKSETTINGSWIDGET_H
#define MAVLINKSETTINGSWIDGET_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QCheckBox>
#include <QHeaderView>
#include <QSpacerItem>
#include <QVBoxLayout>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_MAVLinkSettingsWidget
{
public:
QVBoxLayout *verticalLayout;
QCheckBox *heartbeatCheckBox;
QCheckBox *loggingCheckBox;
QSpacerItem *verticalSpacer;
void setupUi(QWidget *MAVLinkSettingsWidget) {
if (MAVLinkSettingsWidget->objectName().isEmpty())
MAVLinkSettingsWidget->setObjectName(QString::fromUtf8("MAVLinkSettingsWidget"));
MAVLinkSettingsWidget->resize(267, 123);
verticalLayout = new QVBoxLayout(MAVLinkSettingsWidget);
verticalLayout->setContentsMargins(6, 6, 6, 6);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
heartbeatCheckBox = new QCheckBox(MAVLinkSettingsWidget);
heartbeatCheckBox->setObjectName(QString::fromUtf8("heartbeatCheckBox"));
verticalLayout->addWidget(heartbeatCheckBox);
loggingCheckBox = new QCheckBox(MAVLinkSettingsWidget);
loggingCheckBox->setObjectName(QString::fromUtf8("loggingCheckBox"));
verticalLayout->addWidget(loggingCheckBox);
verticalSpacer = new QSpacerItem(20, 84, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalLayout->addItem(verticalSpacer);
retranslateUi(MAVLinkSettingsWidget);
QMetaObject::connectSlotsByName(MAVLinkSettingsWidget);
} // setupUi
void retranslateUi(QWidget *MAVLinkSettingsWidget) {
MAVLinkSettingsWidget->setWindowTitle(QApplication::translate("MAVLinkSettingsWidget", "Form", 0, QApplication::UnicodeUTF8));
heartbeatCheckBox->setText(QApplication::translate("MAVLinkSettingsWidget", "Emit heartbeat", 0, QApplication::UnicodeUTF8));
loggingCheckBox->setText(QApplication::translate("MAVLinkSettingsWidget", "Log all MAVLink packets", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class MAVLinkSettingsWidget: public Ui_MAVLinkSettingsWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // MAVLINKSETTINGSWIDGET_H
src/ui/generated/MainWindow.h deleted 100644 → 0
View file @ 1a182ddd
/****************************************************************************
** Form interface generated from reading ui file 'src/ui/MainWindow.ui'
**
** Created: Tue Jun 1 20:21:32 2010
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
src/ui/generated/MapWidget.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'MapWidget.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef MAPWIDGET_H
#define MAPWIDGET_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QHeaderView>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_MapWidget
{
public:
void setupUi(QWidget *MapWidget) {
if (MapWidget->objectName().isEmpty())
MapWidget->setObjectName(QString::fromUtf8("MapWidget"));
MapWidget->resize(400, 300);
retranslateUi(MapWidget);
QMetaObject::connectSlotsByName(MapWidget);
} // setupUi
void retranslateUi(QWidget *MapWidget) {
MapWidget->setWindowTitle(QApplication::translate("MapWidget", "Form", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class MapWidget: public Ui_MapWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // MAPWIDGET_H
src/ui/generated/ObjectDetectionView.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'ObjectDetectionView.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef OBJECTDETECTIONVIEW_H
#define OBJECTDETECTIONVIEW_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGridLayout>
#include <QHeaderView>
#include <QLabel>
#include <QListWidget>
#include <QPushButton>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_ObjectDetectionView
{
public:
QGridLayout *gridLayout;
QListWidget *listWidget;
QListWidget *letterListWidget;
QLabel *imageLabel;
QLabel *letterLabel;
QLabel *nameLabel;
QPushButton *clearButton;
void setupUi(QWidget *ObjectDetectionView) {
if (ObjectDetectionView->objectName().isEmpty())
ObjectDetectionView->setObjectName(QString::fromUtf8("ObjectDetectionView"));
ObjectDetectionView->resize(246, 403);
gridLayout = new QGridLayout(ObjectDetectionView);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
listWidget = new QListWidget(ObjectDetectionView);
listWidget->setObjectName(QString::fromUtf8("listWidget"));
gridLayout->addWidget(listWidget, 0, 0, 1, 3);
letterListWidget = new QListWidget(ObjectDetectionView);
letterListWidget->setObjectName(QString::fromUtf8("letterListWidget"));
gridLayout->addWidget(letterListWidget, 1, 0, 1, 3);
imageLabel = new QLabel(ObjectDetectionView);
imageLabel->setObjectName(QString::fromUtf8("imageLabel"));
QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
sizePolicy.setHorizontalStretch(10);
sizePolicy.setVerticalStretch(10);
sizePolicy.setHeightForWidth(imageLabel->sizePolicy().hasHeightForWidth());
imageLabel->setSizePolicy(sizePolicy);
imageLabel->setMinimumSize(QSize(110, 110));
imageLabel->setSizeIncrement(QSize(2, 2));
imageLabel->setBaseSize(QSize(10, 10));
gridLayout->addWidget(imageLabel, 2, 0, 1, 1);
letterLabel = new QLabel(ObjectDetectionView);
letterLabel->setObjectName(QString::fromUtf8("letterLabel"));
sizePolicy.setHeightForWidth(letterLabel->sizePolicy().hasHeightForWidth());
letterLabel->setSizePolicy(sizePolicy);
letterLabel->setMinimumSize(QSize(110, 110));
letterLabel->setSizeIncrement(QSize(2, 2));
letterLabel->setBaseSize(QSize(10, 10));
letterLabel->setStyleSheet(QString::fromUtf8("font: 72pt;\n"
"color: white;"));
letterLabel->setAlignment(Qt::AlignCenter);
gridLayout->addWidget(letterLabel, 2, 1, 1, 2);
nameLabel = new QLabel(ObjectDetectionView);
nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
gridLayout->addWidget(nameLabel, 3, 0, 1, 2);
clearButton = new QPushButton(ObjectDetectionView);
clearButton->setObjectName(QString::fromUtf8("clearButton"));
clearButton->setMaximumSize(QSize(80, 16777215));
gridLayout->addWidget(clearButton, 3, 2, 1, 1);
retranslateUi(ObjectDetectionView);
QMetaObject::connectSlotsByName(ObjectDetectionView);
} // setupUi
void retranslateUi(QWidget *ObjectDetectionView) {
ObjectDetectionView->setWindowTitle(QApplication::translate("ObjectDetectionView", "Form", 0, QApplication::UnicodeUTF8));
imageLabel->setText(QString());
letterLabel->setText(QString());
nameLabel->setText(QApplication::translate("ObjectDetectionView", "No objects recognized", 0, QApplication::UnicodeUTF8));
clearButton->setText(QApplication::translate("ObjectDetectionView", "Clear", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class ObjectDetectionView: public Ui_ObjectDetectionView {};
} // namespace Ui
QT_END_NAMESPACE
#endif // OBJECTDETECTIONVIEW_H
src/ui/generated/ParameterInterface.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'ParameterInterface.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef PARAMETERINTERFACE_H
#define PARAMETERINTERFACE_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QComboBox>
#include <QGridLayout>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QStackedWidget>
#include <QVBoxLayout>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_parameterWidget
{
public:
QGridLayout *gridLayout;
QLabel *label;
QComboBox *vehicleComboBox;
QGroupBox *groupBox_2;
QHBoxLayout *horizontalLayout;
QStackedWidget *stackedWidget;
QWidget *page;
QVBoxLayout *verticalLayout;
QWidget *page_2;
QStackedWidget *sensorSettings;
QWidget *page_3;
QVBoxLayout *verticalLayout_2;
QWidget *page_4;
void setupUi(QWidget *parameterWidget) {
if (parameterWidget->objectName().isEmpty())
parameterWidget->setObjectName(QString::fromUtf8("parameterWidget"));
parameterWidget->resize(350, 545);
gridLayout = new QGridLayout(parameterWidget);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
label = new QLabel(parameterWidget);
label->setObjectName(QString::fromUtf8("label"));
gridLayout->addWidget(label, 0, 0, 1, 1);
vehicleComboBox = new QComboBox(parameterWidget);
vehicleComboBox->setObjectName(QString::fromUtf8("vehicleComboBox"));
gridLayout->addWidget(vehicleComboBox, 0, 1, 1, 1);
groupBox_2 = new QGroupBox(parameterWidget);
groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
horizontalLayout = new QHBoxLayout(groupBox_2);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
stackedWidget = new QStackedWidget(groupBox_2);
stackedWidget->setObjectName(QString::fromUtf8("stackedWidget"));
page = new QWidget();
page->setObjectName(QString::fromUtf8("page"));
verticalLayout = new QVBoxLayout(page);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
stackedWidget->addWidget(page);
page_2 = new QWidget();
page_2->setObjectName(QString::fromUtf8("page_2"));
stackedWidget->addWidget(page_2);
horizontalLayout->addWidget(stackedWidget);
gridLayout->addWidget(groupBox_2, 1, 0, 1, 2);
sensorSettings = new QStackedWidget(parameterWidget);
sensorSettings->setObjectName(QString::fromUtf8("sensorSettings"));
page_3 = new QWidget();
page_3->setObjectName(QString::fromUtf8("page_3"));
verticalLayout_2 = new QVBoxLayout(page_3);
verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
sensorSettings->addWidget(page_3);
page_4 = new QWidget();
page_4->setObjectName(QString::fromUtf8("page_4"));
sensorSettings->addWidget(page_4);
gridLayout->addWidget(sensorSettings, 2, 0, 1, 2);
retranslateUi(parameterWidget);
stackedWidget->setCurrentIndex(0);
sensorSettings->setCurrentIndex(0);
QMetaObject::connectSlotsByName(parameterWidget);
} // setupUi
void retranslateUi(QWidget *parameterWidget) {
parameterWidget->setWindowTitle(QApplication::translate("parameterWidget", "Form", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("parameterWidget", "Vehicle", 0, QApplication::UnicodeUTF8));
groupBox_2->setTitle(QApplication::translate("parameterWidget", "Onboard Parameters", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class parameterWidget: public Ui_parameterWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // PARAMETERINTERFACE_H
src/ui/generated/QGCSensorSettingsWidget.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'QGCSensorSettingsWidget.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef QGCSENSORSETTINGSWIDGET_H
#define QGCSENSORSETTINGSWIDGET_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QCheckBox>
#include <QGridLayout>
#include <QGroupBox>
#include <QHeaderView>
#include <QLabel>
#include <QPushButton>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_QGCSensorSettingsWidget
{
public:
QGridLayout *gridLayout_4;
QGroupBox *groupBox;
QGridLayout *gridLayout_2;
QCheckBox *sendRawCheckBox;
QCheckBox *sendExtendedCheckBox;
QCheckBox *sendRCCheckBox;
QCheckBox *sendControllerCheckBox;
QCheckBox *sendPositionCheckBox;
QCheckBox *sendExtra1CheckBox;
QCheckBox *sendExtra2CheckBox;
QCheckBox *sendExtra3CheckBox;
QGroupBox *groupBox_3;
QGridLayout *gridLayout;
QPushButton *gyroCalButton;
QLabel *gyroCalDate;
QPushButton *magCalButton;
QLabel *magCalLabel;
void setupUi(QWidget *QGCSensorSettingsWidget) {
if (QGCSensorSettingsWidget->objectName().isEmpty())
QGCSensorSettingsWidget->setObjectName(QString::fromUtf8("QGCSensorSettingsWidget"));
QGCSensorSettingsWidget->resize(350, 545);
gridLayout_4 = new QGridLayout(QGCSensorSettingsWidget);
gridLayout_4->setContentsMargins(0, 0, 0, 0);
gridLayout_4->setObjectName(QString::fromUtf8("gridLayout_4"));
groupBox = new QGroupBox(QGCSensorSettingsWidget);
groupBox->setObjectName(QString::fromUtf8("groupBox"));
gridLayout_2 = new QGridLayout(groupBox);
gridLayout_2->setContentsMargins(6, 6, 6, 6);
gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
sendRawCheckBox = new QCheckBox(groupBox);
sendRawCheckBox->setObjectName(QString::fromUtf8("sendRawCheckBox"));
gridLayout_2->addWidget(sendRawCheckBox, 0, 0, 1, 1);
sendExtendedCheckBox = new QCheckBox(groupBox);
sendExtendedCheckBox->setObjectName(QString::fromUtf8("sendExtendedCheckBox"));
gridLayout_2->addWidget(sendExtendedCheckBox, 1, 0, 1, 1);
sendRCCheckBox = new QCheckBox(groupBox);
sendRCCheckBox->setObjectName(QString::fromUtf8("sendRCCheckBox"));
gridLayout_2->addWidget(sendRCCheckBox, 2, 0, 1, 1);
sendControllerCheckBox = new QCheckBox(groupBox);
sendControllerCheckBox->setObjectName(QString::fromUtf8("sendControllerCheckBox"));
gridLayout_2->addWidget(sendControllerCheckBox, 3, 0, 1, 1);
sendPositionCheckBox = new QCheckBox(groupBox);
sendPositionCheckBox->setObjectName(QString::fromUtf8("sendPositionCheckBox"));
gridLayout_2->addWidget(sendPositionCheckBox, 4, 0, 1, 1);
sendExtra1CheckBox = new QCheckBox(groupBox);
sendExtra1CheckBox->setObjectName(QString::fromUtf8("sendExtra1CheckBox"));
gridLayout_2->addWidget(sendExtra1CheckBox, 5, 0, 1, 1);
sendExtra2CheckBox = new QCheckBox(groupBox);
sendExtra2CheckBox->setObjectName(QString::fromUtf8("sendExtra2CheckBox"));
gridLayout_2->addWidget(sendExtra2CheckBox, 6, 0, 1, 1);
sendExtra3CheckBox = new QCheckBox(groupBox);
sendExtra3CheckBox->setObjectName(QString::fromUtf8("sendExtra3CheckBox"));
gridLayout_2->addWidget(sendExtra3CheckBox, 7, 0, 1, 1);
gridLayout_4->addWidget(groupBox, 0, 0, 1, 1);
groupBox_3 = new QGroupBox(QGCSensorSettingsWidget);
groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
gridLayout = new QGridLayout(groupBox_3);
gridLayout->setContentsMargins(6, 6, 6, 6);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gyroCalButton = new QPushButton(groupBox_3);
gyroCalButton->setObjectName(QString::fromUtf8("gyroCalButton"));
gridLayout->addWidget(gyroCalButton, 0, 0, 1, 1);
gyroCalDate = new QLabel(groupBox_3);
gyroCalDate->setObjectName(QString::fromUtf8("gyroCalDate"));
gridLayout->addWidget(gyroCalDate, 0, 1, 1, 1);
magCalButton = new QPushButton(groupBox_3);
magCalButton->setObjectName(QString::fromUtf8("magCalButton"));
gridLayout->addWidget(magCalButton, 1, 0, 1, 1);
magCalLabel = new QLabel(groupBox_3);
magCalLabel->setObjectName(QString::fromUtf8("magCalLabel"));
gridLayout->addWidget(magCalLabel, 1, 1, 1, 1);
gridLayout_4->addWidget(groupBox_3, 1, 0, 1, 1);
retranslateUi(QGCSensorSettingsWidget);
QMetaObject::connectSlotsByName(QGCSensorSettingsWidget);
} // setupUi
void retranslateUi(QWidget *QGCSensorSettingsWidget) {
QGCSensorSettingsWidget->setWindowTitle(QApplication::translate("QGCSensorSettingsWidget", "Form", 0, QApplication::UnicodeUTF8));
groupBox->setTitle(QApplication::translate("QGCSensorSettingsWidget", "Activate Extended Output", 0, QApplication::UnicodeUTF8));
sendRawCheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send RAW Sensor data", 0, QApplication::UnicodeUTF8));
sendExtendedCheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send extended status", 0, QApplication::UnicodeUTF8));
sendRCCheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send RC-values", 0, QApplication::UnicodeUTF8));
sendControllerCheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send raw controller outputs", 0, QApplication::UnicodeUTF8));
sendPositionCheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send position setpoint and estimate", 0, QApplication::UnicodeUTF8));
sendExtra1CheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send Extra1", 0, QApplication::UnicodeUTF8));
sendExtra2CheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send Extra2", 0, QApplication::UnicodeUTF8));
sendExtra3CheckBox->setText(QApplication::translate("QGCSensorSettingsWidget", "Send Extra3", 0, QApplication::UnicodeUTF8));
groupBox_3->setTitle(QApplication::translate("QGCSensorSettingsWidget", "Calibration Wizards", 0, QApplication::UnicodeUTF8));
gyroCalButton->setText(QApplication::translate("QGCSensorSettingsWidget", "Start dynamic calibration", 0, QApplication::UnicodeUTF8));
gyroCalDate->setText(QApplication::translate("QGCSensorSettingsWidget", "Date unknown", 0, QApplication::UnicodeUTF8));
magCalButton->setText(QApplication::translate("QGCSensorSettingsWidget", "Start static calibration", 0, QApplication::UnicodeUTF8));
magCalLabel->setText(QApplication::translate("QGCSensorSettingsWidget", "Date unknown", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class QGCSensorSettingsWidget: public Ui_QGCSensorSettingsWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // QGCSENSORSETTINGSWIDGET_H
src/ui/generated/SerialSettings.h deleted 100644 → 0
View file @ 1a182ddd
/****************************************************************************
** Form interface generated from reading ui file 'src/ui/SerialSettings.ui'
**
** Created: Tue Jun 1 20:21:32 2010
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
src/ui/generated/UASControl.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'UASControl.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UASCONTROL_H
#define UASCONTROL_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QComboBox>
#include <QGridLayout>
#include <QHeaderView>
#include <QLabel>
#include <QPushButton>
#include <QSpacerItem>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_uasControl
{
public:
QGridLayout *gridLayout;
QLabel *controlStatusLabel;
QPushButton *controlButton;
QSpacerItem *verticalSpacer_2;
QSpacerItem *horizontalSpacer;
QPushButton *liftoffButton;
QPushButton *landButton;
QPushButton *shutdownButton;
QSpacerItem *horizontalSpacer_2;
QComboBox *modeComboBox;
QPushButton *setModeButton;
QLabel *lastActionLabel;
QSpacerItem *verticalSpacer;
void setupUi(QWidget *uasControl) {
if (uasControl->objectName().isEmpty())
uasControl->setObjectName(QString::fromUtf8("uasControl"));
uasControl->resize(280, 164);
uasControl->setMinimumSize(QSize(280, 130));
gridLayout = new QGridLayout(uasControl);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setContentsMargins(6, 12, 6, 6);
controlStatusLabel = new QLabel(uasControl);
controlStatusLabel->setObjectName(QString::fromUtf8("controlStatusLabel"));
controlStatusLabel->setAlignment(Qt::AlignCenter);
gridLayout->addWidget(controlStatusLabel, 0, 1, 1, 4);
controlButton = new QPushButton(uasControl);
controlButton->setObjectName(QString::fromUtf8("controlButton"));
gridLayout->addWidget(controlButton, 1, 1, 1, 4);
verticalSpacer_2 = new QSpacerItem(20, 0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
gridLayout->addItem(verticalSpacer_2, 2, 1, 1, 4);
horizontalSpacer = new QSpacerItem(31, 159, QSizePolicy::Expanding, QSizePolicy::Minimum);
gridLayout->addItem(horizontalSpacer, 0, 0, 6, 1);
liftoffButton = new QPushButton(uasControl);
liftoffButton->setObjectName(QString::fromUtf8("liftoffButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/files/images/control/launch.svg"), QSize(), QIcon::Normal, QIcon::Off);
liftoffButton->setIcon(icon);
gridLayout->addWidget(liftoffButton, 3, 1, 1, 1);
landButton = new QPushButton(uasControl);
landButton->setObjectName(QString::fromUtf8("landButton"));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/files/images/control/land.svg"), QSize(), QIcon::Normal, QIcon::Off);
landButton->setIcon(icon1);
gridLayout->addWidget(landButton, 3, 2, 1, 2);
shutdownButton = new QPushButton(uasControl);
shutdownButton->setObjectName(QString::fromUtf8("shutdownButton"));
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/files/images/actions/system-log-out.svg"), QSize(), QIcon::Normal, QIcon::Off);
shutdownButton->setIcon(icon2);
gridLayout->addWidget(shutdownButton, 3, 4, 1, 1);
horizontalSpacer_2 = new QSpacerItem(30, 159, QSizePolicy::Expanding, QSizePolicy::Minimum);
gridLayout->addItem(horizontalSpacer_2, 0, 5, 6, 1);
modeComboBox = new QComboBox(uasControl);
modeComboBox->setObjectName(QString::fromUtf8("modeComboBox"));
gridLayout->addWidget(modeComboBox, 4, 1, 1, 2);
setModeButton = new QPushButton(uasControl);
setModeButton->setObjectName(QString::fromUtf8("setModeButton"));
QIcon icon3;
icon3.addFile(QString::fromUtf8(":/files/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
setModeButton->setIcon(icon3);
gridLayout->addWidget(setModeButton, 4, 3, 1, 2);
lastActionLabel = new QLabel(uasControl);
lastActionLabel->setObjectName(QString::fromUtf8("lastActionLabel"));
lastActionLabel->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop);
gridLayout->addWidget(lastActionLabel, 5, 1, 1, 4);
verticalSpacer = new QSpacerItem(0, 1, QSizePolicy::Minimum, QSizePolicy::Expanding);
gridLayout->addItem(verticalSpacer, 6, 0, 1, 6);
gridLayout->setRowMinimumHeight(0, 5);
gridLayout->setRowMinimumHeight(1, 10);
gridLayout->setRowMinimumHeight(2, 10);
gridLayout->setRowMinimumHeight(4, 10);
gridLayout->setRowMinimumHeight(5, 5);
retranslateUi(uasControl);
QMetaObject::connectSlotsByName(uasControl);
} // setupUi
void retranslateUi(QWidget *uasControl) {
uasControl->setWindowTitle(QApplication::translate("uasControl", "Form", 0, QApplication::UnicodeUTF8));
controlStatusLabel->setText(QApplication::translate("uasControl", "UNCONNECTED", 0, QApplication::UnicodeUTF8));
controlButton->setText(QApplication::translate("uasControl", "Activate Engine", 0, QApplication::UnicodeUTF8));
liftoffButton->setText(QApplication::translate("uasControl", "Liftoff", 0, QApplication::UnicodeUTF8));
landButton->setText(QApplication::translate("uasControl", "Land", 0, QApplication::UnicodeUTF8));
shutdownButton->setText(QApplication::translate("uasControl", "Halt", 0, QApplication::UnicodeUTF8));
setModeButton->setText(QApplication::translate("uasControl", "Set Mode", 0, QApplication::UnicodeUTF8));
lastActionLabel->setText(QApplication::translate("uasControl", "No actions executed so far", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class uasControl: public Ui_uasControl {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UASCONTROL_H
src/ui/generated/UASInfo.h deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/generated/UASList.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'UASList.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UASLIST_H
#define UASLIST_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QHeaderView>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_UASList
{
public:
void setupUi(QWidget *UASList) {
if (UASList->objectName().isEmpty())
UASList->setObjectName(QString::fromUtf8("UASList"));
UASList->resize(400, 300);
UASList->setMinimumSize(QSize(500, 0));
retranslateUi(UASList);
QMetaObject::connectSlotsByName(UASList);
} // setupUi
void retranslateUi(QWidget *UASList) {
UASList->setWindowTitle(QApplication::translate("UASList", "Form", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class UASList: public Ui_UASList {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UASLIST_H
src/ui/generated/UASView.h deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/generated/WatchdogControl.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'WatchdogControl.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef WATCHDOGCONTROL_H
#define WATCHDOGCONTROL_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QHeaderView>
#include <QLabel>
#include <QVBoxLayout>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_WatchdogControl
{
public:
QVBoxLayout *verticalLayout;
QWidget *mainWidget;
QLabel *processInfoLabel;
void setupUi(QWidget *WatchdogControl) {
if (WatchdogControl->objectName().isEmpty())
WatchdogControl->setObjectName(QString::fromUtf8("WatchdogControl"));
WatchdogControl->resize(400, 300);
verticalLayout = new QVBoxLayout(WatchdogControl);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
mainWidget = new QWidget(WatchdogControl);
mainWidget->setObjectName(QString::fromUtf8("mainWidget"));
verticalLayout->addWidget(mainWidget);
processInfoLabel = new QLabel(WatchdogControl);
processInfoLabel->setObjectName(QString::fromUtf8("processInfoLabel"));
verticalLayout->addWidget(processInfoLabel);
verticalLayout->setStretch(0, 100);
retranslateUi(WatchdogControl);
QMetaObject::connectSlotsByName(WatchdogControl);
} // setupUi
void retranslateUi(QWidget *WatchdogControl) {
WatchdogControl->setWindowTitle(QApplication::translate("WatchdogControl", "Form", 0, QApplication::UnicodeUTF8));
processInfoLabel->setText(QApplication::translate("WatchdogControl", "0 Processes Core 1: 0% Core 2: 0%", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class WatchdogControl: public Ui_WatchdogControl {};
} // namespace Ui
QT_END_NAMESPACE
#endif // WATCHDOGCONTROL_H
src/ui/generated/WatchdogProcessView.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'WatchdogProcessView.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef WATCHDOGPROCESSVIEW_H
#define WATCHDOGPROCESSVIEW_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QToolButton>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_WatchdogProcessView
{
public:
QHBoxLayout *horizontalLayout;
QLabel *nameLabel;
QLabel *pidLabel;
QLabel *argumentsLabel;
QToolButton *startButton;
QToolButton *restartButton;
void setupUi(QWidget *WatchdogProcessView) {
if (WatchdogProcessView->objectName().isEmpty())
WatchdogProcessView->setObjectName(QString::fromUtf8("WatchdogProcessView"));
WatchdogProcessView->resize(400, 44);
horizontalLayout = new QHBoxLayout(WatchdogProcessView);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
nameLabel = new QLabel(WatchdogProcessView);
nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
horizontalLayout->addWidget(nameLabel);
pidLabel = new QLabel(WatchdogProcessView);
pidLabel->setObjectName(QString::fromUtf8("pidLabel"));
horizontalLayout->addWidget(pidLabel);
argumentsLabel = new QLabel(WatchdogProcessView);
argumentsLabel->setObjectName(QString::fromUtf8("argumentsLabel"));
horizontalLayout->addWidget(argumentsLabel);
startButton = new QToolButton(WatchdogProcessView);
startButton->setObjectName(QString::fromUtf8("startButton"));
horizontalLayout->addWidget(startButton);
restartButton = new QToolButton(WatchdogProcessView);
restartButton->setObjectName(QString::fromUtf8("restartButton"));
horizontalLayout->addWidget(restartButton);
retranslateUi(WatchdogProcessView);
QMetaObject::connectSlotsByName(WatchdogProcessView);
} // setupUi
void retranslateUi(QWidget *WatchdogProcessView) {
WatchdogProcessView->setWindowTitle(QApplication::translate("WatchdogProcessView", "Form", 0, QApplication::UnicodeUTF8));
nameLabel->setText(QApplication::translate("WatchdogProcessView", "TextLabel", 0, QApplication::UnicodeUTF8));
pidLabel->setText(QApplication::translate("WatchdogProcessView", "TextLabel", 0, QApplication::UnicodeUTF8));
argumentsLabel->setText(QApplication::translate("WatchdogProcessView", "TextLabel", 0, QApplication::UnicodeUTF8));
startButton->setText(QApplication::translate("WatchdogProcessView", "...", 0, QApplication::UnicodeUTF8));
restartButton->setText(QApplication::translate("WatchdogProcessView", "...", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class WatchdogProcessView: public Ui_WatchdogProcessView {};
} // namespace Ui
QT_END_NAMESPACE
#endif // WATCHDOGPROCESSVIEW_H
src/ui/generated/WatchdogView.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'WatchdogView.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef WATCHDOGVIEW_H
#define WATCHDOGVIEW_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGridLayout>
#include <QHeaderView>
#include <QLabel>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_WatchdogView
{
public:
QGridLayout *gridLayout;
QLabel *nameLabel;
QWidget *processListWidget;
void setupUi(QWidget *WatchdogView) {
if (WatchdogView->objectName().isEmpty())
WatchdogView->setObjectName(QString::fromUtf8("WatchdogView"));
WatchdogView->resize(400, 300);
gridLayout = new QGridLayout(WatchdogView);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
nameLabel = new QLabel(WatchdogView);
nameLabel->setObjectName(QString::fromUtf8("nameLabel"));
gridLayout->addWidget(nameLabel, 0, 0, 1, 1);
processListWidget = new QWidget(WatchdogView);
processListWidget->setObjectName(QString::fromUtf8("processListWidget"));
gridLayout->addWidget(processListWidget, 1, 0, 1, 1);
gridLayout->setRowStretch(1, 100);
retranslateUi(WatchdogView);
QMetaObject::connectSlotsByName(WatchdogView);
} // setupUi
void retranslateUi(QWidget *WatchdogView) {
WatchdogView->setWindowTitle(QApplication::translate("WatchdogView", "Form", 0, QApplication::UnicodeUTF8));
nameLabel->setText(QApplication::translate("WatchdogView", "Watchdog", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class WatchdogView: public Ui_WatchdogView {};
} // namespace Ui
QT_END_NAMESPACE
#endif // WATCHDOGVIEW_H
src/ui/generated/WaypointList.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'WaypointList.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef WAYPOINTLIST_H
#define WAYPOINTLIST_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGridLayout>
#include <QHBoxLayout>
#include <QHeaderView>
#include <QLabel>
#include <QPushButton>
#include <QScrollArea>
#include <QSpacerItem>
#include <QToolButton>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_WaypointList
{
public:
QAction *actionAddWaypoint;
QAction *actionTransmit;
QAction *actionRead;
QGridLayout *gridLayout;
QScrollArea *scrollArea;
QWidget *scrollAreaWidgetContents;
QHBoxLayout *horizontalLayout;
QWidget *listWidget;
QPushButton *readButton;
QPushButton *transmitButton;
QLabel *statusLabel;
QToolButton *addButton;
QPushButton *loadButton;
QPushButton *saveButton;
QSpacerItem *horizontalSpacer;
QToolButton *positionAddButton;
void setupUi(QWidget *WaypointList) {
if (WaypointList->objectName().isEmpty())
WaypointList->setObjectName(QString::fromUtf8("WaypointList"));
WaypointList->resize(476, 218);
WaypointList->setMinimumSize(QSize(100, 120));
actionAddWaypoint = new QAction(WaypointList);
actionAddWaypoint->setObjectName(QString::fromUtf8("actionAddWaypoint"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/files/images/actions/list-add.svg"), QSize(), QIcon::Normal, QIcon::Off);
actionAddWaypoint->setIcon(icon);
actionTransmit = new QAction(WaypointList);
actionTransmit->setObjectName(QString::fromUtf8("actionTransmit"));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/files/images/devices/network-wireless.svg"), QSize(), QIcon::Normal, QIcon::Off);
actionTransmit->setIcon(icon1);
actionRead = new QAction(WaypointList);
actionRead->setObjectName(QString::fromUtf8("actionRead"));
QIcon icon2;
icon2.addFile(QString::fromUtf8(":/files/images/status/software-update-available.svg"), QSize(), QIcon::Normal, QIcon::Off);
actionRead->setIcon(icon2);
gridLayout = new QGridLayout(WaypointList);
gridLayout->setSpacing(4);
gridLayout->setContentsMargins(4, 4, 4, 4);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
scrollArea = new QScrollArea(WaypointList);
scrollArea->setObjectName(QString::fromUtf8("scrollArea"));
scrollArea->setWidgetResizable(true);
scrollAreaWidgetContents = new QWidget();
scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents"));
scrollAreaWidgetContents->setGeometry(QRect(0, 0, 466, 149));
horizontalLayout = new QHBoxLayout(scrollAreaWidgetContents);
horizontalLayout->setSpacing(0);
horizontalLayout->setContentsMargins(4, 4, 4, 4);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
listWidget = new QWidget(scrollAreaWidgetContents);
listWidget->setObjectName(QString::fromUtf8("listWidget"));
horizontalLayout->addWidget(listWidget);
scrollArea->setWidget(scrollAreaWidgetContents);
gridLayout->addWidget(scrollArea, 0, 0, 1, 9);
readButton = new QPushButton(WaypointList);
readButton->setObjectName(QString::fromUtf8("readButton"));
readButton->setIcon(icon2);
gridLayout->addWidget(readButton, 2, 7, 1, 1);
transmitButton = new QPushButton(WaypointList);
transmitButton->setObjectName(QString::fromUtf8("transmitButton"));
transmitButton->setIcon(icon1);
gridLayout->addWidget(transmitButton, 2, 8, 1, 1);
statusLabel = new QLabel(WaypointList);
statusLabel->setObjectName(QString::fromUtf8("statusLabel"));
gridLayout->addWidget(statusLabel, 3, 0, 1, 9);
addButton = new QToolButton(WaypointList);
addButton->setObjectName(QString::fromUtf8("addButton"));
addButton->setIcon(icon);
gridLayout->addWidget(addButton, 2, 6, 1, 1);
loadButton = new QPushButton(WaypointList);
loadButton->setObjectName(QString::fromUtf8("loadButton"));
gridLayout->addWidget(loadButton, 2, 3, 1, 1);
saveButton = new QPushButton(WaypointList);
saveButton->setObjectName(QString::fromUtf8("saveButton"));
gridLayout->addWidget(saveButton, 2, 2, 1, 1);
horizontalSpacer = new QSpacerItem(127, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
gridLayout->addItem(horizontalSpacer, 2, 4, 1, 1);
positionAddButton = new QToolButton(WaypointList);
positionAddButton->setObjectName(QString::fromUtf8("positionAddButton"));
QIcon icon3;
icon3.addFile(QString::fromUtf8(":/files/images/actions/go-bottom.svg"), QSize(), QIcon::Normal, QIcon::Off);
positionAddButton->setIcon(icon3);
gridLayout->addWidget(positionAddButton, 2, 5, 1, 1);
gridLayout->setRowStretch(0, 100);
retranslateUi(WaypointList);
QMetaObject::connectSlotsByName(WaypointList);
} // setupUi
void retranslateUi(QWidget *WaypointList) {
WaypointList->setWindowTitle(QApplication::translate("WaypointList", "Form", 0, QApplication::UnicodeUTF8));
actionAddWaypoint->setText(QApplication::translate("WaypointList", "Add Waypoint", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
actionAddWaypoint->setToolTip(QApplication::translate("WaypointList", "Add a new waypoint to the end of the list", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
actionTransmit->setText(QApplication::translate("WaypointList", "Transmit", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
actionTransmit->setToolTip(QApplication::translate("WaypointList", "Transmit waypoints to unmanned system", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
actionRead->setText(QApplication::translate("WaypointList", "Read", 0, QApplication::UnicodeUTF8));
readButton->setText(QApplication::translate("WaypointList", "Read", 0, QApplication::UnicodeUTF8));
transmitButton->setText(QApplication::translate("WaypointList", "Write", 0, QApplication::UnicodeUTF8));
statusLabel->setText(QApplication::translate("WaypointList", "TextLabel", 0, QApplication::UnicodeUTF8));
addButton->setText(QApplication::translate("WaypointList", "...", 0, QApplication::UnicodeUTF8));
loadButton->setText(QApplication::translate("WaypointList", "Load WPs", 0, QApplication::UnicodeUTF8));
saveButton->setText(QApplication::translate("WaypointList", "Save WPs", 0, QApplication::UnicodeUTF8));
#ifndef QT_NO_TOOLTIP
positionAddButton->setToolTip(QApplication::translate("WaypointList", "Set the current vehicle position as new waypoint", 0, QApplication::UnicodeUTF8));
#endif // QT_NO_TOOLTIP
positionAddButton->setText(QApplication::translate("WaypointList", "...", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class WaypointList: public Ui_WaypointList {};
} // namespace Ui
QT_END_NAMESPACE
#endif // WAYPOINTLIST_H
src/ui/generated/WaypointView.h deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/generated/XMLCommProtocolWidget.h deleted 100644 → 0
View file @ 1a182ddd
/********************************************************************************
** Form generated from reading UI file 'XMLCommProtocolWidget.ui'
**
** Created: Sun Jul 11 18:53:34 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef XMLCOMMPROTOCOLWIDGET_H
#define XMLCOMMPROTOCOLWIDGET_H
#include <QtCore/QVariant>
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
#include <QGridLayout>
#include <QHeaderView>
#include <QLabel>
#include <QPlainTextEdit>
#include <QPushButton>
#include <QTextEdit>
#include <QTreeView>
#include <QWidget>
QT_BEGIN_NAMESPACE
class Ui_XMLCommProtocolWidget
{
public:
QGridLayout *gridLayout;
QLabel *fileNameLabel;
QPushButton *selectFileButton;
QTextEdit *xmlTextView;
QLabel *outputDirNameLabel;
QPushButton *selectOutputButton;
QTreeView *xmlTreeView;
QLabel *label;
QPlainTextEdit *compileLog;
QLabel *validXMLLabel;
QPushButton *saveButton;
QPushButton *generateButton;
void setupUi(QWidget *XMLCommProtocolWidget) {
if (XMLCommProtocolWidget->objectName().isEmpty())
XMLCommProtocolWidget->setObjectName(QString::fromUtf8("XMLCommProtocolWidget"));
XMLCommProtocolWidget->resize(846, 480);
gridLayout = new QGridLayout(XMLCommProtocolWidget);
gridLayout->setSpacing(12);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setContentsMargins(-1, 6, 6, 6);
fileNameLabel = new QLabel(XMLCommProtocolWidget);
fileNameLabel->setObjectName(QString::fromUtf8("fileNameLabel"));
fileNameLabel->setMaximumSize(QSize(300, 16777215));
fileNameLabel->setScaledContents(true);
fileNameLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
gridLayout->addWidget(fileNameLabel, 0, 0, 1, 1);
selectFileButton = new QPushButton(XMLCommProtocolWidget);
selectFileButton->setObjectName(QString::fromUtf8("selectFileButton"));
QIcon icon;
icon.addFile(QString::fromUtf8(":/files/images/status/folder-open.svg"), QSize(), QIcon::Normal, QIcon::Off);
selectFileButton->setIcon(icon);
gridLayout->addWidget(selectFileButton, 0, 2, 1, 1);
xmlTextView = new QTextEdit(XMLCommProtocolWidget);
xmlTextView->setObjectName(QString::fromUtf8("xmlTextView"));
xmlTextView->setReadOnly(false);
gridLayout->addWidget(xmlTextView, 0, 3, 6, 1);
outputDirNameLabel = new QLabel(XMLCommProtocolWidget);
outputDirNameLabel->setObjectName(QString::fromUtf8("outputDirNameLabel"));
outputDirNameLabel->setMaximumSize(QSize(400, 16777215));
outputDirNameLabel->setScaledContents(true);
gridLayout->addWidget(outputDirNameLabel, 1, 0, 1, 2);
selectOutputButton = new QPushButton(XMLCommProtocolWidget);
selectOutputButton->setObjectName(QString::fromUtf8("selectOutputButton"));
selectOutputButton->setIcon(icon);
gridLayout->addWidget(selectOutputButton, 1, 2, 1, 1);
xmlTreeView = new QTreeView(XMLCommProtocolWidget);
xmlTreeView->setObjectName(QString::fromUtf8("xmlTreeView"));
gridLayout->addWidget(xmlTreeView, 2, 0, 1, 3);
label = new QLabel(XMLCommProtocolWidget);
label->setObjectName(QString::fromUtf8("label"));
gridLayout->addWidget(label, 3, 0, 1, 2);
compileLog = new QPlainTextEdit(XMLCommProtocolWidget);
compileLog->setObjectName(QString::fromUtf8("compileLog"));
gridLayout->addWidget(compileLog, 4, 0, 1, 3);
validXMLLabel = new QLabel(XMLCommProtocolWidget);
validXMLLabel->setObjectName(QString::fromUtf8("validXMLLabel"));
gridLayout->addWidget(validXMLLabel, 5, 0, 1, 1);
saveButton = new QPushButton(XMLCommProtocolWidget);
saveButton->setObjectName(QString::fromUtf8("saveButton"));
gridLayout->addWidget(saveButton, 5, 1, 1, 1);
generateButton = new QPushButton(XMLCommProtocolWidget);
generateButton->setObjectName(QString::fromUtf8("generateButton"));
QIcon icon1;
icon1.addFile(QString::fromUtf8(":/files/images/categories/applications-system.svg"), QSize(), QIcon::Normal, QIcon::Off);
generateButton->setIcon(icon1);
gridLayout->addWidget(generateButton, 5, 2, 1, 1);
gridLayout->setRowStretch(2, 100);
gridLayout->setColumnStretch(0, 1);
gridLayout->setColumnStretch(1, 1);
gridLayout->setColumnStretch(2, 1);
gridLayout->setColumnStretch(3, 100);
retranslateUi(XMLCommProtocolWidget);
QMetaObject::connectSlotsByName(XMLCommProtocolWidget);
} // setupUi
void retranslateUi(QWidget *XMLCommProtocolWidget) {
XMLCommProtocolWidget->setWindowTitle(QApplication::translate("XMLCommProtocolWidget", "Form", 0, QApplication::UnicodeUTF8));
fileNameLabel->setText(QApplication::translate("XMLCommProtocolWidget", "Select input file", 0, QApplication::UnicodeUTF8));
selectFileButton->setText(QApplication::translate("XMLCommProtocolWidget", "Select input file", 0, QApplication::UnicodeUTF8));
outputDirNameLabel->setText(QApplication::translate("XMLCommProtocolWidget", "Select output directory", 0, QApplication::UnicodeUTF8));
selectOutputButton->setText(QApplication::translate("XMLCommProtocolWidget", "Select directory", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("XMLCommProtocolWidget", "Compile Output", 0, QApplication::UnicodeUTF8));
validXMLLabel->setText(QApplication::translate("XMLCommProtocolWidget", "No file loaded", 0, QApplication::UnicodeUTF8));
saveButton->setText(QApplication::translate("XMLCommProtocolWidget", "Save file", 0, QApplication::UnicodeUTF8));
generateButton->setText(QApplication::translate("XMLCommProtocolWidget", "Save and generate", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui
{
class XMLCommProtocolWidget: public Ui_XMLCommProtocolWidget {};
} // namespace Ui
QT_END_NAMESPACE
#endif // XMLCOMMPROTOCOLWIDGET_H
src/ui/map3D/Pixhawk3DWidget.cc
View file @ 22aacd61
This diff is collapsed.
src/ui/map3D/Pixhawk3DWidget.h
View file @ 22aacd61
......@@ -78,10 +78,6 @@ private slots:
void setBirdEyeView(void);
void loadTerrainModel(void);
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
void addOverlay(UASInterface* uas);
#endif
void selectTargetHeading(void);
void selectTarget(void);
void setTarget(void);
......@@ -162,21 +158,6 @@ private:
QMap<int, int>& trailIndexMap);
void updateWaypoints(UASInterface* uas, MAV_FRAME frame,
osg::ref_ptr<WaypointGroupNode>& waypointGroupNode);
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
void updateRGBD(UASInterface* uas, MAV_FRAME frame,
osg::ref_ptr<ImageWindowGeode>& rgbImageNode,
osg::ref_ptr<ImageWindowGeode>& depthImageNode);
void updatePointCloud(UASInterface* uas, MAV_FRAME frame,
double robotX, double robotY, double robotZ,
osg::ref_ptr<osg::Geode>& pointCloudNode,
bool colorPointCloudByDistance);
void updateObstacles(UASInterface* uas, MAV_FRAME frame,
double robotX, double robotY, double robotZ,
osg::ref_ptr<ObstacleGroupNode>& obstacleGroupNode);
void updatePlannedPath(UASInterface* uas, MAV_FRAME frame,
double robotX, double robotY, double robotZ,
osg::ref_ptr<osg::Geode>& plannedPathNode);
#endif
int findWaypoint(const QPoint& mousePos);
bool findTarget(int mouseX, int mouseY);
......
src/ui/map3D/SystemContainer.cc
View file @ 22aacd61
......@@ -96,25 +96,3 @@ SystemContainer::waypointGroupNode(void)
{
return mWaypointGroupNode;
}
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
osg::ref_ptr<ObstacleGroupNode>&
SystemContainer::obstacleGroupNode(void)
{
return mObstacleGroupNode;
}
QMap<QString,osg::ref_ptr<GLOverlayGeode> >&
SystemContainer::overlayNodeMap(void)
{
return mOverlayNodeMap;
}
osg::ref_ptr<osg::Geode>&
SystemContainer::plannedPathNode(void)
{
return mPlannedPathNode;
}
#endif
src/ui/map3D/SystemContainer.h
View file @ 22aacd61
......@@ -10,11 +10,6 @@
#include "ImageWindowGeode.h"
#include "WaypointGroupNode.h"
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
#include "GLOverlayGeode.h"
#include "ObstacleGroupNode.h"
#endif
class SystemContainer
{
public:
......@@ -39,11 +34,6 @@ public:
osg::ref_ptr<osg::Node>& targetNode(void);
osg::ref_ptr<osg::Geode>& trailNode(void);
osg::ref_ptr<WaypointGroupNode>& waypointGroupNode(void);
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
osg::ref_ptr<ObstacleGroupNode>& obstacleGroupNode(void);
QMap<QString,osg::ref_ptr<GLOverlayGeode> >& overlayNodeMap(void);
osg::ref_ptr<osg::Geode>& plannedPathNode(void);
#endif
private:
QVector3D mGPSLocalOrigin;
......@@ -66,11 +56,6 @@ private:
osg::ref_ptr<osg::Node> mTargetNode;
osg::ref_ptr<osg::Geode> mTrailNode;
osg::ref_ptr<WaypointGroupNode> mWaypointGroupNode;
#if defined(QGC_PROTOBUF_ENABLED) && defined(QGC_USE_PIXHAWK_MESSAGES)
osg::ref_ptr<ObstacleGroupNode> mObstacleGroupNode;
QMap<QString,osg::ref_ptr<GLOverlayGeode> > mOverlayNodeMap;
osg::ref_ptr<osg::Geode> mPlannedPathNode;
#endif
};
#endif // SYSTEMCONTAINER_H
src/ui/watchdog/WatchdogControl.cc deleted 100644 → 0
View file @ 1a182ddd
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2010 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
/**
* @file
* @brief Implementation of class WatchdogControl
* @author Lorenz Meier <mavteam@student.ethz.ch>
*
*/
#include "WatchdogControl.h"
#include "WatchdogView.h"
#include "WatchdogProcessView.h"
#include "ui_WatchdogControl.h"
#include "PxQuadMAV.h"
#include "UASManager.h"
#include <QDebug>
WatchdogControl::WatchdogControl(QWidget *parent) :
QWidget(parent),
mav(NULL),
updateInterval(2000000),
ui(new Ui::WatchdogControl)
{
ui->setupUi(this);
// UI is initialized, setup layout
listLayout = new QVBoxLayout(ui->mainWidget);
listLayout->setSpacing(6);
listLayout->setMargin(0);
listLayout->setAlignment(Qt::AlignTop);
ui->mainWidget->setLayout(listLayout);
connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(setUAS(UASInterface*)));
this->setVisible(false);
}
WatchdogControl::~WatchdogControl()
{
delete ui;
}
void WatchdogControl::setUAS(UASInterface* uas)
{
PxQuadMAV* qmav = dynamic_cast<PxQuadMAV*>(uas);
if (qmav) {
connect(qmav, SIGNAL(processReceived(int,int,int,QString,QString,int)), this, SLOT(addProcess(int,int,int,QString,QString,int)));
connect(qmav, SIGNAL(watchdogReceived(int,int,uint)), this, SLOT(updateWatchdog(int,int,uint)));
connect(qmav, SIGNAL(processChanged(int,int,int,int,bool,int,int)), this, SLOT(updateProcess(int,int,int,int,bool,int,int)));
}
}
void WatchdogControl::updateWatchdog(int systemId, int watchdogId, unsigned int processCount)
{
// request the watchdog with the given ID
// Get the watchdog and request the info for it
WatchdogInfo& watchdog = this->getWatchdog(systemId, watchdogId);
// if the proces count doesn't match, the watchdog is either new or has changed - create a new vector with new (and empty) ProcessInfo structs.
if (watchdog.processes_.size() != processCount) {
watchdog.processes_ = std::vector<ProcessInfo>(processCount);
// Create new UI widget
//WatchdogView* view = new WatchdogView(this);
}
// start the timeout timer
//watchdog.timeoutTimer_.reset();
qDebug() << "WATCHDOG RECEIVED";
//qDebug() << "<-- received mavlink_watchdog_heartbeat_t " << msg->sysid << " / " << payload.watchdog_id << " / " << payload.process_count << std::endl;
}
void WatchdogControl::addProcess(int systemId, int watchdogId, int processId, QString name, QString arguments, int timeout)
{
// request the watchdog and the process with the given IDs
WatchdogInfo& watchdog = this->getWatchdog(systemId, watchdogId);
ProcessInfo& process = watchdog.getProcess(processId);
// store the process information in the ProcessInfo struct
process.name_ = name.toStdString();
process.arguments_ = arguments.toStdString();
process.timeout_ = timeout;
qDebug() << "PROCESS RECEIVED";
qDebug() << "SYS" << systemId << "WD" << watchdogId << "PROCESS" << processId << name << "ARG" << arguments << "TO" << timeout;
//qDebug() << "<-- received mavlink_watchdog_process_info_t " << msg->sysid << " / " << (const char*)payload.name << " / " << (const char*)payload.arguments << " / " << payload.timeout << std::endl;
}
void WatchdogControl::updateProcess(int systemId, int watchdogId, int processId, int state, bool muted, int crashes, int pid)
{
// request the watchdog and the process with the given IDs
WatchdogInfo& watchdog = this->getWatchdog(systemId, watchdogId);
ProcessInfo& process = watchdog.getProcess(processId);
// store the status information in the ProcessInfo struct
process.state_ = static_cast<ProcessInfo::State::Enum>(state);
process.muted_ = muted;
process.crashes_ = crashes;
process.pid_ = pid;
qDebug() << "PROCESS UPDATED";
qDebug() << "SYS" << systemId << "WD" << watchdogId << "PROCESS" << processId << "STATE" << state << "CRASH" << crashes << "PID" << pid;
//process.updateTimer_.reset();
//qDebug() << "<-- received mavlink_watchdog_process_status_t " << msg->sysid << " / " << payload.state << " / " << payload.muted << " / " << payload.crashes << " / " << payload.pid << std::endl;
}
/**
@brief Returns a WatchdogInfo struct that belongs to the watchdog with the given system-ID and watchdog-ID
*/
WatchdogControl::WatchdogInfo& WatchdogControl::getWatchdog(uint8_t systemId, uint16_t watchdogId)
{
WatchdogID id(systemId, watchdogId);
std::map<WatchdogID, WatchdogInfo>::iterator it = this->watchdogs_.find(id);
if (it != this->watchdogs_.end()) {
// the WatchdogInfo struct already exists in the map, return it
return it->second;
} else {
// the WatchdogInfo struct doesn't exist - request info and status for all processes and create the struct
this->sendCommand(id, WatchdogControl::ALL, Command::RequestInfo);
this->sendCommand(id, WatchdogControl::ALL, Command::RequestStatus);
return this->watchdogs_[id];
}
}
/**
@brief Returns a ProcessInfo struct that belongs to the process with the given ID.
*/
WatchdogControl::ProcessInfo& WatchdogControl::WatchdogInfo::getProcess(uint16_t index)
{
// if the index is out of bounds, resize the vector
if (index >= this->processes_.size())
this->processes_.resize(index + 1);
return this->processes_[index];
}
/**
@brief Sends a watchdog command to a process on a given watchdog.
@param w_id The WatchdogID struct (containing system-ID and watchdog-ID) that identifies the watchdog
@param p_id The process-ID
@param command The command-ID
*/
void WatchdogControl::sendCommand(const WatchdogID& w_id, uint16_t p_id, Command::Enum command)
{
emit sendProcessCommand(w_id.watchdog_id_, p_id, command);
}
void WatchdogControl::changeEvent(QEvent *e)
{
QWidget::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
ui->retranslateUi(this);
break;
default:
break;
}
}
src/ui/watchdog/WatchdogControl.h deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/watchdog/WatchdogControl.ui deleted 100644 → 0
View file @ 1a182ddd
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>WatchdogControl</class>
<widget class="QWidget" name="WatchdogControl">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="100,0">
<item>
<widget class="QWidget" name="mainWidget" native="true"/>
</item>
<item>
<widget class="QLabel" name="processInfoLabel">
<property name="text">
<string>0 Processes Core 1: 0% Core 2: 0%</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
src/ui/watchdog/WatchdogProcessView.cc deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/watchdog/WatchdogProcessView.h deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/watchdog/WatchdogProcessView.ui deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/watchdog/WatchdogView.cc deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/watchdog/WatchdogView.h deleted 100644 → 0
View file @ 1a182ddd
This diff is collapsed.
src/ui/watchdog/WatchdogView.ui deleted 100644 → 0
View file @ 1a182ddd
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>WatchdogView</class>
<widget class="QWidget" name="WatchdogView">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout" rowstretch="0,100">
<item row="0" column="0">
<widget class="QLabel" name="nameLabel">
<property name="text">
<string>Watchdog</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QWidget" name="processListWidget" native="true"/>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment