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
13dcbfae
Commit
13dcbfae
authored
Jun 03, 2013
by
dongfang
Browse files
Options
Browse Files
Download
Plain Diff
Lorenz merge
parents
59a57d53
89696feb
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1184 additions
and
969 deletions
+1184
-969
QGCToolBar.cc
src/ui/QGCToolBar.cc
+1
-0
QGCVehicleConfig.cc
src/ui/QGCVehicleConfig.cc
+23
-24
QGCVehicleConfig.ui
src/ui/QGCVehicleConfig.ui
+1160
-944
dockwidgettitlebareventfilter.cpp
src/ui/dockwidgettitlebareventfilter.cpp
+0
-1
No files found.
src/ui/QGCToolBar.cc
View file @
13dcbfae
...
...
@@ -177,6 +177,7 @@ void QGCToolBar::createUI()
addLink
(
LinkManager
::
instance
()
->
getLinks
().
last
());
// XXX implies that connect button is always active for the last used link
connect
(
LinkManager
::
instance
(),
SIGNAL
(
newLink
(
LinkInterface
*
)),
this
,
SLOT
(
addLink
(
LinkInterface
*
)));
connect
(
LinkManager
::
instance
(),
SIGNAL
(
linkRemoved
(
LinkInterface
*
)),
this
,
SLOT
(
removeLink
(
LinkInterface
*
)));
// Update label if required
if
(
LinkManager
::
instance
()
->
getLinks
().
count
()
<
3
)
{
...
...
src/ui/QGCVehicleConfig.cc
View file @
13dcbfae
...
...
@@ -58,7 +58,7 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
ui
->
rcCalibrationButton
->
setCheckable
(
true
);
connect
(
ui
->
rcCalibrationButton
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
toggleCalibrationRC
(
bool
)));
connect
(
ui
->
s
tore
Button
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
writeParameters
()));
connect
(
ui
->
s
et
Button
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
writeParameters
()));
connect
(
ui
->
rcModeComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
setRCModeIndex
(
int
)));
connect
(
ui
->
setTrimButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
setTrimPositions
()));
...
...
@@ -199,6 +199,7 @@ void QGCVehicleConfig::stopCalibrationRC()
void
QGCVehicleConfig
::
loadQgcConfig
(
bool
primary
)
{
Q_UNUSED
(
primary
);
QDir
autopilotdir
(
qApp
->
applicationDirPath
()
+
"/files/"
+
mav
->
getAutopilotTypeName
().
toLower
());
QDir
generaldir
=
QDir
(
autopilotdir
.
absolutePath
()
+
"/general/widgets"
);
QDir
vehicledir
=
QDir
(
autopilotdir
.
absolutePath
()
+
"/"
+
mav
->
getSystemTypeName
().
toLower
()
+
"/widgets"
);
...
...
@@ -368,7 +369,6 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
}
}
// Load calibration
//TODO: Handle this more gracefully, maybe have it scan the directory for multiple calibration entries?
tool
=
new
QGCToolWidget
(
""
,
this
);
...
...
@@ -385,7 +385,6 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
delete
tool
;
}
tool
=
new
QGCToolWidget
(
""
,
this
);
tool
->
addUAS
(
mav
);
if
(
tool
->
loadSettings
(
autopilotdir
.
absolutePath
()
+
"/"
+
mav
->
getSystemTypeName
().
toLower
()
+
"/calibration/calibration.qgw"
,
false
))
...
...
@@ -399,16 +398,12 @@ void QGCVehicleConfig::loadQgcConfig(bool primary)
}
else
{
delete
tool
;
}
//description.txt
QFile
sensortipsfile
(
autopilotdir
.
absolutePath
()
+
"/general/calibration/description.txt"
);
sensortipsfile
.
open
(
QIODevice
::
ReadOnly
);
ui
->
sensorTips
->
setHtml
(
sensortipsfile
.
readAll
());
sensortipsfile
.
close
();
}
void
QGCVehicleConfig
::
menuButtonClicked
()
{
...
...
@@ -739,10 +734,8 @@ void QGCVehicleConfig::loadConfig()
}
xml
.
readNext
();
}
if
(
mav
)
{
mav
->
getParamManager
()
->
setParamInfo
(
paramTooltips
);
}
mav
->
getParamManager
()
->
setParamInfo
(
paramTooltips
);
doneLoadingConfig
=
true
;
mav
->
requestParameters
();
//Config is finished, lets do a parameter request to ensure none are missed if someone else started requesting before we were finished.
}
...
...
@@ -796,18 +789,24 @@ void QGCVehicleConfig::setActiveUAS(UASInterface* active)
mav
->
getParamManager
()
->
setParamInfo
(
paramTooltips
);
}
// mav->requestParameters();
QString
defaultsDir
=
qApp
->
applicationDirPath
()
+
"/files/"
+
mav
->
getAutopilotTypeName
().
toLower
()
+
"/widgets/"
;
qDebug
()
<<
"CALIBRATION!! System Type Name:"
<<
mav
->
getSystemTypeName
();
//Load configuration after 1ms. This allows it to go into the event loop, and prevents application hangups due to the
//amount of time it actually takes to load the configuration windows.
QTimer
::
singleShot
(
1
,
this
,
SLOT
(
loadConfig
()));
updateStatus
(
QString
(
"Reading from system %1"
).
arg
(
mav
->
getUASName
()));
// Since a system is now connected, enable the VehicleConfig UI.
ui
->
tabWidget
->
setEnabled
(
true
);
ui
->
setButton
->
setEnabled
(
true
);
ui
->
refreshButton
->
setEnabled
(
true
);
ui
->
readButton
->
setEnabled
(
true
);
ui
->
writeButton
->
setEnabled
(
true
);
ui
->
loadFileButton
->
setEnabled
(
true
);
ui
->
saveFileButton
->
setEnabled
(
true
);
}
void
QGCVehicleConfig
::
resetCalibrationRC
()
{
for
(
unsigned
int
i
=
0
;
i
<
chanMax
;
++
i
)
...
...
@@ -1125,9 +1124,9 @@ void QGCVehicleConfig::parameterChanged(int uas, int component, QString paramete
if
(
minTpl
.
exactMatch
(
parameterName
))
{
bool
ok
;
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
unsigned
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
//qDebug() << "PARAM:" << parameterName << "index:" << index;
if
(
ok
&&
(
index
>=
0
)
&&
(
index
<
chanMax
)
)
if
(
ok
&&
index
<
chanMax
)
{
rcMin
[
index
]
=
value
.
toInt
();
}
...
...
@@ -1135,8 +1134,8 @@ void QGCVehicleConfig::parameterChanged(int uas, int component, QString paramete
if
(
maxTpl
.
exactMatch
(
parameterName
))
{
bool
ok
;
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
if
(
ok
&&
(
index
>=
0
)
&&
(
index
<
chanMax
)
)
unsigned
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
if
(
ok
&&
index
<
chanMax
)
{
rcMax
[
index
]
=
value
.
toInt
();
}
...
...
@@ -1144,8 +1143,8 @@ void QGCVehicleConfig::parameterChanged(int uas, int component, QString paramete
if
(
trimTpl
.
exactMatch
(
parameterName
))
{
bool
ok
;
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
if
(
ok
&&
(
index
>=
0
)
&&
(
index
<
chanMax
)
)
unsigned
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
if
(
ok
&&
index
<
chanMax
)
{
rcTrim
[
index
]
=
value
.
toInt
();
}
...
...
@@ -1153,8 +1152,8 @@ void QGCVehicleConfig::parameterChanged(int uas, int component, QString paramete
if
(
revTpl
.
exactMatch
(
parameterName
))
{
bool
ok
;
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
if
(
ok
&&
(
index
>=
0
)
&&
(
index
<
chanMax
)
)
unsigned
int
index
=
parameterName
.
mid
(
2
,
1
).
toInt
(
&
ok
)
-
1
;
if
(
ok
&&
index
<
chanMax
)
{
rcRev
[
index
]
=
(
value
.
toInt
()
==
-
1
)
?
true
:
false
;
updateInvertedCheckboxes
(
index
);
...
...
src/ui/QGCVehicleConfig.ui
View file @
13dcbfae
This diff is collapsed.
Click to expand it.
src/ui/dockwidgettitlebareventfilter.cpp
View file @
13dcbfae
...
...
@@ -6,7 +6,6 @@ DockWidgetTitleBarEventFilter::DockWidgetTitleBarEventFilter(QObject *parent) :
}
bool
DockWidgetTitleBarEventFilter
::
eventFilter
(
QObject
*
object
,
QEvent
*
event
)
{
qDebug
()
<<
event
->
type
();
if
(
event
->
type
()
==
QEvent
::
MouseButtonPress
||
event
->
type
()
==
QEvent
::
MouseButtonRelease
)
{
return
true
;
...
...
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