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
eb07fbba
Unverified
Commit
eb07fbba
authored
Aug 23, 2020
by
Don Gagne
Committed by
GitHub
Aug 23, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9015 from DonLakeFlyer/InstrumenPosition
Fix instrument panel positioning at high scaling
parents
c7696bc8
49b22ebe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
112 deletions
+4
-112
qgroundcontrol.qrc
qgroundcontrol.qrc
+0
-1
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+4
-9
InstrumentSwipeView.qml
src/FlightMap/Widgets/InstrumentSwipeView.qml
+0
-101
qmldir
src/QmlControls/QGroundControl/FlightMap/qmldir
+0
-1
No files found.
qgroundcontrol.qrc
View file @
eb07fbba
...
...
@@ -235,7 +235,6 @@
<file alias="QGroundControl/FlightMap/CompassRing.qml">src/FlightMap/Widgets/CompassRing.qml</file>
<file alias="QGroundControl/FlightMap/CustomMapItems.qml">src/FlightMap/MapItems/CustomMapItems.qml</file>
<file alias="QGroundControl/FlightMap/FlightMap.qml">src/FlightMap/FlightMap.qml</file>
<file alias="QGroundControl/FlightMap/InstrumentSwipeView.qml">src/FlightMap/Widgets/InstrumentSwipeView.qml</file>
<file alias="QGroundControl/FlightMap/MapFitFunctions.qml">src/FlightMap/Widgets/MapFitFunctions.qml</file>
<file alias="QGroundControl/FlightMap/MapScale.qml">src/FlightMap/MapScale.qml</file>
<file alias="QGroundControl/FlightMap/MissionItemIndicator.qml">src/FlightMap/MapItems/MissionItemIndicator.qml</file>
...
...
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
eb07fbba
...
...
@@ -22,15 +22,10 @@ import QGroundControl.Palette 1.0
import
QGroundControl
.
Vehicle
1.0
import
QGroundControl
.
FlightMap
1.0
Column
{
id
:
_root
spacing
:
ScreenTools
.
defaultFontPixelHeight
*
0.25
Loader
{
width
:
parent
.
width
source
:
QGroundControl
.
settingsManager
.
flyViewSettings
.
alternateInstrumentPanel
.
rawValue
?
"
qrc:/qml/QGCInstrumentWidgetAlternate.qml
"
:
"
qrc:/qml/QGCInstrumentWidget.qml
"
property
var
missionController
Loader
{
width
:
parent
.
width
source
:
QGroundControl
.
settingsManager
.
flyViewSettings
.
alternateInstrumentPanel
.
rawValue
?
"
qrc:/qml/QGCInstrumentWidgetAlternate.qml
"
:
"
qrc:/qml/QGCInstrumentWidget.qml
"
}
}
src/FlightMap/Widgets/InstrumentSwipeView.qml
deleted
100644 → 0
View file @
c7696bc8
import
QtQuick
2.3
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Layouts
1.2
import
QGroundControl
.
Palette
1.0
import
QGroundControl
.
ScreenTools
1.0
import
QGroundControl
.
FlightMap
1.0
Item
{
id
:
_root
clip
:
true
height
:
column
.
height
property
color
textColor
property
color
backgroundColor
property
var
maxHeight
///< Maximum height that should be taken, smaller than this is ok
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
/
2
property
real
_pageWidth
:
_root
.
width
property
int
_currentPage
:
0
property
int
_maxPage
:
3
onWidthChanged
:
showPage
(
_currentPage
)
function
showPicker
()
{
valuesPage
.
showPicker
()
}
function
showPage
(
pageIndex
)
{
pageRow
.
x
=
-
(
pageIndex
*
_pageWidth
)
_currentPage
=
pageIndex
}
function
showNextPage
()
{
if
(
_currentPage
==
_maxPage
)
{
_currentPage
=
0
}
else
{
_currentPage
++
}
showPage
(
_currentPage
)
}
function
currentPage
()
{
return
_currentPage
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
showNextPage
()
}
Column
{
id
:
column
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
Row
{
id
:
pageRow
ValuesWidget
{
id
:
valuesPage
width
:
_pageWidth
textColor
:
_root
.
textColor
maxHeight
:
_root
.
maxHeight
}
CameraWidget
{
width
:
_pageWidth
textColor
:
_root
.
textColor
maxHeight
:
_root
.
maxHeight
}
VehicleHealthWidget
{
width
:
_pageWidth
textColor
:
_root
.
textColor
maxHeight
:
_root
.
maxHeight
}
VibrationWidget
{
width
:
_pageWidth
textColor
:
_root
.
textColor
backgroundColor
:
_root
.
backgroundColor
maxHeight
:
_root
.
maxHeight
}
}
Row
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
spacing
:
_margins
Repeater
{
model
:
_maxPage
+
1
Rectangle
{
height
:
radius
*
2
width
:
radius
*
2
radius
:
ScreenTools
.
defaultFontPixelWidth
/
3
border.color
:
textColor
border.width
:
1
color
:
_currentPage
==
index
?
textColor
:
"
transparent
"
}
}
}
}
}
src/QmlControls/QGroundControl/FlightMap/qmldir
View file @
eb07fbba
...
...
@@ -8,7 +8,6 @@ QGCVideoBackground 1.0 QGCVideoBackground.qml
CenterMapDropButton 1.0 CenterMapDropButton.qml
CenterMapDropPanel 1.0 CenterMapDropPanel.qml
CompassRing 1.0 CompassRing.qml
InstrumentSwipeView 1.0 InstrumentSwipeView.qml
MapFitFunctions 1.0 MapFitFunctions.qml
MapLineArrow 1.0 MapLineArrow.qml
MapScale 1.0 MapScale.qml
...
...
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