Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
89506207
Unverified
Commit
89506207
authored
May 26, 2018
by
Beat Küng
Browse files
Mavlink Console: add command history
parent
156338c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/AnalyzeView/MavlinkConsoleController.cc
View file @
89506207
...
...
@@ -33,12 +33,25 @@ MavlinkConsoleController::~MavlinkConsoleController()
void
MavlinkConsoleController
::
sendCommand
(
QString
command
)
{
_history
.
append
(
command
);
command
.
append
(
"
\n
"
);
_sendSerialData
(
qPrintable
(
command
));
_cursor_home_pos
=
-
1
;
_cursor
=
rowCount
();
}
QString
MavlinkConsoleController
::
historyUp
(
const
QString
&
current
)
{
return
_history
.
up
(
current
);
}
QString
MavlinkConsoleController
::
historyDown
(
const
QString
&
current
)
{
return
_history
.
down
(
current
);
}
void
MavlinkConsoleController
::
_setActiveVehicle
(
Vehicle
*
vehicle
)
{
...
...
@@ -192,3 +205,43 @@ MavlinkConsoleController::writeLine(int line, const QByteArray &text)
auto
idx
=
index
(
line
);
setData
(
idx
,
data
(
idx
,
Qt
::
DisplayRole
).
toString
()
+
text
);
}
void
MavlinkConsoleController
::
CommandHistory
::
append
(
const
QString
&
command
)
{
if
(
command
.
length
()
>
0
)
{
// do not append duplicates
if
(
_history
.
length
()
==
0
||
_history
.
last
()
!=
command
)
{
if
(
_history
.
length
()
>=
maxHistoryLength
)
{
_history
.
removeFirst
();
}
_history
.
append
(
command
);
}
}
_index
=
_history
.
length
();
}
QString
MavlinkConsoleController
::
CommandHistory
::
up
(
const
QString
&
current
)
{
if
(
_index
<=
0
)
return
current
;
--
_index
;
if
(
_index
<
_history
.
length
())
{
return
_history
[
_index
];
}
return
""
;
}
QString
MavlinkConsoleController
::
CommandHistory
::
down
(
const
QString
&
current
)
{
if
(
_index
>=
_history
.
length
())
return
current
;
++
_index
;
if
(
_index
<
_history
.
length
())
{
return
_history
[
_index
];
}
return
""
;
}
src/AnalyzeView/MavlinkConsoleController.h
View file @
89506207
...
...
@@ -27,13 +27,12 @@ class MavlinkConsoleController : public QStringListModel
public:
MavlinkConsoleController
();
~
MavlinkConsoleController
();
virtual
~
MavlinkConsoleController
();
public
slots
:
void
sendCommand
(
QString
command
);
Q_INVOKABLE
void
sendCommand
(
QString
command
);
signals:
void
cursorChanged
(
i
nt
);
Q_INVOKABLE
QString
historyUp
(
const
QString
&
current
);
Q_INVOKABLE
QString
historyDown
(
const
QString
&
curre
nt
);
private
slots
:
void
_setActiveVehicle
(
Vehicle
*
vehicle
);
...
...
@@ -44,10 +43,23 @@ private:
void
_sendSerialData
(
QByteArray
,
bool
close
=
false
);
void
writeLine
(
int
line
,
const
QByteArray
&
text
);
class
CommandHistory
{
public:
void
append
(
const
QString
&
command
);
QString
up
(
const
QString
&
current
);
QString
down
(
const
QString
&
current
);
private:
static
constexpr
int
maxHistoryLength
=
100
;
QList
<
QString
>
_history
;
int
_index
=
0
;
};
int
_cursor_home_pos
;
int
_cursor
;
QByteArray
_incoming_buffer
;
Vehicle
*
_vehicle
;
QList
<
QMetaObject
::
Connection
>
_uas_connections
;
CommandHistory
_history
;
};
src/AnalyzeView/MavlinkConsolePage.qml
View file @
89506207
...
...
@@ -96,6 +96,15 @@ AnalyzePage {
conController
.
sendCommand
(
text
)
text
=
""
}
Keys.onPressed
:
{
if
(
event
.
key
==
Qt
.
Key_Up
)
{
text
=
conController
.
historyUp
(
text
);
event
.
accepted
=
true
;
}
else
if
(
event
.
key
==
Qt
.
Key_Down
)
{
text
=
conController
.
historyDown
(
text
);
event
.
accepted
=
true
;
}
}
}
QGCButton
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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