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
25915d88
Commit
25915d88
authored
Jul 21, 2011
by
LM
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a few odd things
parent
361ac1d7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
19 deletions
+17
-19
QGCDataPlot2D.cc
src/ui/QGCDataPlot2D.cc
+0
-2
QGCMapToolBar.cc
src/ui/map/QGCMapToolBar.cc
+17
-17
No files found.
src/ui/QGCDataPlot2D.cc
View file @
25915d88
...
@@ -417,12 +417,10 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
...
@@ -417,12 +417,10 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
QMap
<
QString
,
QString
>
renaming
;
QMap
<
QString
,
QString
>
renaming
;
QStringList
yCurves
=
yAxisFilter
.
split
(
"|"
,
QString
::
SkipEmptyParts
);
QStringList
yCurves
=
yAxisFilter
.
split
(
"|"
,
QString
::
SkipEmptyParts
);
qDebug
()
<<
"YFILTER"
<<
yAxisFilter
;
// Figure out the correct renaming
// Figure out the correct renaming
for
(
int
i
=
0
;
i
<
yCurves
.
count
();
++
i
)
for
(
int
i
=
0
;
i
<
yCurves
.
count
();
++
i
)
{
{
qDebug
()
<<
"CURVE:"
<<
yCurves
.
at
(
i
);
if
(
yCurves
.
at
(
i
).
contains
(
":"
))
if
(
yCurves
.
at
(
i
).
contains
(
":"
))
{
{
QStringList
parts
=
yCurves
.
at
(
i
).
split
(
":"
,
QString
::
SkipEmptyParts
);
QStringList
parts
=
yCurves
.
at
(
i
).
split
(
":"
,
QString
::
SkipEmptyParts
);
...
...
src/ui/map/QGCMapToolBar.cc
View file @
25915d88
...
@@ -30,28 +30,28 @@ void QGCMapToolBar::setMap(QGCMapWidget* map)
...
@@ -30,28 +30,28 @@ void QGCMapToolBar::setMap(QGCMapWidget* map)
// Edit mode handling
// Edit mode handling
ui
->
editButton
->
hide
();
ui
->
editButton
->
hide
();
const
int
uavTrailTimeList
[]
=
{
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
};
// seconds
//
const int uavTrailTimeList[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}; // seconds
const
int
uavTrailTimeCount
=
10
;
//
const int uavTrailTimeCount = 10;
const
int
uavTrailDistanceList
[]
=
{
1
,
2
,
5
,
10
,
20
,
50
,
100
,
200
,
500
};
// meters
//
const int uavTrailDistanceList[] = {1, 2, 5, 10, 20, 50, 100, 200, 500}; // meters
const
int
uavTrailDistanceCount
=
9
;
//
const int uavTrailDistanceCount = 9;
optionsMenu
.
setParent
(
this
);
//
optionsMenu.setParent(this);
// Build up menu
//
// Build up menu
//trailPlotMenu(tr("Add trail dot every.."), this);
//
//trailPlotMenu(tr("Add trail dot every.."), this);
for
(
int
i
=
0
;
i
<
uavTrailTimeCount
;
++
i
)
//
for (int i = 0; i < uavTrailTimeCount; ++i)
{
//
{
trailPlotMenu
.
addAction
(
QString
(
"%1 second%2"
).
arg
(
uavTrailTimeList
[
i
]).
arg
((
uavTrailTimeList
[
i
]
>
1
)
?
"s"
:
""
),
this
,
SLOT
(
setUAVTrailTime
()));
//
trailPlotMenu.addAction(QString("%1 second%2").arg(uavTrailTimeList[i]).arg((uavTrailTimeList[i] > 1) ? "s" : ""), this, SLOT(setUAVTrailTime()));
}
//
}
for
(
int
i
=
0
;
i
<
uavTrailDistanceCount
;
++
i
)
//
for (int i = 0; i < uavTrailDistanceCount; ++i)
{
//
{
trailPlotMenu
.
addAction
(
QString
(
"%1 meter%2"
).
arg
(
uavTrailDistanceList
[
i
]).
arg
((
uavTrailDistanceList
[
i
]
>
1
)
?
"s"
:
""
),
this
,
SLOT
(
setUAVTrailDistance
()));
//
trailPlotMenu.addAction(QString("%1 meter%2").arg(uavTrailDistanceList[i]).arg((uavTrailDistanceList[i] > 1) ? "s" : ""), this, SLOT(setUAVTrailDistance()));
}
//
}
optionsMenu
.
addMenu
(
&
trailPlotMenu
);
//
optionsMenu.addMenu(&trailPlotMenu);
ui
->
optionsButton
->
setMenu
(
&
optionsMenu
);
//
ui->optionsButton->setMenu(&optionsMenu);
}
}
}
}
...
...
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