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
083ae630
Commit
083ae630
authored
Dec 14, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed minor bugs, fixed object detection issues
parent
fbedfdc4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
5 deletions
+67
-5
qgroundcontrol.pri
qgroundcontrol.pri
+4
-2
ObjectDetectionView.cc
src/ui/ObjectDetectionView.cc
+1
-3
RadioCalibrationWindow.cc
src/ui/RadioCalibration/RadioCalibrationWindow.cc
+60
-0
RadioCalibrationWindow.h
src/ui/RadioCalibration/RadioCalibrationWindow.h
+2
-0
No files found.
qgroundcontrol.pri
View file @
083ae630
...
...
@@ -209,7 +209,8 @@ linux-g++ {
QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$DESTDIR
QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$DESTDIR
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/images
QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf
QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/patterns $$DESTDIR/images
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
...
...
@@ -278,7 +279,8 @@ linux-g++-64 {
QMAKE_POST_LINK += && cp -rf $$BASEDIR/models $$DESTDIR
QMAKE_POST_LINK += && cp -rf $$BASEDIR/data $$DESTDIR
QMAKE_POST_LINK += && mkdir -p $$DESTDIR/images
QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf
QMAKE_POST_LINK += && cp -f $$BASEDIR/images/Vera.ttf $$DESTDIR/images/Vera.ttf
QMAKE_POST_LINK += && cp -rf $$BASEDIR/images/patterns $$DESTDIR/images
# osg/osgEarth dynamic casts might fail without this compiler option.
# see http://osgearth.org/wiki/FAQ for details.
...
...
src/ui/ObjectDetectionView.cc
View file @
083ae630
...
...
@@ -40,8 +40,6 @@ This file is part of the PIXHAWK project
#include <QDebug>
#include <QMap>
#include "MG.h"
ObjectDetectionView
::
ObjectDetectionView
(
QString
folder
,
QWidget
*
parent
)
:
QWidget
(
parent
),
patternList
(),
...
...
@@ -117,7 +115,7 @@ void ObjectDetectionView::newPattern(int uasId, QString patternPath, float confi
m_ui
->
listWidget
->
addItem
(
pattern
.
name
+
separator
+
"("
+
QString
::
number
(
pattern
.
count
)
+
")"
+
separator
+
QString
::
number
(
pattern
.
confidence
));
// load image
QString
filePath
=
MG
::
DIR
::
getSupportFilesDirectory
()
+
"/"
+
patternFolder
+
"/"
+
patternPath
.
split
(
"/"
,
QString
::
SkipEmptyParts
).
last
();
QString
filePath
=
patternFolder
+
"/"
+
patternPath
.
split
(
"/"
,
QString
::
SkipEmptyParts
).
last
();
QPixmap
image
=
QPixmap
(
filePath
);
if
(
image
.
width
()
>
image
.
height
())
image
=
image
.
scaledToWidth
(
m_ui
->
imageLabel
->
width
());
...
...
src/ui/RadioCalibration/RadioCalibrationWindow.cc
View file @
083ae630
...
...
@@ -52,6 +52,66 @@ RadioCalibrationWindow::RadioCalibrationWindow(QWidget *parent) :
setUASId
(
0
);
}
void
RadioCalibrationWindow
::
setChannelRaw
(
int
ch
,
float
raw
)
{
/** this expects a particular channel to function mapping
\todo allow run-time channel mapping
*/
switch
(
ch
)
{
case
0
:
aileron
->
channelChanged
(
raw
);
break
;
case
1
:
elevator
->
channelChanged
(
raw
);
break
;
case
2
:
throttle
->
channelChanged
(
raw
);
break
;
case
3
:
rudder
->
channelChanged
(
raw
);
break
;
case
4
:
gyro
->
channelChanged
(
raw
);
break
;
case
5
:
pitch
->
channelChanged
(
raw
);
break
;
}
}
void
RadioCalibrationWindow
::
setChannelScaled
(
int
ch
,
float
normalized
)
{
// /** this expects a particular channel to function mapping
// \todo allow run-time channel mapping
// */
// switch (ch)
// {
// case 0:
// aileron->channelChanged(raw);
// break;
// case 1:
// elevator->channelChanged(raw);
// break;
// case 2:
// throttle->channelChanged(raw);
// break;
// case 3:
// rudder->channelChanged(raw);
// break;
// case 4:
// gyro->channelChanged(raw);
// break;
// case 5:
// pitch->channelChanged(raw);
// break;
// }
}
void
RadioCalibrationWindow
::
setChannel
(
int
ch
,
float
raw
,
float
normalized
)
{
/** this expects a particular channel to function mapping
...
...
src/ui/RadioCalibration/RadioCalibrationWindow.h
View file @
083ae630
...
...
@@ -67,6 +67,8 @@ public:
public
slots
:
void
setChannel
(
int
ch
,
float
raw
,
float
normalized
);
void
setChannelRaw
(
int
ch
,
float
raw
);
void
setChannelScaled
(
int
ch
,
float
normalized
);
void
loadFile
();
void
saveFile
();
void
send
();
...
...
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