Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Basic Map widget complete #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Basic Map widget complete #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/gui/resources/images.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/images">
<file>bluesatLogo.png</file>
<file>placeholderMap.png</file>
</qresource>
</RCC>
13 changes: 13 additions & 0 deletions src/gui/resources/main_window.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Window {
id: main_window
width: 800
height: 800
property alias map: map
title: "BLUEsat OWR"
visible: true
minimumHeight: 600
Expand All @@ -29,6 +30,18 @@ Window {
fillMode: Image.PreserveAspectFit
}

Image {
id: map
width: 200
height: 151
source: "qrc:/images/placeholderMap.png"
anchors.bottom: timerDisplay.top
anchors.bottomMargin: 20
anchors.right: video_pane.right
anchors.rightMargin: 25
fillMode: Image.PreserveAspectFit
}

Item {
id: video_pane
z: -1
Expand Down
Binary file added src/gui/resources/placeholderMap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.