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
4d92b1d3
Commit
4d92b1d3
authored
Nov 23, 2014
by
Don Gagne
Browse files
Rename SettingsDialog->SerialSettingsDialog
This avoids collision with main app SettingsDialog class
parent
69d34ea8
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/ui/configuration/SerialSettingsDialog.cc
View file @
4d92b1d3
...
...
@@ -44,9 +44,9 @@ This file is part of the APM_PLANNER project
QT_USE_NAMESPACE
SettingsDialog
::
SettingsDialog
(
QWidget
*
parent
)
:
Serial
SettingsDialog
::
Serial
SettingsDialog
(
QWidget
*
parent
)
:
QDialog
(
parent
),
ui
(
new
Ui
::
SettingsDialog
)
ui
(
new
Ui
::
Serial
SettingsDialog
)
{
ui
->
setupUi
(
this
);
...
...
@@ -67,17 +67,17 @@ SettingsDialog::SettingsDialog(QWidget *parent) :
updateSettings
();
}
SettingsDialog
::~
SettingsDialog
()
Serial
SettingsDialog
::~
Serial
SettingsDialog
()
{
delete
ui
;
}
const
SerialSettings
&
SettingsDialog
::
settings
()
const
const
SerialSettings
&
Serial
SettingsDialog
::
settings
()
const
{
return
m_currentSettings
;
}
void
SettingsDialog
::
showPortInfo
(
int
idx
)
void
Serial
SettingsDialog
::
showPortInfo
(
int
idx
)
{
if
(
idx
!=
-
1
)
{
QStringList
list
=
ui
->
serialPortInfoListBox
->
itemData
(
idx
).
toStringList
();
...
...
@@ -89,13 +89,13 @@ void SettingsDialog::showPortInfo(int idx)
}
}
void
SettingsDialog
::
apply
()
void
Serial
SettingsDialog
::
apply
()
{
updateSettings
();
hide
();
}
void
SettingsDialog
::
checkCustomBaudRatePolicy
(
int
idx
)
void
Serial
SettingsDialog
::
checkCustomBaudRatePolicy
(
int
idx
)
{
bool
isCustomBaudRate
=
!
ui
->
baudRateBox
->
itemData
(
idx
).
isValid
();
ui
->
baudRateBox
->
setEditable
(
isCustomBaudRate
);
...
...
@@ -106,7 +106,7 @@ void SettingsDialog::checkCustomBaudRatePolicy(int idx)
}
}
void
SettingsDialog
::
fillPortsParameters
()
void
Serial
SettingsDialog
::
fillPortsParameters
()
{
// fill baud rate (is not the entire list of available values,
// desired values??, add your independently)
...
...
@@ -145,7 +145,7 @@ void SettingsDialog::fillPortsParameters()
ui
->
flowControlBox
->
addItem
(
QLatin1String
(
"XON/XOFF"
),
QSerialPort
::
SoftwareControl
);
}
void
SettingsDialog
::
fillPortsInfo
()
void
Serial
SettingsDialog
::
fillPortsInfo
()
{
ui
->
serialPortInfoListBox
->
clear
();
foreach
(
const
QSerialPortInfo
&
info
,
QSerialPortInfo
::
availablePorts
())
{
...
...
@@ -161,7 +161,7 @@ void SettingsDialog::fillPortsInfo()
}
}
void
SettingsDialog
::
updateSettings
()
void
Serial
SettingsDialog
::
updateSettings
()
{
m_currentSettings
.
name
=
ui
->
serialPortInfoListBox
->
currentText
();
...
...
src/ui/configuration/SerialSettingsDialog.h
View file @
4d92b1d3
...
...
@@ -33,14 +33,14 @@ This file is part of the APM_PLANNER project
*
*/
#ifndef SETTINGSDIALOG_H
#define SETTINGSDIALOG_H
#ifndef
SERIAL
SETTINGSDIALOG_H
#define
SERIAL
SETTINGSDIALOG_H
#include
<QDialog>
#include
<QSerialPort>
namespace
Ui
{
class
SettingsDialog
;
class
Serial
SettingsDialog
;
}
class
QIntValidator
;
...
...
@@ -62,13 +62,13 @@ public:
QSerialPort
::
FlowControl
flowControl
;
};
class
SettingsDialog
:
public
QDialog
class
Serial
SettingsDialog
:
public
QDialog
{
Q_OBJECT
public:
explicit
SettingsDialog
(
QWidget
*
parent
=
0
);
~
SettingsDialog
();
explicit
Serial
SettingsDialog
(
QWidget
*
parent
=
0
);
~
Serial
SettingsDialog
();
const
SerialSettings
&
settings
()
const
;
...
...
@@ -83,9 +83,9 @@ private:
void
updateSettings
();
private:
Ui
::
SettingsDialog
*
ui
;
Ui
::
Serial
SettingsDialog
*
ui
;
SerialSettings
m_currentSettings
;
QIntValidator
*
m_intValidator
;
};
#endif
// SETTINGSDIALOG_H
#endif
src/ui/configuration/SerialSettingsDialog.ui
View file @
4d92b1d3
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
SettingsDialog
</class>
<widget
class=
"QDialog"
name=
"SettingsDialog"
>
<class>
Serial
SettingsDialog
</class>
<widget
class=
"QDialog"
name=
"
Serial
SettingsDialog"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
...
...
src/ui/configuration/terminalconsole.cpp
View file @
4d92b1d3
...
...
@@ -66,7 +66,7 @@ TerminalConsole::TerminalConsole(QWidget *parent) :
layout
->
addWidget
(
m_statusBar
);
m_serial
=
new
QSerialPort
(
this
);
m_settingsDialog
=
new
SettingsDialog
;
m_settingsDialog
=
new
Serial
SettingsDialog
;
ui
->
connectButton
->
setEnabled
(
true
);
ui
->
disconnectButton
->
setEnabled
(
false
);
...
...
src/ui/configuration/terminalconsole.h
View file @
4d92b1d3
...
...
@@ -88,7 +88,7 @@ private:
Console
*
m_console
;
QStatusBar
*
m_statusBar
;
SettingsDialog
*
m_settingsDialog
;
Serial
SettingsDialog
*
m_settingsDialog
;
QSerialPort
*
m_serial
;
SerialSettings
m_settings
;
ConsoleMode
m_consoleMode
;
...
...
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