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
ebe0ae96
Commit
ebe0ae96
authored
Jan 08, 2011
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fixes and improvements
parent
94348cb7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
4 deletions
+22
-4
DebugConsole.cc
src/ui/DebugConsole.cc
+7
-0
MainWindow.cc
src/ui/MainWindow.cc
+10
-0
MainWindow.ui
src/ui/MainWindow.ui
+5
-4
No files found.
src/ui/DebugConsole.cc
View file @
ebe0ae96
...
...
@@ -62,6 +62,8 @@ DebugConsole::DebugConsole(QWidget *parent) :
{
// Setup basic user interface
m_ui
->
setupUi
(
this
);
// Hide sent text field - it is only useful after send has been hit
m_ui
->
sentText
->
setVisible
(
false
);
// Make text area not editable
m_ui
->
receiveText
->
setReadOnly
(
true
);
// Limit to 500 lines
...
...
@@ -395,6 +397,11 @@ void DebugConsole::appendSpecialSymbol(const QString& text)
void
DebugConsole
::
sendBytes
()
{
if
(
!
m_ui
->
sentText
->
isVisible
())
{
m_ui
->
sentText
->
setVisible
(
true
);
}
if
(
!
currLink
->
isConnected
())
{
m_ui
->
sentText
->
setText
(
tr
(
"Nothing sent. The link %1 is unconnected. Please connect first."
).
arg
(
currLink
->
getName
()));
...
...
src/ui/MainWindow.cc
View file @
ebe0ae96
...
...
@@ -261,6 +261,7 @@ void MainWindow::buildCommonWidgets()
{
infoDockWidget
=
new
QDockWidget
(
tr
(
"Status Details"
),
this
);
infoDockWidget
->
setWidget
(
new
UASInfoWidget
(
this
)
);
infoDockWidget
->
setObjectName
(
"UAS_STATUS_DETAILS_DOCKWIDGET"
);
addToToolsMenu
(
infoDockWidget
,
tr
(
"Status Details"
),
SLOT
(
showToolWidget
()),
MENU_STATUS
,
Qt
::
RightDockWidgetArea
);
}
...
...
@@ -369,6 +370,7 @@ void MainWindow::buildPxWidgets()
{
detectionDockWidget
=
new
QDockWidget
(
tr
(
"Object Recognition"
),
this
);
detectionDockWidget
->
setWidget
(
new
ObjectDetectionView
(
"images/patterns"
,
this
)
);
detectionDockWidget
->
setObjectName
(
"OBJECT_DETECTION_DOCK_WIDGET"
);
addToToolsMenu
(
detectionDockWidget
,
tr
(
"Object Recognition"
),
SLOT
(
showToolWidget
()),
MENU_DETECTION
,
Qt
::
RightDockWidgetArea
);
}
...
...
@@ -376,6 +378,7 @@ void MainWindow::buildPxWidgets()
{
parametersDockWidget
=
new
QDockWidget
(
tr
(
"Onboard Parameters"
),
this
);
parametersDockWidget
->
setWidget
(
new
ParameterInterface
(
this
)
);
parametersDockWidget
->
setObjectName
(
"PARAMETER_INTERFACE_DOCKWIDGET"
);
addToToolsMenu
(
parametersDockWidget
,
tr
(
"Onboard Parameters"
),
SLOT
(
showToolWidget
()),
MENU_PARAMETERS
,
Qt
::
RightDockWidgetArea
);
}
...
...
@@ -383,6 +386,7 @@ void MainWindow::buildPxWidgets()
{
watchdogControlDockWidget
=
new
QDockWidget
(
tr
(
"Process Control"
),
this
);
watchdogControlDockWidget
->
setWidget
(
new
WatchdogControl
(
this
)
);
watchdogControlDockWidget
->
setObjectName
(
"WATCHDOG_CONTROL_DOCKWIDGET"
);
addToToolsMenu
(
watchdogControlDockWidget
,
tr
(
"Process Control"
),
SLOT
(
showToolWidget
()),
MENU_WATCHDOG
,
Qt
::
BottomDockWidgetArea
);
}
...
...
@@ -448,6 +452,7 @@ void MainWindow::buildSlugsWidgets()
// Dock widgets
headUpDockWidget
=
new
QDockWidget
(
tr
(
"Control Indicator"
),
this
);
headUpDockWidget
->
setWidget
(
new
HUD
(
320
,
240
,
this
));
headUpDockWidget
->
setObjectName
(
"HEAD_UP_DISPLAY_DOCK_WIDGET"
);
addToToolsMenu
(
headUpDockWidget
,
tr
(
"HUD"
),
SLOT
(
showToolWidget
()),
MENU_HUD
,
Qt
::
LeftDockWidgetArea
);
}
...
...
@@ -455,6 +460,7 @@ void MainWindow::buildSlugsWidgets()
{
rcViewDockWidget
=
new
QDockWidget
(
tr
(
"Radio Control"
),
this
);
rcViewDockWidget
->
setWidget
(
new
QGCRemoteControlView
(
this
)
);
rcViewDockWidget
->
setObjectName
(
"RADIO_CONTROL_CHANNELS_DOCK_WIDGET"
);
addToToolsMenu
(
rcViewDockWidget
,
tr
(
"Radio Control"
),
SLOT
(
showToolWidget
()),
MENU_RC_VIEW
,
Qt
::
BottomDockWidgetArea
);
}
...
...
@@ -463,6 +469,7 @@ void MainWindow::buildSlugsWidgets()
// Dialog widgets
slugsDataWidget
=
new
QDockWidget
(
tr
(
"Slugs Data"
),
this
);
slugsDataWidget
->
setWidget
(
new
SlugsDataSensorView
(
this
));
slugsDataWidget
->
setObjectName
(
"SLUGS_DATA_DOCK_WIDGET"
);
addToToolsMenu
(
slugsDataWidget
,
tr
(
"Telemetry Data"
),
SLOT
(
showToolWidget
()),
MENU_SLUGS_DATA
,
Qt
::
RightDockWidgetArea
);
}
...
...
@@ -470,6 +477,7 @@ void MainWindow::buildSlugsWidgets()
{
slugsPIDControlWidget
=
new
QDockWidget
(
tr
(
"Slugs PID Control"
),
this
);
slugsPIDControlWidget
->
setWidget
(
new
SlugsPIDControl
(
this
));
slugsPIDControlWidget
->
setObjectName
(
"SLUGS_PID_CONTROL_DOCK_WIDGET"
);
addToToolsMenu
(
slugsPIDControlWidget
,
tr
(
"PID Configuration"
),
SLOT
(
showToolWidget
()),
MENU_SLUGS_PID
,
Qt
::
LeftDockWidgetArea
);
}
...
...
@@ -477,6 +485,7 @@ void MainWindow::buildSlugsWidgets()
{
slugsHilSimWidget
=
new
QDockWidget
(
tr
(
"Slugs Hil Sim"
),
this
);
slugsHilSimWidget
->
setWidget
(
new
SlugsHilSim
(
this
));
slugsHilSimWidget
->
setObjectName
(
"SLUGS_HIL_SIM_DOCK_WIDGET"
);
addToToolsMenu
(
slugsHilSimWidget
,
tr
(
"HIL Sim Configuration"
),
SLOT
(
showToolWidget
()),
MENU_SLUGS_HIL
,
Qt
::
LeftDockWidgetArea
);
}
...
...
@@ -484,6 +493,7 @@ void MainWindow::buildSlugsWidgets()
{
slugsCamControlWidget
=
new
QDockWidget
(
tr
(
"Slugs Video Camera Control"
),
this
);
slugsCamControlWidget
->
setWidget
(
new
SlugsVideoCamControl
(
this
));
slugsCamControlWidget
->
setObjectName
(
"SLUGS_CAM_CONTROL_DOCK_WIDGET"
);
addToToolsMenu
(
slugsCamControlWidget
,
tr
(
"Camera Control"
),
SLOT
(
showToolWidget
()),
MENU_SLUGS_CAMERA
,
Qt
::
BottomDockWidgetArea
);
}
}
...
...
src/ui/MainWindow.ui
View file @
ebe0ae96
...
...
@@ -46,12 +46,12 @@
<string>
File
</string>
</property>
<addaction
name=
"actionJoystick_Settings"
/>
<addaction
name=
"actionNewCustomWidget"
/>
<addaction
name=
"actionMuteAudioOutput"
/>
<addaction
name=
"actionSimulate"
/>
<addaction
name=
"actionPreferences"
/>
<addaction
name=
"separator"
/>
<addaction
name=
"actionMuteAudioOutput"
/>
<addaction
name=
"actionPreferences"
/>
<addaction
name=
"actionReloadStyle"
/>
<addaction
name=
"separator"
/>
<addaction
name=
"actionExit"
/>
</widget>
<widget
class=
"QMenu"
name=
"menuNetwork"
>
...
...
@@ -88,6 +88,7 @@
<property
name=
"title"
>
<string>
Tools
</string>
</property>
<addaction
name=
"actionNewCustomWidget"
/>
</widget>
<widget
class=
"QMenu"
name=
"menuHelp"
>
<property
name=
"title"
>
...
...
@@ -312,7 +313,7 @@
<normaloff>
:/images/categories/applications-internet.svg
</normaloff>
:/images/categories/applications-internet.svg
</iconset>
</property>
<property
name=
"text"
>
<string>
Rel
oad Stylesheet
</string>
<string>
L
oad Stylesheet
</string>
</property>
</action>
<action
name=
"actionPilotsView"
>
...
...
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