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
263cb7c1
Commit
263cb7c1
authored
Aug 16, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Testing data plot iew
parent
8e6b633a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
11 deletions
+20
-11
QGCDataPlot2D.cc
src/ui/QGCDataPlot2D.cc
+9
-7
QGCFirmwareUpdate.ui
src/ui/QGCFirmwareUpdate.ui
+2
-4
IncrementalPlot.cc
src/ui/linechart/IncrementalPlot.cc
+9
-0
No files found.
src/ui/QGCDataPlot2D.cc
View file @
263cb7c1
...
...
@@ -252,7 +252,6 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
ui
->
xAxis
->
clear
();
ui
->
yAxis
->
clear
();
ui
->
xAxis
->
addItem
(
"*"
);
int
curveNameIndex
=
0
;
int
xValueIndex
=
curveNames
.
indexOf
(
xAxisName
);
...
...
@@ -263,14 +262,17 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
if
(
curveNameIndex
!=
xValueIndex
)
{
// FIXME Add check for y value filter
yValues
.
insert
(
curveName
,
new
QVector
<
double
>
());
ui
->
xAxis
->
addItem
(
curveName
);
// Add separator starting with second item
if
(
curveNameIndex
>
0
&&
curveNameIndex
<
curveNames
.
size
())
if
((
ui
->
yAxis
->
text
()
==
""
)
&&
yValues
.
contains
(
curveName
))
{
ui
->
yAxis
->
setText
(
ui
->
yAxis
->
text
()
+
"|"
);
yValues
.
insert
(
curveName
,
new
QVector
<
double
>
());
ui
->
xAxis
->
addItem
(
curveName
);
// Add separator starting with second item
if
(
curveNameIndex
>
0
&&
curveNameIndex
<
curveNames
.
size
())
{
ui
->
yAxis
->
setText
(
ui
->
yAxis
->
text
()
+
"|"
);
}
ui
->
yAxis
->
setText
(
ui
->
yAxis
->
text
()
+
curveName
);
}
ui
->
yAxis
->
setText
(
ui
->
yAxis
->
text
()
+
curveName
);
}
curveNameIndex
++
;
}
...
...
src/ui/QGCFirmwareUpdate.ui
View file @
263cb7c1
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<author/>
<comment/>
<exportmacro/>
<class>
QGCFirmwareUpdate
</class>
<widget
class=
"QWidget"
name=
"QGCFirmwareUpdate"
>
<property
name=
"geometry"
>
...
...
@@ -16,6 +14,6 @@
<string>
Form
</string>
</property>
</widget>
<
pixmapfunction
/>
<
resources
/>
<connections/>
</ui>
src/ui/linechart/IncrementalPlot.cc
View file @
263cb7c1
...
...
@@ -270,7 +270,16 @@ QColor IncrementalPlot::getColorForCurve(QString id)
void
IncrementalPlot
::
removeData
()
{
foreach
(
QwtPlotCurve
*
curve
,
d_curve
)
{
delete
curve
;
}
d_curve
.
clear
();
foreach
(
CurveData
*
data
,
d_data
)
{
delete
data
;
}
d_data
.
clear
();
resetScaling
();
replot
();
...
...
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