Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
f7ec7607
Commit
f7ec7607
authored
Jul 10, 2013
by
Michael Carpenter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ArduPlane pid screen visuals
parent
a1eda05f
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
1012 additions
and
18 deletions
+1012
-18
qgroundcontrol.pro
qgroundcontrol.pro
+6
-3
ApmSoftwareConfig.cc
src/ui/configuration/ApmSoftwareConfig.cc
+4
-4
ArduCopterPidConfig.cc
src/ui/configuration/ArduCopterPidConfig.cc
+2
-6
ArduCopterPidConfig.h
src/ui/configuration/ArduCopterPidConfig.h
+4
-5
ArduPlanePidConfig.cc
src/ui/configuration/ArduPlanePidConfig.cc
+18
-0
ArduPlanePidConfig.h
src/ui/configuration/ArduPlanePidConfig.h
+21
-0
ArduPlanePidConfig.ui
src/ui/configuration/ArduPlanePidConfig.ui
+957
-0
No files found.
qgroundcontrol.pro
View file @
f7ec7607
...
...
@@ -258,7 +258,8 @@ FORMS += src/ui/MainWindow.ui \
src
/
ui
/
configuration
/
AdvancedParamConfig
.
ui
\
src
/
ui
/
configuration
/
ArduCopterPidConfig
.
ui
\
src
/
ui
/
configuration
/
ApmPlaneLevel
.
ui
\
src
/
ui
/
configuration
/
ParamWidget
.
ui
src
/
ui
/
configuration
/
ParamWidget
.
ui
\
src
/
ui
/
configuration
/
ArduPlanePidConfig
.
ui
INCLUDEPATH
+=
src
\
src
/
ui
\
src
/
ui
/
linechart
\
...
...
@@ -441,7 +442,8 @@ HEADERS += src/MG.h \
src
/
ui
/
configuration
/
AdvancedParamConfig
.
h
\
src
/
ui
/
configuration
/
ArduCopterPidConfig
.
h
\
src
/
ui
/
configuration
/
ApmPlaneLevel
.
h
\
src
/
ui
/
configuration
/
ParamWidget
.
h
src
/
ui
/
configuration
/
ParamWidget
.
h
\
src
/
ui
/
configuration
/
ArduPlanePidConfig
.
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
|
win32
-
msvc2012
::
HEADERS
+=
src
/
ui
/
map3D
/
QGCGoogleEarthView
.
h
...
...
@@ -642,7 +644,8 @@ SOURCES += src/main.cc \
src
/
ui
/
configuration
/
AdvancedParamConfig
.
cc
\
src
/
ui
/
configuration
/
ArduCopterPidConfig
.
cc
\
src
/
ui
/
configuration
/
ApmPlaneLevel
.
cc
\
src
/
ui
/
configuration
/
ParamWidget
.
cc
src
/
ui
/
configuration
/
ParamWidget
.
cc
\
src
/
ui
/
configuration
/
ArduPlanePidConfig
.
cc
#
Enable
Google
Earth
only
on
Mac
OS
and
Windows
with
Visual
Studio
compiler
macx
|
macx
-
g
++
|
macx
-
g
++
42
|
win32
-
msvc2008
|
win32
-
msvc2010
|
win32
-
msvc2012
::
SOURCES
+=
src
/
ui
/
map3D
/
QGCGoogleEarthView
.
cc
...
...
src/ui/configuration/ApmSoftwareConfig.cc
View file @
f7ec7607
...
...
@@ -17,10 +17,10 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent)
ui
.
advParamListButton
->
setVisible
(
false
);
ui
.
arduCoperPidButton
->
setVisible
(
false
);
basicPidConfig
=
new
BasicPidConfig
(
this
);
/*
basicPidConfig = new BasicPidConfig(this);
ui.stackedWidget->addWidget(basicPidConfig);
buttonToConfigWidgetMap[ui.basicPidsButton] = basicPidConfig;
connect
(
ui
.
basicPidsButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
activateStackedWidget
()));
connect(ui.basicPidsButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));
*/
flightConfig
=
new
FlightModeConfig
(
this
);
ui
.
stackedWidget
->
addWidget
(
flightConfig
);
...
...
@@ -32,10 +32,10 @@ ApmSoftwareConfig::ApmSoftwareConfig(QWidget *parent) : QWidget(parent)
buttonToConfigWidgetMap
[
ui
.
standardParamButton
]
=
standardParamConfig
;
connect
(
ui
.
standardParamButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
activateStackedWidget
()));
geoFenceConfig
=
new
GeoFenceConfig
(
this
);
/*
geoFenceConfig = new GeoFenceConfig(this);
ui.stackedWidget->addWidget(geoFenceConfig);
buttonToConfigWidgetMap[ui.geoFenceButton] = geoFenceConfig;
connect
(
ui
.
geoFenceButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
activateStackedWidget
()));
connect(ui.geoFenceButton,SIGNAL(clicked()),this,SLOT(activateStackedWidget()));
*/
failSafeConfig
=
new
FailSafeConfig
(
this
);
ui
.
stackedWidget
->
addWidget
(
failSafeConfig
);
...
...
src/ui/configuration/ArduCopterPidConfig.cc
View file @
f7ec7607
#include "ArduCopterPidConfig.h"
#include "ui_ArduCopterPidConfig.h"
ArduCopterPidConfig
::
ArduCopterPidConfig
(
QWidget
*
parent
)
:
QWidget
(
parent
),
ui
(
new
Ui
::
ArduCopterPidConfig
)
ArduCopterPidConfig
::
ArduCopterPidConfig
(
QWidget
*
parent
)
:
AP2ConfigWidget
(
parent
)
{
ui
->
setupUi
(
this
);
ui
.
setupUi
(
this
);
}
ArduCopterPidConfig
::~
ArduCopterPidConfig
()
{
delete
ui
;
}
src/ui/configuration/ArduCopterPidConfig.h
View file @
f7ec7607
...
...
@@ -2,12 +2,11 @@
#define ARDUCOPTERPIDCONFIG_H
#include <QWidget>
#include "ui_ArduCopterPidConfig.h"
namespace
Ui
{
class
ArduCopterPidConfig
;
}
#include "AP2ConfigWidget.h"
class
ArduCopterPidConfig
:
public
Q
Widget
class
ArduCopterPidConfig
:
public
AP2Config
Widget
{
Q_OBJECT
...
...
@@ -16,7 +15,7 @@ public:
~
ArduCopterPidConfig
();
private:
Ui
::
ArduCopterPidConfig
*
ui
;
Ui
::
ArduCopterPidConfig
ui
;
};
#endif // ARDUCOPTERPIDCONFIG_H
src/ui/configuration/ArduPlanePidConfig.cc
0 → 100644
View file @
f7ec7607
#include "ArduPlanePidConfig.h"
ArduPlanePidConfig
::
ArduPlanePidConfig
(
QWidget
*
parent
)
:
AP2ConfigWidget
(
parent
)
{
ui
.
setupUi
(
this
);
}
ArduPlanePidConfig
::~
ArduPlanePidConfig
()
{
}
void
ArduPlanePidconfig
::
parameterChanged
(
int
uas
,
int
component
,
QString
parameterName
,
QVariant
value
)
{
if
(
parameterName
==
""
)
{
}
}
src/ui/configuration/ArduPlanePidConfig.h
0 → 100644
View file @
f7ec7607
#ifndef ARDUPLANEPIDCONFIG_H
#define ARDUPLANEPIDCONFIG_H
#include <QWidget>
#include "ui_ArduPlanePidConfig.h"
#include "AP2ConfigWidget.h"
class
ArduPlanePidConfig
:
public
AP2ConfigWidget
{
Q_OBJECT
public:
explicit
ArduPlanePidConfig
(
QWidget
*
parent
=
0
);
~
ArduPlanePidConfig
();
private
slots
:
void
parameterChanged
(
int
uas
,
int
component
,
QString
parameterName
,
QVariant
value
);
private:
Ui
::
ArduPlanePidConfig
ui
;
};
#endif // ARDUPLANEPIDCONFIG_H
src/ui/configuration/ArduPlanePidConfig.ui
0 → 100644
View file @
f7ec7607
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment