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
c555a9fd
Commit
c555a9fd
authored
May 02, 2013
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed frame artifacts, but needs additional sweep
parent
fa4c1e13
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
27 deletions
+34
-27
px4_mc_attitude_pid_params.qgw
files/px4/widgets/px4_mc_attitude_pid_params.qgw
+7
-7
style-indoor.css
files/styles/style-indoor.css
+15
-16
configuration.h
src/configuration.h
+1
-2
QGCStatusBar.cc
src/ui/QGCStatusBar.cc
+10
-2
QGCStatusBar.h
src/ui/QGCStatusBar.h
+1
-0
No files found.
files/px4/widgets/px4_mc_attitude_pid_params.qgw
View file @
c555a9fd
...
...
@@ -4,7 +4,7 @@ QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_DESCRIPTION=Attitude P Gain
QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_PARAMID=MC_ATT_P
QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_MAX=
1.5
QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_MAX=
20
QGC_TOOL_WIDGET_ITEMS\2\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_DESCRIPTION=Attitude I Gain
QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_PARAMID=MC_ATT_I
...
...
@@ -22,37 +22,37 @@ QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_DESCRIPTION=Attitude Anti-Windup
QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_PARAMID=MC_ATT_AWU
QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MAX=
1
QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MAX=
0.5
QGC_TOOL_WIDGET_ITEMS\5\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_DESCRIPTION=Attitude Output Limit
QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_PARAMID=MC_ATT_LIM
QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_MAX=
3
QGC_TOOL_WIDGET_ITEMS\5\QGC_PARAM_SLIDER_MAX=
20
QGC_TOOL_WIDGET_ITEMS\6\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_DESCRIPTION=Heading / Yaw P Gain
QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_PARAMID=MC_YAWPOS_P
QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_MAX=
1.
2
QGC_TOOL_WIDGET_ITEMS\6\QGC_PARAM_SLIDER_MAX=2
QGC_TOOL_WIDGET_ITEMS\7\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_DESCRIPTION=Heading / Yaw D Gain
QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_PARAMID=MC_YAWPOS_D
QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_MAX=
1
QGC_TOOL_WIDGET_ITEMS\7\QGC_PARAM_SLIDER_MAX=
0.5
QGC_TOOL_WIDGET_ITEMS\8\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\8\QGC_PARAM_SLIDER_DESCRIPTION=Roll / Pitch Rate P Gain
QGC_TOOL_WIDGET_ITEMS\8\QGC_PARAM_SLIDER_PARAMID=MC_ATTRATE_P
QGC_TOOL_WIDGET_ITEMS\8\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\8\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\8\QGC_PARAM_SLIDER_MAX=1
.5
QGC_TOOL_WIDGET_ITEMS\8\QGC_PARAM_SLIDER_MAX=1
QGC_TOOL_WIDGET_ITEMS\9\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\9\QGC_PARAM_SLIDER_DESCRIPTION=Roll / Pitch Rate D Gain
QGC_TOOL_WIDGET_ITEMS\9\QGC_PARAM_SLIDER_PARAMID=MC_ATTRATE_D
QGC_TOOL_WIDGET_ITEMS\9\QGC_PARAM_SLIDER_COMPONENTID=50
QGC_TOOL_WIDGET_ITEMS\9\QGC_PARAM_SLIDER_MIN=0
QGC_TOOL_WIDGET_ITEMS\9\QGC_PARAM_SLIDER_MAX=
0.3
QGC_TOOL_WIDGET_ITEMS\9\QGC_PARAM_SLIDER_MAX=
1
QGC_TOOL_WIDGET_ITEMS\10\TYPE=SLIDER
QGC_TOOL_WIDGET_ITEMS\10\QGC_PARAM_SLIDER_DESCRIPTION=Yaw Rate P Gain
QGC_TOOL_WIDGET_ITEMS\10\QGC_PARAM_SLIDER_PARAMID=MC_YAWRATE_P
...
...
files/styles/style-indoor.css
View file @
c555a9fd
...
...
@@ -2,30 +2,30 @@
QWidget
#colorIcon
{}
QWidget
{
background-color
:
#191919
;
color
:
#DDDDD
F
;
/*background-clip: border;*/
font-size
:
11px
;
background-color
:
#222222
;
color
:
#FFFFF
F
;
background-clip
:
border
;
font-size
:
11px
;
}
QGroupBox
{
border
:
1px
solid
#66666B
;
border-radius
:
3px
;
padding
:
10px
0px
0px
0px
;
margin-top
:
1ex
;
/* leave space at the top for the title */
border
:
1px
solid
#66666B
;
border-radius
:
3px
;
padding
:
10px
0px
0px
0px
;
margin-top
:
1ex
;
/* leave space at the top for the title */
}
QCheckBox
{
/*background-color: #252528;*/
color
:
#DDDDDF
;
/*background-color: #252528;*/
color
:
#DDDDDF
;
}
QCheckBox
::indicator
{
border
:
1px
solid
#777777
;
border-radius
:
2px
;
color
:
#
DDDDD
F
;
width
:
10px
;
height
:
10px
;
color
:
#
FFFFF
F
;
width
:
10px
;
height
:
10px
;
}
QLineEdit
{
...
...
@@ -80,9 +80,8 @@ border: 1px solid #777777;
}
QMainWindow
::separator
{
background
:
#090909
;
width
:
2px
;
/* when vertical */
height
:
2px
;
/* when horizontal */
width
:
0px
;
/* when vertical */
height
:
0px
;
/* when horizontal */
}
QMainWindow
::separator:hover
{
...
...
src/configuration.h
View file @
c555a9fd
...
...
@@ -8,11 +8,10 @@
/** @brief Heartbeat emission rate, in Hertz (times per second) */
#define MAVLINK_HEARTBEAT_DEFAULT_RATE 1
#define WITH_TEXT_TO_SPEECH 1
#define QGC_APPLICATION_NAME "QGroundControl"
#define QGC_APPLICATION_VERSION "v. 1.0.
6
(beta)"
#define QGC_APPLICATION_VERSION "v. 1.0.
5
(beta)"
namespace
QGC
...
...
src/ui/QGCStatusBar.cc
View file @
c555a9fd
...
...
@@ -44,9 +44,16 @@ QGCStatusBar::QGCStatusBar(QWidget *parent) :
loadSettings
();
//setStyleSheet("QStatusBar {margin: 1px; border-bottom: 1px solid #252525; border-top: 1px solid #969696; padding: 1px");
setStyleSheet
(
"* { border-color: transparent; margin: 0px; } QWidget { border-color: transparent; } QStatusBar {border-bottom: 1px solid #101010; border-top: 1px solid #4F4F4F; background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818);}"
);
setStyleSheet
(
"QWidget {border-color: transparent; } QStatusBar {border-color: transparent; border: 0px; border-bottom: 1px solid #101010; border-top: 1px solid #4F4F4F; background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818);}"
);
}
void
QGCStatusBar
::
paintEvent
(
QPaintEvent
*
event
)
{
// if (currentMessage().length() != 0) {
// QStatusBar::paintEvent(event);
// } else {
// }
}
void
QGCStatusBar
::
setLogPlayer
(
QGCMAVLinkLogPlayer
*
player
)
...
...
@@ -55,6 +62,7 @@ void QGCStatusBar::setLogPlayer(QGCMAVLinkLogPlayer* player)
addPermanentWidget
(
player
);
connect
(
toggleLoggingButton
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
logging
(
bool
)));
// XXX Mutex issue if called like this
// toggleLoggingButton->blockSignals(true);
// toggleLoggingButton->setChecked(MainWindow::instance()->getMAVLink()->loggingEnabled());
...
...
src/ui/QGCStatusBar.h
View file @
c555a9fd
...
...
@@ -47,6 +47,7 @@ public slots:
void
logging
(
bool
checked
);
/** @brief Set log playing component */
void
setLogPlayer
(
QGCMAVLinkLogPlayer
*
player
);
virtual
void
paintEvent
(
QPaintEvent
*
event
);
protected:
void
storeSettings
();
...
...
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