Skip to content

Q
qgroundcontrol
Commit 4044530f authored by pixhawk's avatar pixhawk
Browse files
Options

Backup. Do not use

parent aa5d5043
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1047 additions and 139 deletions
qgroundcontrol.pro
View file @ 4044530f
......@@ -239,7 +239,8 @@ FORMS += src/ui/MainWindow.ui \
src/ui/mavlink/QGCMAVLinkMessageSender.ui \
src/ui/firmwareupdate/QGCFirmwareUpdateWidget.ui \
src/ui/QGCPluginHost.ui \
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.ui
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.ui \
src/ui/mission/QGCMissionOther.ui
INCLUDEPATH += src \
src/ui \
src/ui/linechart \
......@@ -254,6 +255,7 @@ INCLUDEPATH += src \
src/ui/param \
src/ui/watchdog \
src/ui/map3D \
src/ui/mission \
src/ui/designer
HEADERS += src/MG.h \
src/QGCCore.h \
......@@ -361,7 +363,8 @@ HEADERS += src/MG.h \
src/ui/mavlink/QGCMAVLinkMessageSender.h \
src/ui/firmwareupdate/QGCFirmwareUpdateWidget.h \
src/ui/QGCPluginHost.h \
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.h
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.h \
src/ui/mission/QGCMissionOther.h
# Google Earth is only supported on Mac OS and Windows with Visual Studio Compiler
macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::HEADERS += src/ui/map3D/QGCGoogleEarthView.h
......@@ -493,7 +496,8 @@ SOURCES += src/main.cc \
src/ui/mavlink/QGCMAVLinkMessageSender.cc \
src/ui/firmwareupdate/QGCFirmwareUpdateWidget.cc \
src/ui/QGCPluginHost.cc \
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.cc
src/ui/firmwareupdate/QGCPX4FirmwareUpdate.cc \
src/ui/mission/QGCMissionOther.cc
# Enable Google Earth only on Mac OS and Windows with Visual Studio compiler
macx|macx-g++|macx-g++42|win32-msvc2008|win32-msvc2010::SOURCES += src/ui/map3D/QGCGoogleEarthView.cc
......
src/ui/WaypointEditableView.cc
View file @ 4044530f
This diff is collapsed.
src/ui/WaypointEditableView.h
View file @ 4044530f
......@@ -48,8 +48,11 @@ namespace Ui
{
class WaypointEditableView;
}
class Ui_QGCCustomWaypointAction;
class Ui_QGCMissionDoWidget;
//class Ui_QGCCustomWaypointAction;
//class Ui_QGCMissionDoWidget;
class QGCMissionDoWidget;
class QGCMissionConditionWidget;
class QGCMissionOther;
class WaypointEditableView : public QWidget
{
Q_OBJECT
......@@ -83,8 +86,9 @@ protected:
Waypoint* wp;
// Special widgets extendending the
// waypoint view to mission capabilities
Ui_QGCCustomWaypointAction* customCommand;
Ui_QGCMissionDoWidget* doCommand;
QGCMissionDoWidget* MissionDoJumpWidget;
QGCMissionConditionWidget* MissionConditionDelayWidget;
QGCMissionOther* MissionOtherWidget;
QGC_WAYPOINTEDITABLEVIEW_MODE viewMode;
private:
......
src/ui/WaypointEditableView.ui
View file @ 4044530f
......@@ -96,7 +96,7 @@ QPushButton:pressed {
<property name="title">
<string/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="5,5,5,5,50,50,50,50,50,50,5,20,20,5,10,10,0,0,0,20,5,5,5,5">
<layout class="QHBoxLayout" name="horizontalLayout" stretch="2,5,20,20,50,50,50,50,50,50,5,20,20,5,10,10,200,5,0,0,0,0">
<property name="spacing">
<number>2</number>
</property>
......@@ -113,7 +113,7 @@ QPushButton:pressed {
</property>
<property name="minimumSize">
<size>
<width>25</width>
<width>20</width>
<height>0</height>
</size>
</property>
......@@ -165,11 +165,17 @@ QPushButton:pressed {
<item>
<widget class="QComboBox" name="comboBox_action">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Action at Waypoint</string>
</property>
......@@ -184,11 +190,17 @@ QPushButton:pressed {
<item>
<widget class="QComboBox" name="comboBox_frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Coordinate frame</string>
</property>
......@@ -594,7 +606,7 @@ where to accept this waypoint as reached</string>
<item>
<widget class="QWidget" name="customActionWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -607,26 +619,6 @@ where to accept this waypoint as reached</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="missionDoWidgetSlot" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="missionConditionWidgetSlot" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<spacer name="removeSpacer">
<property name="orientation">
......@@ -635,7 +627,7 @@ where to accept this waypoint as reached</string>
<property name="sizeHint" stdset="0">
<size>
<width>5</width>
<height>20</height>
<height>10</height>
</size>
</property>
</spacer>
......@@ -643,7 +635,7 @@ where to accept this waypoint as reached</string>
<item>
<widget class="QCheckBox" name="autoContinue">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -661,6 +653,12 @@ where to accept this waypoint as reached</string>
</item>
<item>
<widget class="QPushButton" name="upButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>28</width>
......@@ -687,6 +685,12 @@ where to accept this waypoint as reached</string>
</item>
<item>
<widget class="QPushButton" name="downButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>28</width>
......@@ -713,6 +717,12 @@ where to accept this waypoint as reached</string>
</item>
<item>
<widget class="QPushButton" name="removeButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>28</width>
......
src/ui/WaypointList.cc.orig 0 → 100644
View file @ 4044530f
This diff is collapsed.
src/ui/WaypointViewOnlyView.cc
View file @ 4044530f
......@@ -28,7 +28,7 @@ void WaypointViewOnlyView::changedAutoContinue(int state)
void WaypointViewOnlyView::changedCurrent(int state)
//This is a slot receiving signals from QCheckBox m_ui->current. The state given here is whatever the user has clicked and not the true "current" value onboard.
{
qDebug() << "Trof: WaypointViewOnlyView::changedCurrent(" << state << ") ID:" << wp->getId();
//qDebug() << "Trof: WaypointViewOnlyView::changedCurrent(" << state << ") ID:" << wp->getId();
m_ui->current->blockSignals(true);
if (m_ui->current->isChecked() == false)
......@@ -36,19 +36,19 @@ void WaypointViewOnlyView::changedCurrent(int state)
if (wp->getCurrent() == true) //User clicked on the waypoint, that is already current. Box stays checked
{
m_ui->current->setCheckState(Qt::Checked);
qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Rechecked true. stay true " << m_ui->current->isChecked();
//qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Rechecked true. stay true " << m_ui->current->isChecked();
}
else // Strange case, unchecking the box which was not checked to start with
{
m_ui->current->setCheckState(Qt::Unchecked);
qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Unchecked false. set false " << m_ui->current->isChecked();
//qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Unchecked false. set false " << m_ui->current->isChecked();
}
}
else
{
hightlightDesiredCurrent(true);
m_ui->current->setCheckState(Qt::Unchecked);
qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Checked new. Sending set_current request to Manager " << m_ui->current->isChecked();
//qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Checked new. Sending set_current request to Manager " << m_ui->current->isChecked();
emit changeCurrentWaypoint(wp->getId()); //the slot changeCurrentWaypoint() in WaypointList sets all other current flags to false
}
......
src/ui/mission/QGCCustomWaypointAction.ui
View file @ 4044530f
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>1228</width>
<height>25</height>
<height>27</height>
</rect>
</property>
<property name="windowTitle">
......@@ -22,6 +22,12 @@
</property>
<item>
<widget class="QSpinBox" name="commandSpinBox">
<property name="toolTip">
<string>MAV_CMD id</string>
</property>
<property name="statusTip">
<string>MAV_CMD id</string>
</property>
<property name="prefix">
<string>CMD </string>
</property>
......@@ -41,6 +47,9 @@
<property name="prefix">
<string>P1 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......@@ -51,9 +60,15 @@
</item>
<item>
<widget class="QDoubleSpinBox" name="param2SpinBox">
<property name="toolTip">
<string/>
</property>
<property name="prefix">
<string>P2 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......@@ -67,6 +82,9 @@
<property name="prefix">
<string>P3 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......@@ -80,6 +98,9 @@
<property name="prefix">
<string>P4 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......@@ -93,6 +114,9 @@
<property name="prefix">
<string>P5 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......@@ -106,6 +130,9 @@
<property name="prefix">
<string>P6 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......@@ -119,6 +146,9 @@
<property name="prefix">
<string>P7 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
......
src/ui/mission/QGCMissionDoWidget.ui
View file @ 4044530f
......@@ -7,60 +7,49 @@
<x>0</x>
<y>0</y>
<width>632</width>
<height>40</height>
<height>27</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QSpinBox" name="doJumpIndexSpinBox">
<property name="geometry">
<rect>
<x>170</x>
<y>10</y>
<width>201</width>
<height>25</height>
</rect>
</property>
<property name="suffix">
<string/>
</property>
<property name="prefix">
<string>list index to jump to: </string>
</property>
<property name="maximum">
<number>5000</number>
</property>
</widget>
<widget class="QSpinBox" name="doJumpRepeatSpinBox">
<property name="geometry">
<rect>
<x>380</x>
<y>10</y>
<width>121</width>
<height>25</height>
</rect>
</property>
<property name="suffix">
<string> times</string>
</property>
<property name="prefix">
<string>repeat </string>
</property>
<property name="maximum">
<number>1000</number>
</property>
</widget>
<widget class="QComboBox" name="doSetModeComboBox">
<property name="geometry">
<rect>
<x>20</x>
<y>10</y>
<width>111</width>
<height>26</height>
</rect>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="10,10,10">
<property name="spacing">
<number>5</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QComboBox" name="doSetModeComboBox"/>
</item>
<item>
<widget class="QSpinBox" name="doJumpIndexSpinBox">
<property name="suffix">
<string/>
</property>
<property name="prefix">
<string>list index to jump to: </string>
</property>
<property name="maximum">
<number>5000</number>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="doJumpRepeatSpinBox">
<property name="suffix">
<string> times</string>
</property>
<property name="prefix">
<string>repeat </string>
</property>
<property name="maximum">
<number>1000</number>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
......
src/ui/mission/QGCMissionOther.cc 0 → 100644
View file @ 4044530f
#include "QGCMissionOther.h"
#include "ui_QGCMissionOther.h"
QGCMissionOther::QGCMissionOther(QWidget *parent) :
QWidget(parent),
ui(new Ui::QGCMissionOther)
{
ui->setupUi(this);
}
QGCMissionOther::~QGCMissionOther()
{
delete ui;
}
src/ui/mission/QGCMissionOther.h 0 → 100644
View file @ 4044530f
#ifndef QGCMISSIONOTHER_H
#define QGCMISSIONOTHER_H
#include <QWidget>
namespace Ui {
class QGCMissionOther;
}
class QGCMissionOther : public QWidget
{
Q_OBJECT
public:
explicit QGCMissionOther(QWidget *parent = 0);
~QGCMissionOther();
Ui::QGCMissionOther *ui;
private:
};
#endif // QGCMISSIONOTHER_H
src/ui/mission/QGCMissionOther.ui 0 → 100644
View file @ 4044530f
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QGCMissionOther</class>
<widget class="QWidget" name="QGCMissionOther">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1266</width>
<height>27</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="10,0,10,10,10,10,0,0">
<property name="spacing">
<number>5</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QSpinBox" name="commandSpinBox">
<property name="toolTip">
<string>MAV_CMD id</string>
</property>
<property name="statusTip">
<string>MAV_CMD id</string>
</property>
<property name="prefix">
<string>CMD </string>
</property>
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param1SpinBox">
<property name="prefix">
<string>P1 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param2SpinBox">
<property name="toolTip">
<string/>
</property>
<property name="prefix">
<string>P2 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param3SpinBox">
<property name="prefix">
<string>P3 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param4SpinBox">
<property name="prefix">
<string>P4 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param5SpinBox">
<property name="prefix">
<string>P5 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param6SpinBox">
<property name="prefix">
<string>P6 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="param7SpinBox">
<property name="prefix">
<string>P7 </string>
</property>
<property name="decimals">
<number>7</number>
</property>
<property name="minimum">
<double>-2147483647.000000000000000</double>
</property>
<property name="maximum">
<double>2147483647.000000000000000</double>
</property>
</widget>
</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